Merge branch 'PSMRI:develop' into develop

.github/workflows/build-on-pull-request.yml

@@ -30,4 +30,4 @@ jobs:
       run: mvn clean install
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v2

.github/workflows/package.yml

@@ -17,16 +17,23 @@ env:
 jobs:
   Package-test:
     runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
     steps:
 
     - name: Checkout code 
       uses: actions/checkout@v2
-
     - name: Setup JDK 8
       uses: actions/setup-java@v2
       with:
         java-version: 8
         distribution: 'adopt'
+
 
     - name: Build with Maven
       run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}

.github/workflows/sast-and-package.yml

@@ -0,0 +1,47 @@
+name: Package
+
+on:
+  push:
+    branches: [ "develop"]
+    paths-ignore:
+     - target/**
+
+  pull_request:
+     branches: [ "develop" ]
+     paths-ignore:
+     - target/**
+
+env:
+  ENV_VAR: test
+
+jobs:
+  Package-test:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+    steps:
+
+    - name: Checkout code 
+      uses: actions/checkout@v2
+    - name: Setup JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: 8
+        distribution: 'adopt'
+
+    - name: Build with Maven
+      run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
+
+    - name: Build WAR file
+      run: mvn -B package --file pom.xml
+
+    - name: Upload WAR file as artifact
+      uses: actions/upload-artifact@v2 
+      with:
+        name: Identity-API
+        path: target/identity-0.0.1.war  

src/main/environment/common_local.properties

@@ -0,0 +1,5 @@
+# DataSource settings: set here your own configurations for the database
+spring.datasource.url=<Enter AMRIT DB_IDENTITY URL here>
+spring.datasource.username=<Enter your AMRIT DB_IDENTITY username>
+spring.datasource.password=<Enter your AMRIT DB_IDENTITY password>
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver

src/main/environment/common_test.properties

@@ -3,5 +3,3 @@ spring.datasource.url=<Enter AMRIT DB_IDENTITY URL here>
 spring.datasource.username=<Enter your AMRIT DB_IDENTITY username>
 spring.datasource.password=<Enter your AMRIT DB_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-