diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index d8387a3..bec298a 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -10,13 +10,13 @@ jobs: build-on-linux-with-jdk-11: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/setup-java@v4 - - name: Set up JDK 11 - uses: actions/setup-java@v2 + - name: Set up JDK 17 + 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 index 547d37c..3ceaee2 100644 --- 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 index 2d3f90a..2090641 100644 --- 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 index eede266..628f9f4 100644 --- a/bypassing-overruling-ssl-configuration/pom.xml +++ b/bypassing-overruling-ssl-configuration/pom.xml @@ -17,7 +17,7 @@ org.slf4j slf4j-simple - ${version.slf4j-simple} + ${version.slf4j} io.github.hakky54 diff --git a/console-captor-examples/console-captor-with-quarkus-jboss-lombok/src/test/resources/logback-test.xml b/console-captor-examples/console-captor-with-quarkus-jboss-lombok/src/test/resources/logback-test.xml index f909054..f279052 100644 --- a/console-captor-examples/console-captor-with-quarkus-jboss-lombok/src/test/resources/logback-test.xml +++ b/console-captor-examples/console-captor-with-quarkus-jboss-lombok/src/test/resources/logback-test.xml @@ -6,7 +6,7 @@ - + diff --git a/elasticsearch-with-ssl/README.md b/elasticsearch-with-ssl/README.md index d0a1879..c47645c 100644 --- 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 index 7344e39..fdf0b4a 100644 --- a/elasticsearch-with-ssl/pom.xml +++ b/elasticsearch-with-ssl/pom.xml @@ -35,7 +35,7 @@ org.slf4j slf4j-simple - ${version.slf4j-simple} + ${version.slf4j} org.apache.logging.log4j 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 index ab142f4..b004842 100644 --- 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 index c3e8a6d..06829b2 100644 --- 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 index d99e07b..e59f9ab 100644 --- 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 index 783eccb..8d1d54b 100644 --- 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 index fa3795e..be757cc 100644 --- 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 index 8bbf91f..e21071e 100644 --- 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/instant-ssl-reloading-with-spring-jetty-database/src/main/java/nl/altindag/server/model/SSLMaterial.java b/instant-ssl-reloading-with-spring-jetty-database/src/main/java/nl/altindag/server/model/SSLMaterial.java index 72b24e9..882aa99 100644 --- a/instant-ssl-reloading-with-spring-jetty-database/src/main/java/nl/altindag/server/model/SSLMaterial.java +++ b/instant-ssl-reloading-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 index 2340375..55e606a 100644 --- 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 index 854aed6..213cfc6 100644 --- a/instant-ssl-reloading-with-spring-tomcat/pom.xml +++ b/instant-ssl-reloading-with-spring-tomcat/pom.xml @@ -14,11 +14,6 @@ jar - - org.slf4j - slf4j-simple - ${version.slf4j-simple} - io.github.hakky54 sslcontext-kickstart diff --git a/log-captor-examples/log-captor-with-quarkus-jboss-lombok/src/test/java/nl/altindag/quarkus/resource/GreetingsResourceWithQuarkusTestShould.java b/log-captor-examples/log-captor-with-quarkus-jboss-lombok/src/test/java/nl/altindag/quarkus/resource/GreetingsResourceWithQuarkusTestShould.java index 8d03833..ec4c59f 100644 --- a/log-captor-examples/log-captor-with-quarkus-jboss-lombok/src/test/java/nl/altindag/quarkus/resource/GreetingsResourceWithQuarkusTestShould.java +++ b/log-captor-examples/log-captor-with-quarkus-jboss-lombok/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 index e5d6209..e278005 100644 --- 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.maven-surefire-plugin} - org.apache.logging.log4j:log4j-slf4j-impl + org.apache.logging.log4j:log4j-slf4j2-impl diff --git a/mock-statics-with-mockito/pom.xml b/mock-statics-with-mockito/pom.xml index a720d69..57501e4 100644 --- a/mock-statics-with-mockito/pom.xml +++ b/mock-statics-with-mockito/pom.xml @@ -34,7 +34,7 @@ org.mockito mockito-inline - ${version.mockito} + ${version.mockito-inline} test diff --git a/pom.xml b/pom.xml index 1b58219..e2049a4 100644 --- a/pom.xml +++ b/pom.xml @@ -59,15 +59,14 @@ UTF-8 2022 - 8.3.2 - 2.9.0 - 2.7.5 - 9.0.86 - 1.9.9.1 - 2.14.1 - 2.0.6 - 2.0.6 - 2.19.0 + 8.3.6 + 2.9.3 + 3.3.2 + 10.1.26 + 1.9.22.1 + 2.17.2 + 2.0.13 + 2.23.1 2.19.0 2.18.0 1.3.5 @@ -79,19 +78,37 @@ 3.12.0 9.4.50.v20221201 4.3.7 - 4.1.86.Final - 3.0.3.Final + 4.1.112.Final + 3.13.0 8.3.0 - 1.18.24 - 3.5.0.Final + 1.18.34 + 3.6.0.Final 3.23.1 - 5.9.1 - 4.11.0 + 5.10.3 + 1.10.3 + 5.12.0 + 5.2.0 1.0.3 42.5.0 1.17.3 + + + + + + + + + + + + + + + + diff --git a/spring-cn-validation-with-aop/pom.xml b/spring-cn-validation-with-aop/pom.xml index 5c92c37..49c4f6f 100644 --- a/spring-cn-validation-with-aop/pom.xml +++ b/spring-cn-validation-with-aop/pom.xml @@ -25,6 +25,11 @@ spring-boot-starter-web ${version.spring} + + org.springframework.boot + spring-boot-starter-logging + ${version.spring} + org.aspectj aspectjweaver @@ -39,7 +44,7 @@ org.slf4j slf4j-simple - ${version.slf4j-simple} + ${version.slf4j} 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 index 779628e..bddc3c0 100644 --- 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 @@ org.springframework.boot spring-boot-starter-test + + org.springframework.boot + spring-boot-starter-logging + org.mockito mockito-junit-jupiter diff --git a/spring-security-cn-validation-for-reactive-server/pom.xml b/spring-security-cn-validation-for-reactive-server/pom.xml index 016cfa7..e0ea9f8 100644 --- a/spring-security-cn-validation-for-reactive-server/pom.xml +++ b/spring-security-cn-validation-for-reactive-server/pom.xml @@ -44,7 +44,7 @@ org.slf4j slf4j-simple - ${version.slf4j-simple} + ${version.slf4j} diff --git a/two-way-object-serialization/README.md b/two-way-object-serialization/README.md index 7a4f584..6d9bf5f 100644 --- 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