Updated dependencies

Hakky54 · Aug 6, 2024 · 5ec54c6 · 5ec54c6
1 parent 9f9a3cb
commit 5ec54c6
Show file tree

Hide file tree

Showing 24 changed files with 73 additions and 46 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -7,16 +7,16 @@ on:
   pull_request:
 
 jobs:
-  build-on-linux-with-jdk-11:
+  build-on-linux-with-jdk-17:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
-          java-version: '11'
+          distribution: 'zulu'
+          java-version: '17'
           cache: 'maven'
 
       - name: Build and test

diff --git a/README.MD b/README.MD
@@ -4,7 +4,7 @@
 A repository containing different java tutorials
 
 **Minimum requirements:**
-1. Java 11
+1. Java 17
 2. Maven 3.5.0
 3. Eclipse, Intellij IDEA (or any other text editor like VIM)
 4. A terminal

diff --git a/bypassing-overruling-ssl-configuration/README.md b/bypassing-overruling-ssl-configuration/README.md
@@ -6,7 +6,7 @@ This projects demonstrates bypassing the ssl configuration of mysql-connector-j
 This mechanism will also work with other libraries.
 
 #### Requirements
-- Java 11
+- Java 17
 - Terminal
 - Docker
 

diff --git a/bypassing-overruling-ssl-configuration/pom.xml b/bypassing-overruling-ssl-configuration/pom.xml
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>${version.slf4j-simple}</version>
+            <version>${version.slf4j}</version>
         </dependency>
         <dependency>
             <groupId>io.github.hakky54</groupId>

diff --git a/...tor-examples/console-captor-with-quarkus-jboss-lombok/src/test/resources/logback-test.xml b/...tor-examples/console-captor-with-quarkus-jboss-lombok/src/test/resources/logback-test.xml
@@ -6,7 +6,7 @@
         </encoder>
     </appender>
 
-    <root level="TRACE">
+    <root level="INFO">
         <appender-ref ref="STDOUT" />
     </root>
 

diff --git a/elasticsearch-with-ssl/README.md b/elasticsearch-with-ssl/README.md
@@ -1,7 +1,7 @@
 # ElasticSearch with SSL 🔐
 
 #### Requirements
- - Java 11
+ - Java 17
  - Terminal
  - Docker 
  - Eclipse or Intellij IDEA

diff --git a/elasticsearch-with-ssl/pom.xml b/elasticsearch-with-ssl/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>${version.slf4j-simple}</version>
+            <version>${version.slf4j}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>

diff --git a/grpc-client-server-with-ssl/instant-server-ssl-reloading-with-grpc/README.md b/grpc-client-server-with-ssl/instant-server-ssl-reloading-with-grpc/README.md
@@ -11,7 +11,7 @@ The server has currently one way to update the existing ssl material:
  - File based aka file change listener, see here for the implementation: [FilesBasedSslUpdateService](src/main/java/nl/altindag/grpc/server/service/FileBasedSslUpdateService.java)
 
 #### Requirements
- - Java 11
+ - Java 17
  - Terminal
 
 #### Configure SSL Update Service

diff --git a/instant-server-ssl-reloading-with-netty/netty-server/README.md b/instant-server-ssl-reloading-with-netty/netty-server/README.md
@@ -11,7 +11,7 @@ The server has currently one way to update the existing ssl material:
  - File based aka file change listener, see here for the implementation: [FilesBasedSslUpdateService](src/main/java/nl/altindag/server/service/FileBasedSslUpdateService.java)
 
 #### Requirements
- - Java 11
+ - Java 17
  - Terminal
 
 #### Configure SSL Update Service

diff --git a/instant-server-ssl-reloading-with-quarkus/README.md b/instant-server-ssl-reloading-with-quarkus/README.md
@@ -11,7 +11,7 @@ The server has currently one way to update the existing ssl material:
  - File based aka file change listener, see here for the implementation: [FilesBasedSslUpdateService](src/main/java/nl/altindag/server/service/FileBasedSslUpdateService.java)
 
 #### Requirements
- - Java 11
+ - Java 17
  - Terminal
 
 #### Configure SSL Update Service

diff --git a/instant-server-ssl-reloading-with-vertx/vertx-server/README.md b/instant-server-ssl-reloading-with-vertx/vertx-server/README.md
@@ -11,7 +11,7 @@ The server has currently one way to update the existing ssl material:
  - File based aka file change listener, see here for the implementation: [FilesBasedSslUpdateService](src/main/java/nl/altindag/server/service/FileBasedSslUpdateService.java)
 
 #### Requirements
- - Java 11
+ - Java 17
  - Terminal
 
 #### Configure SSL Update Service

diff --git a/instant-server-ssl-reloading/README.md b/instant-server-ssl-reloading/README.md
@@ -13,7 +13,7 @@ The server has two ways to update the existing ssl material:
  - File based aka file change listener, see here for the implementation: [FilesBasedSslUpdateService](server/src/main/java/nl/altindag/server/service/FileBasedSslUpdateService.java)
  - Databased based, aka database change listener. This option is hosted in a separate module within this repository, see here: [Instant SSL Reloading With Database](https://github.com/Hakky54/java-tutorials/tree/main/instant-ssl-reloading-with-spring-jetty-database)
 #### Requirements
- - Java 11
+ - Java 17
  - Terminal
 
 #### Start the server

diff --git a/instant-ssl-reloading-with-spring-jetty-database/README.md b/instant-ssl-reloading-with-spring-jetty-database/README.md
@@ -14,7 +14,7 @@ It will be calling the database every 10 seconds to get the ssl material. The ss
  - [DatabaseBasedSslUpdateService](src/main/java/nl/altindag/server/service/DatabaseBasedSslUpdateService.java)
 
 #### Requirements
- - Java 11
+ - Java 17
  - Terminal
  - Docker
 

diff --git a/...oading-with-spring-jetty-database/src/main/java/nl/altindag/server/model/SSLMaterial.java b/...oading-with-spring-jetty-database/src/main/java/nl/altindag/server/model/SSLMaterial.java
@@ -15,7 +15,12 @@
  */
 package nl.altindag.server.model;
 
-import javax.persistence.*;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+
 import java.sql.Timestamp;
 
 @Entity

diff --git a/instant-ssl-reloading-with-spring-tomcat/README.md b/instant-ssl-reloading-with-spring-tomcat/README.md
@@ -11,7 +11,7 @@ The server has two ways to update the existing ssl material:
 - File based aka file change listener, see here for the implementation: [FilesBasedSslUpdateService](src/main/java/nl/altindag/server/service/FileBasedSslUpdateService.java)
 - Databased based, aka database change listener. This option is hosted in a separate module within this repository, see here: [Instant SSL Reloading With Database](https://github.com/Hakky54/java-tutorials/tree/main/instant-ssl-reloading-with-spring-jetty-database)
 #### Requirements
-- Java 11
+- Java 17
 - Terminal
 
 #### Start the server

diff --git a/instant-ssl-reloading-with-spring-tomcat/pom.xml b/instant-ssl-reloading-with-spring-tomcat/pom.xml
@@ -14,11 +14,6 @@
     <packaging>jar</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>${version.slf4j-simple}</version>
-        </dependency>
         <dependency>
             <groupId>io.github.hakky54</groupId>
             <artifactId>sslcontext-kickstart</artifactId>

diff --git a/...ok/src/test/java/nl/altindag/quarkus/resource/GreetingsResourceWithQuarkusTestShould.java b/...ok/src/test/java/nl/altindag/quarkus/resource/GreetingsResourceWithQuarkusTestShould.java
@@ -17,6 +17,7 @@
 
 import io.quarkus.test.junit.QuarkusTest;
 import nl.altindag.log.LogCaptor;
+import nl.altindag.log.exception.LogCaptorException;
 import org.junit.jupiter.api.Test;
 
 import static io.restassured.RestAssured.given;
@@ -29,7 +30,7 @@ public class GreetingsResourceWithQuarkusTestShould {
     @Test
     void capturingLogFailsBecauseOfDifferentClassloadersFromQuarkusTest() {
         assertThatThrownBy(LogCaptor::forRoot)
-                .isInstanceOf(IllegalArgumentException.class)
+                .isInstanceOf(LogCaptorException.class)
                 .hasMessageContaining("Multiple classloaders are being used. " +
                         "The Logging API is created by the following classloader: [jdk.internal.loader.ClassLoaders$AppClassLoader], " +
                         "while it should have been created by the following classloader: [io.quarkus.bootstrap.classloading.QuarkusClassLoader].");

diff --git a/log-captor-examples/log-captor-with-spring-boot-starter-log4j2/pom.xml b/log-captor-examples/log-captor-with-spring-boot-starter-log4j2/pom.xml
@@ -29,7 +29,7 @@
                 <version>${version.maven-surefire-plugin}</version>
                 <configuration>
                     <classpathDependencyExcludes>
-                        <classpathDependencyExclude>org.apache.logging.log4j:log4j-slf4j-impl</classpathDependencyExclude>
+                        <classpathDependencyExclude>org.apache.logging.log4j:log4j-slf4j2-impl</classpathDependencyExclude>
                     </classpathDependencyExcludes>
                 </configuration>
             </plugin>

diff --git a/mock-statics-with-mockito/pom.xml b/mock-statics-with-mockito/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-inline</artifactId>
-            <version>${version.mockito}</version>
+            <version>${version.mockito-inline}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -59,15 +59,14 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <license.git.copyrightYears>2022</license.git.copyrightYears>
 
-        <version.sslcontext-kickstart>8.3.2</version.sslcontext-kickstart>
-        <version.logcaptor>2.9.0</version.logcaptor>
-        <version.spring>2.7.5</version.spring>
-        <version-tomcat>9.0.86</version-tomcat>
-        <version.aspectweaver>1.9.9.1</version.aspectweaver>
-        <version.jackson>2.14.1</version.jackson>
-        <version.slf4j>2.0.6</version.slf4j>
-        <version.slf4j-simple>2.0.6</version.slf4j-simple>
-        <version.log4j-core>2.19.0</version.log4j-core>
+        <version.sslcontext-kickstart>8.3.6</version.sslcontext-kickstart>
+        <version.logcaptor>2.9.3</version.logcaptor>
+        <version.spring>3.3.2</version.spring>
+        <version-tomcat>10.1.26</version-tomcat>
+        <version.aspectweaver>1.9.22.1</version.aspectweaver>
+        <version.jackson>2.17.2</version.jackson>
+        <version.slf4j>2.0.13</version.slf4j>
+        <version.log4j-core>2.23.1</version.log4j-core>
         <version.log4j-slf4j>2.19.0</version.log4j-slf4j>
         <version.log4j-log4j-slf4j18>2.18.0</version.log4j-log4j-slf4j18>
         <version.logback-classic>1.3.5</version.logback-classic>
@@ -79,19 +78,37 @@
         <version.protoc>3.12.0</version.protoc>
         <version.websocket-client>9.4.50.v20221201</version.websocket-client>
         <version.vertx>4.3.7</version.vertx>
-        <version.netty>4.1.86.Final</version.netty>
-        <version.quarkus>3.0.3.Final</version.quarkus>
+        <version.netty>4.1.112.Final</version.netty>
+        <version.quarkus>3.13.0</version.quarkus>
         <version.mysql-connector>8.3.0</version.mysql-connector>
-        <version.lombok>1.18.24</version.lombok>
-        <version.jboss-logging>3.5.0.Final</version.jboss-logging>
+        <version.lombok>1.18.34</version.lombok>
+        <version.jboss-logging>3.6.0.Final</version.jboss-logging>
         <version.assertj-core>3.23.1</version.assertj-core>
-        <version.junit>5.9.1</version.junit>
-        <version.mockito>4.11.0</version.mockito>
+        <version.junit>5.10.3</version.junit>
+        <version.junit-platform>1.10.3</version.junit-platform>
+        <version.mockito>5.12.0</version.mockito>
+        <version.mockito-inline>5.2.0</version.mockito-inline>
         <version.consolecaptor>1.0.3</version.consolecaptor>
         <version.postgresql>42.5.0</version.postgresql>
         <version.testcontainers-postgresql>1.17.3</version.testcontainers-postgresql>
     </properties>
 
+<!--    <dependencyManagement>-->
+<!--        <dependencies>-->
+<!--            <dependency>-->
+<!--                <groupId>org.junit.platform</groupId>-->
+<!--                <artifactId>junit-platform-commons</artifactId>-->
+<!--                <version>${version.junit-platform}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>org.junit.platform</groupId>-->
+<!--                <artifactId>junit-platform-engine</artifactId>-->
+<!--                <version>${version.junit-platform}</version>-->
+<!--                <scope>test</scope>-->
+<!--            </dependency>-->
+<!--        </dependencies>-->
+<!--    </dependencyManagement>-->
+
     <build>
         <plugins>
             <plugin>

diff --git a/spring-cn-validation-with-aop/pom.xml b/spring-cn-validation-with-aop/pom.xml
@@ -25,6 +25,11 @@
                 <artifactId>spring-boot-starter-web</artifactId>
                 <version>${version.spring}</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-logging</artifactId>
+                <version>${version.spring}</version>
+            </dependency>
             <dependency>
                 <groupId>org.aspectj</groupId>
                 <artifactId>aspectjweaver</artifactId>
@@ -39,7 +44,7 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-simple</artifactId>
-                <version>${version.slf4j-simple}</version>
+                <version>${version.slf4j}</version>
             </dependency>
 
             <dependency>

diff --git a/spring-cn-validation-with-aop/server-with-cn-validation/pom.xml b/spring-cn-validation-with-aop/server-with-cn-validation/pom.xml
@@ -32,6 +32,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-logging</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>

diff --git a/spring-security-cn-validation-for-reactive-server/pom.xml b/spring-security-cn-validation-for-reactive-server/pom.xml
@@ -44,7 +44,7 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-simple</artifactId>
-                <version>${version.slf4j-simple}</version>
+                <version>${version.slf4j}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/two-way-object-serialization/README.md b/two-way-object-serialization/README.md
@@ -9,7 +9,7 @@ The flow would be like the diagram below:
 ![alt text](https://github.com/Hakky54/java-tutorials/blob/main/two-way-object-serialization/images/flow.png?raw=true)
 
 #### Requirements
- - Java 11
+ - Java 17
  - Terminal
 
 #### Start the server