bumped java to v17 and updated dependencies (#115)

kilmajster · Łukasz Włódarczyk · web-flow · commit 516ec6c966b2 · 2024-11-25T22:45:59.000+01:00
* bumped java to v17 an dupdated dependencies

* bumped java to v17

---------

Co-authored-by: Łukasz Włódarczyk &lt;lukasz.wlodarczyk@benefitsystems.pl&gt;
diff --git a/.github/test-app-sb-2x/pom.xml b/.github/test-app-sb-2x/pom.xml
@@ -14,7 +14,7 @@
 	<name>test-app</name>
 	<description>Dummy app for tests with spring-boot v2</description>
 	<properties>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 		<ngrok-spring-boot-starter.version>SNAPSHOT</ngrok-spring-boot-starter.version>
 	</properties>
 	<dependencies>
diff --git a/.github/test-app-sb-3x/pom.xml b/.github/test-app-sb-3x/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.3</version>
+		<version>3.3.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.github.kilmajster</groupId>
diff --git a/.github/workflows/automation-test-macos.yml b/.github/workflows/automation-test-macos.yml
@@ -15,11 +15,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
 
       - name: Silent install main project
         run: mvn --batch-mode --no-transfer-progress install -Dmaven.test.skip=true
@@ -30,12 +30,6 @@ jobs:
           NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }}
         run: mvn --batch-mode --no-transfer-progress test
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'adopt'
-          java-version: '17'
-
       - name: Run automation tests with latest ngrok-spring-boot-starter version on test-app and spring-boot v3
         working-directory: ./.github/test-app-sb-3x/
         env:
diff --git a/.github/workflows/automation-test-ubuntu.yml b/.github/workflows/automation-test-ubuntu.yml
@@ -15,11 +15,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
 
       - name: Silent install main project
         run: mvn --batch-mode --no-transfer-progress install -Dmaven.test.skip=true
@@ -30,12 +30,6 @@ jobs:
           NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }}
         run: mvn --batch-mode --no-transfer-progress test
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'adopt'
-          java-version: '17'
-
       - name: Run automation tests with latest ngrok-spring-boot-starter version on test-app and spring-boot v3
         working-directory: ./.github/test-app-sb-3x/
         env:
diff --git a/.github/workflows/automation-test-windows.yml b/.github/workflows/automation-test-windows.yml
@@ -15,11 +15,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '11'
+          java-version: '17'
 
       - name: Silent install main project
         run: mvn --batch-mode --no-transfer-progress install -DskipTests
@@ -30,12 +30,6 @@ jobs:
           NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }}
         run: mvn --batch-mode --no-transfer-progress test
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'adopt'
-          java-version: '17'
-
       - name: Run automation tests with latest ngrok-spring-boot-starter version on test-app and spring-boot v3
         working-directory: ./.github/test-app-sb-3x/
         env:
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -11,10 +11,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Set up JDK 1.8
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 17
 
     - name: Build with Maven
       run: mvn -B package --file pom.xml
diff --git a/.github/workflows/release-github-tag.yml b/.github/workflows/release-github-tag.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up Maven Central Repository
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 17
           server-id: ossrh
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
diff --git a/README.md b/README.md
@@ -12,14 +12,14 @@
         <img align="center" src="https://img.shields.io/github/license/kilmajster/ngrok-spring-boot-starter?color=blue" alt="MIT license badge">
     </a>
     <br>
-    <a href="https://github.com/kilmajster/ngrok-spring-boot-starter/actions?query=workflow%3A%22CI+on+windows-latest%22">
-        <img align="center" src="https://github.com/kilmajster/ngrok-spring-boot-starter/workflows/CI%20on%20windows-latest/badge.svg" alt="CI on Windows">
+    <a href="https://github.com/kilmajster/ngrok-spring-boot-starter/actions/workflows/automation-test-windows.yml">
+        <img align="center" src="https://github.com/kilmajster/ngrok-spring-boot-starter/actions/workflows/automation-test-windows.yml/badge.svg" alt="CI on Windows">
     </a>
-    <a href="https://github.com/kilmajster/ngrok-spring-boot-starter/actions?query=workflow%3A%22CI+on+ubuntu-latest%22">
-        <img align="center" src="https://github.com/kilmajster/ngrok-spring-boot-starter/workflows/CI%20on%20ubuntu-latest/badge.svg" alt="CI on Ubuntu">
+    <a href="https://github.com/kilmajster/ngrok-spring-boot-starter/actions/workflows/automation-test-ubuntu.yml">
+        <img align="center" src="https://github.com/kilmajster/ngrok-spring-boot-starter/actions/workflows/automation-test-ubuntu.yml/badge.svg" alt="CI on Ubuntu">
     </a>
-    <a href="https://github.com/kilmajster/ngrok-spring-boot-starter/actions?query=workflow%3A%22CI+on+macos-latest%22">
-        <img align="center" src="https://github.com/kilmajster/ngrok-spring-boot-starter/workflows/CI%20on%20macos-latest/badge.svg" alt="CI on MacOS">
+    <a href="https://github.com/kilmajster/ngrok-spring-boot-starter/actions/workflows/automation-test-macos.yml">
+        <img align="center" src="https://github.com/kilmajster/ngrok-spring-boot-starter/actions/workflows/automation-test-macos.yml/badge.svg" alt="CI on MacOS">
     </a>
 </h1>
 <p align="center">
@@ -45,7 +45,9 @@ with the remote links, just like it's done below 👇
     <img src="https://github.com/kilmajster/ngrok-spring-boot-starter/blob/main/.github/demo.gif" alt="demo gif">
 </p>
 
-Code of demo application available [here](https://github.com/kilmajster/demo).
+Code of demo application is available 
+[here](https://github.com/kilmajster/ngrok-spring-boot-starter/tree/main/.github/test-app-sb-2x) for spring-boot v2 and 
+[here](https://github.com/kilmajster/ngrok-spring-boot-starter/tree/main/.github/test-app-sb-3x) for v3.
 
 ## Dependency
 - maven:
diff --git a/pom.xml b/pom.xml
@@ -59,26 +59,27 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.18</version>
+        <version>3.3.5</version>
         <relativePath/>
     </parent>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
 
-        <maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
-        <maven-javadoc-plugin.version>3.8.0</maven-javadoc-plugin.version>
-        <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
-
-        <commons-io.version>2.16.1</commons-io.version>
-        <commons-lang3.version>3.15.0</commons-lang3.version>
+        <commons-io.version>2.18.0</commons-io.version>
+        <commons-lang3.version>3.17.0</commons-lang3.version>
         <commons-compress.version>1.27.1</commons-compress.version>
-        <jackson-dataformat-yaml.version>2.17.2</jackson-dataformat-yaml.version>
+        <jackson-dataformat-yaml.version>2.18.1</jackson-dataformat-yaml.version>
+
+        <spring-cloud-contract-wiremock.version>4.1.4</spring-cloud-contract-wiremock.version>
 
-        <spring-cloud-contract-wiremock.version>3.1.10</spring-cloud-contract-wiremock.version>
+        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+        <maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
+        <maven-javadoc-plugin.version>3.11.1</maven-javadoc-plugin.version>
+        <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
     </properties>
 
     <dependencies>
@@ -155,40 +156,40 @@
                     <target>${java.version}</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>${maven-javadoc-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>${maven-source-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
-
     </build>
+
     <profiles>
         <profile>
             <id>ossrh</id>
             <build>
                 <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>${maven-javadoc-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <version>${maven-source-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
