From 41dd7a21024ebc5570922108a10231af9db0fc93 Mon Sep 17 00:00:00 2001
From: Enrico Vianello <enrico.vianello@cnaf.infn.it>
Date: Wed, 25 Oct 2023 01:43:48 +0200
Subject: [PATCH 1/4] Upgrade spring boot starter parent to 2.7.17 and bc to
 1.76

---
 pom.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index cd0280bf..68075273 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
     <!-- Keep this aligned with the spring.boot-version property below! -->
-    <version>2.7.10</version>
+    <version>2.7.17</version>
     <relativePath />
   </parent>
 
@@ -32,7 +32,7 @@
     <java.version>11</java.version>
 
     <!-- Keep this aligned with the parent project version! -->
-    <spring-boot.version>2.7.10</spring-boot.version>
+    <spring-boot.version>2.7.17</spring-boot.version>
 
     <!-- Sonarcloud.io properties -->
     <sonar.projectKey>italiangrid_storm-webdav</sonar.projectKey>
@@ -57,7 +57,7 @@
     <spring-security-oauth2.version>2.3.3.RELEASE</spring-security-oauth2.version>
     <nimbus-jose-jwt.version>6.0.2</nimbus-jose-jwt.version>
     <mock-server.version>5.5.1</mock-server.version>
-    <bouncycastle.version>1.72</bouncycastle.version>
+    <bouncycastle.version>1.76</bouncycastle.version>
 
     <start-class>org.italiangrid.storm.webdav.WebdavService</start-class>
 
@@ -101,7 +101,6 @@
           <descriptors>
             <descriptor>src/assembly/tarball.xml</descriptor>
           </descriptors>
-          <finalName>storm-webdav</finalName>
         </configuration>
         <executions>
           <execution>

From f2ee8d8c942ebf972cdf23c7e579a925a0b1f3c1 Mon Sep 17 00:00:00 2001
From: Enrico Vianello <enrico.vianello@cnaf.infn.it>
Date: Tue, 7 Nov 2023 14:40:20 +0100
Subject: [PATCH 2/4] Build with JDK 17

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 68075273..4bae6113 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <plugin.license.version>1.9.0</plugin.license.version>
     <plugin.jacoco.version>0.8.8</plugin.jacoco.version>
 
-    <java.version>11</java.version>
+    <java.version>17</java.version>
 
     <!-- Keep this aligned with the parent project version! -->
     <spring-boot.version>2.7.17</spring-boot.version>

From 555ea1db1e0cd269a005efbada22f1e96ea80a9c Mon Sep 17 00:00:00 2001
From: Enrico Vianello <enrico.vianello@cnaf.infn.it>
Date: Tue, 7 Nov 2023 14:44:48 +0100
Subject: [PATCH 3/4] Upgrade Java version on Github workflows

---
 .github/workflows/maven.yml | 4 ++--
 .github/workflows/sonar.yml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index e9ecf12d..63dbf247 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -27,10 +27,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 17
     - name: Cache Maven packages
       uses: actions/cache@v2
       with:
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index 23af7abd..303dc77f 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -13,10 +13,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Cache SonarCloud packages
         uses: actions/cache@v1
         with:
@@ -33,4 +33,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -s maven/cnaf-mirror-settings.xml -B -U install org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=italiangrid_storm-webdav
\ No newline at end of file
+        run: mvn -s maven/cnaf-mirror-settings.xml -B -U install org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=italiangrid_storm-webdav

From a30bcadbf65b2760b2365feb0d45c730d028bf79 Mon Sep 17 00:00:00 2001
From: Enrico Vianello <enrico.vianello@cnaf.infn.it>
Date: Tue, 7 Nov 2023 14:51:24 +0100
Subject: [PATCH 4/4] Upgrade Guava dependency

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4bae6113..2f0ae4e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
     <http-core.version>4.2.2</http-core.version>
     <http-client.version>4.2.1</http-client.version>
 
-    <guava.version>31.1-jre</guava.version>
+    <guava.version>32.1.3-jre</guava.version>
 
     <owner-config.version>1.0.5.1</owner-config.version>