From 2f13fe5319be93f61950a3857a5a8c9fb7ecbbcc Mon Sep 17 00:00:00 2001
From: Sean Sylver <ssylver@VividSolutions.com>
Date: Fri, 13 Sep 2024 18:28:00 -0700
Subject: [PATCH 1/5] Test sonar

---
 client/wfprev/.github/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/wfprev/.github/test.yml b/client/wfprev/.github/test.yml
index 2a5e353ff..16b5c6fda 100644
--- a/client/wfprev/.github/test.yml
+++ b/client/wfprev/.github/test.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         node-version: [20.x]
-  
+   
     steps:
       - uses: actions/checkout@v4
 

From 394bd5813cb2ea8f2b7e04ee2c7e5535befc3497 Mon Sep 17 00:00:00 2001
From: Sean Sylver <ssylver@VividSolutions.com>
Date: Mon, 16 Sep 2024 13:11:31 -0700
Subject: [PATCH 2/5] Reintroduce commented out native-maven-plugion dependency

---
 server/wfprev-api/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/wfprev-api/pom.xml b/server/wfprev-api/pom.xml
index 3af99d269..57bf44f82 100644
--- a/server/wfprev-api/pom.xml
+++ b/server/wfprev-api/pom.xml
@@ -221,10 +221,10 @@
 					</execution>
 				</executions>
 			</plugin>
-			<!-- <plugin>
+			<plugin>
 				<groupId>org.graalvm.buildtools</groupId>
 				<artifactId>native-maven-plugin</artifactId>
-			</plugin> -->
+			</plugin>
 			<plugin>
 				<groupId>org.asciidoctor</groupId>
 				<artifactId>asciidoctor-maven-plugin</artifactId>

From 87d391f13eb499887a988fa06f8d1757db19a551 Mon Sep 17 00:00:00 2001
From: Sean Sylver <ssylver@VividSolutions.com>
Date: Mon, 16 Sep 2024 13:22:38 -0700
Subject: [PATCH 3/5] Increase max heap size for maven

---
 .github/workflows/sonarscan.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sonarscan.yml b/.github/workflows/sonarscan.yml
index beb61e48d..b01c17c35 100644
--- a/.github/workflows/sonarscan.yml
+++ b/.github/workflows/sonarscan.yml
@@ -36,6 +36,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-          export MAVEN_OPTS="-Xmx3072m"
+          export MAVEN_OPTS="-Xmx4096m"
           export NODE_OPTIONS="--max-old-space-size=4096"
           mvn --settings /home/runner/work/nr-bcws-wfprev/nr-bcws-wfprev/server/wfprev-api/mvn_settings/settings.xml -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=bcgov_nr-bcws-wfprev -Drepo.login=${{ secrets.IDIR_AS_EMAIL }} -Drepo.password=${{ secrets.IDIR_PASSWORD }} -DskipTests

From 91b29265c64edd7617873af2bb0d1edd31efd766 Mon Sep 17 00:00:00 2001
From: Sean Sylver <ssylver@VividSolutions.com>
Date: Mon, 16 Sep 2024 15:09:12 -0700
Subject: [PATCH 4/5] Add npmrc file to sonar build

---
 .github/workflows/sonarscan.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/sonarscan.yml b/.github/workflows/sonarscan.yml
index b01c17c35..022cf284e 100644
--- a/.github/workflows/sonarscan.yml
+++ b/.github/workflows/sonarscan.yml
@@ -1,5 +1,7 @@
 name: SonarCloud
 
+env:
+  NPMRC: ${{ secrets.NPMRC }}
 on:
   pull_request_target:
     types: [opened, synchronize, reopened]
@@ -19,6 +21,8 @@ jobs:
         with:
           java-version: '17'
           distribution: 'adopt'
+      - name: Add .npmrc file
+        run: echo -e $NPMRC > ~/.npmrc
       - name: Cache SonarCloud packages
         uses: actions/cache@v4
         with:

From 549e10fef0ed64d3112fe598efc4eacf6af0822a Mon Sep 17 00:00:00 2001
From: Sean Sylver <ssylver@VividSolutions.com>
Date: Mon, 16 Sep 2024 15:19:31 -0700
Subject: [PATCH 5/5] Fix merge conflict

---
 client/wfprev/.github/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/wfprev/.github/test.yml b/client/wfprev/.github/test.yml
index 16b5c6fda..2a5e353ff 100644
--- a/client/wfprev/.github/test.yml
+++ b/client/wfprev/.github/test.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         node-version: [20.x]
-   
+  
     steps:
       - uses: actions/checkout@v4