Updated java libraries for spring boot and swagger, and github action (…

…#96) * Updated java libraries for spring boot and swagger, and github action * Updated uploads to make unique artifact due to change in GH action
finos · Jan 23, 2024 · 9a4af7c · 9a4af7c
1 parent 764c81f
commit 9a4af7c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
@@ -51,11 +51,14 @@ jobs:
             --nodePackageSkipDevDependencies
             --failOnCVSS 5
             --enableRetired
+      - run: | 
+          echo `echo UPNAME=${{matrix.module-folder}} | tr '/' '-'` >> $GITHUB_ENV
+        shell: bash
       - name: Upload Test results
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: Depcheck report
+          name: Depcheck report ${{ env.UPNAME }}
           path: ${{ github.workspace }}/${{ matrix.module-folder }}-reports
 
   dotnet-modules-scan:
@@ -88,9 +91,9 @@ jobs:
             --enableRetired
       - name: Upload Test results
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: Depcheck report
+          name: Depcheck report ${{ github.job }} ${{ github.job_workflow_sha}}
           path: ${{ github.workspace }}/${{ matrix.module-folder }}-reports
 
   gradle-modules-scan:
@@ -132,9 +135,9 @@ jobs:
             --enableRetired
       - name: Upload Test results
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: Depcheck report
+          name: Depcheck report ${{ github.job }} ${{ matrix.module-folder }} 
           path: ${{ github.workspace }}/${{ matrix.module-folder }}-reports
 
   dockerfile-scan:

diff --git a/account-service/build.gradle b/account-service/build.gradle
@@ -7,7 +7,7 @@
 
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.2.0'
+  id 'org.springframework.boot' version '3.2.2'
   id 'io.spring.dependency-management' version '1.1.4'
 }
 

diff --git a/position-service/build.gradle b/position-service/build.gradle
@@ -7,7 +7,7 @@
 
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.2.0'
+  id 'org.springframework.boot' version '3.2.2'
   id 'io.spring.dependency-management' version '1.1.4'
 }
 

diff --git a/trade-processor/build.gradle b/trade-processor/build.gradle
@@ -7,7 +7,7 @@
 
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.2.0'
+  id 'org.springframework.boot' version '3.2.2'
   id 'io.spring.dependency-management' version '1.1.4'
 }
 
@@ -42,7 +42,7 @@ dependencies {
 	implementation ('io.socket:socket.io-client:2.1.0'){
 		exclude group: 'org.json', module: 'json'
 	}
-   	implementation 'io.swagger.core.v3:swagger-core:2.2.19'
+   	implementation 'io.swagger.core.v3:swagger-core:2.2.20'
 	implementation 'org.yaml:snakeyaml:2.2'
 
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'

diff --git a/trade-service/build.gradle b/trade-service/build.gradle
@@ -7,7 +7,7 @@
 
 plugins {
   id 'java'
-  id 'org.springframework.boot' version '3.2.0'
+  id 'org.springframework.boot' version '3.2.2'
   id 'io.spring.dependency-management' version '1.1.4'
 }
 
@@ -44,8 +44,8 @@ dependencies {
 		exclude group: 'org.json', module: 'json'
 	}
 
-	implementation 'io.swagger.core.v3:swagger-core:2.2.19'
-	implementation 'io.swagger.core.v3:swagger-annotations:2.2.19'
+	implementation 'io.swagger.core.v3:swagger-core:2.2.20'
+	implementation 'io.swagger.core.v3:swagger-annotations:2.2.10'
 
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'