Skip to content

Commit

Permalink
Remove duplicate managed version
Browse files Browse the repository at this point in the history
Upgrade to Java 17

Changes:
- Update release actions to use Java 17 JDK
   - Also moved from legacy unsupported AdoptOpenJDK to Temurin
replacement
- Updated code level to 17

Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.5.0 to 3.6.3 (hazelcast#302)

Bump org.owasp:dependency-check-maven from 8.0.2 to 9.0.9 (hazelcast#301)

Bump org.assertj:assertj-core from 3.24.2 to 3.25.1 (hazelcast#300)

Bump org.apache.maven.plugins:maven-surefire-plugin from 3.1.2 to 3.2.5 (hazelcast#299)

Bump org.jacoco:jacoco-maven-plugin from 0.8.8 to 0.8.11 (hazelcast#303)
  • Loading branch information
dependabot[bot] authored and JackPGreen committed Jan 18, 2024
1 parent 4082c0b commit 9225d4a
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ '11' ]
java: [ '17' ]
architecture: [ 'x64' ]
distribution: [ 'adopt' ]
distribution: [ 'temurin' ]
name: Build
steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ jobs:
- name: Setup JDK
uses: actions/setup-java@v4
with:
java-version: 11
distribution: 'adopt'
java-version: 17
distribution: 'temurin'
server-id: deploy-repository
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ '11' ]
java: [ '17' ]
architecture: [ 'x64' ]
distribution: [ 'adopt' ]
distribution: [ 'temurin' ]
name: Build SNAPSHOT version with JDK ${{ matrix.java }}
steps:
- uses: actions/checkout@v4
Expand Down
1 change: 0 additions & 1 deletion hazelcast-jdbc-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.24.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
13 changes: 8 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@
<properties>
<main.basedir>${project.basedir}</main.basedir>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>11</maven.compiler.release>
<jdk.version>17</jdk.version>
<hazelcast.version>5.3.6</hazelcast.version>
<mockito.version>5.9.0</mockito.version>
<maven.jacoco.plugin.version>0.8.8</maven.jacoco.plugin.version>
<maven.jacoco.plugin.version>0.8.11</maven.jacoco.plugin.version>
<maven.findbugs.plugin.version>3.0.5</maven.findbugs.plugin.version>
<maven.checkstyle.plugin.version>3.3.1</maven.checkstyle.plugin.version>
<maven.sonar.plugin.version>5.1</maven.sonar.plugin.version>
<maven.gpg.plugin.version>3.1.0</maven.gpg.plugin.version>
<maven.javadoc.plugin.version>3.5.0</maven.javadoc.plugin.version>
<maven.javadoc.plugin.version>3.6.3</maven.javadoc.plugin.version>
<maven.source.plugin.version>3.3.0</maven.source.plugin.version>

<!-- needed for CheckStyle -->
Expand Down Expand Up @@ -126,7 +126,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>8.0.2</version>
<version>9.0.9</version>
<configuration>
<format>ALL</format>
<skipProvidedScope>true</skipProvidedScope>
Expand Down Expand Up @@ -169,6 +169,9 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
<configuration>
<release>${jdk.version}</release>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
Expand Down Expand Up @@ -201,7 +204,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.2</version>
<version>3.2.5</version>
<configuration>
<excludedGroups>envs</excludedGroups>
</configuration>
Expand Down
1 change: 0 additions & 1 deletion smoke-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<artifactId>smoke-test</artifactId>

<properties>
<maven.compiler.release>11</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down

0 comments on commit 9225d4a

Please sign in to comment.