Skip to content

Commit

Permalink
Merge pull request #34 from italiangrid/upgrade-dependencies
Browse files Browse the repository at this point in the history
- Upgrade spring boot starter parent to 2.7.17 and bc to 1.76
- Build with JDK 17
- Upgrade Java version on Github workflows
- Upgrade Guava dependency
  • Loading branch information
enricovianello authored Nov 7, 2023
2 parents 5658baa + a30bcad commit 183d654
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
run: mvn -s maven/cnaf-mirror-settings.xml -B -U install org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=italiangrid_storm-webdav
11 changes: 5 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -29,10 +29,10 @@
<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.10</spring-boot.version>
<spring-boot.version>2.7.17</spring-boot.version>

<!-- Sonarcloud.io properties -->
<sonar.projectKey>italiangrid_storm-webdav</sonar.projectKey>
Expand All @@ -50,14 +50,14 @@
<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>

<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>

Expand Down Expand Up @@ -101,7 +101,6 @@
<descriptors>
<descriptor>src/assembly/tarball.xml</descriptor>
</descriptors>
<finalName>storm-webdav</finalName>
</configuration>
<executions>
<execution>
Expand Down

0 comments on commit 183d654

Please sign in to comment.