Skip to content

Commit 5ec54c6

Browse files
committed
Updated dependencies
1 parent 9f9a3cb commit 5ec54c6

File tree

24 files changed

+73
-46
lines changed

24 files changed

+73
-46
lines changed

.github/workflows/maven.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ on:
77
pull_request:
88

99
jobs:
10-
build-on-linux-with-jdk-11:
10+
build-on-linux-with-jdk-17:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414

15-
- name: Set up JDK 11
16-
uses: actions/setup-java@v2
15+
- name: Set up JDK
16+
uses: actions/setup-java@v4
1717
with:
18-
distribution: 'adopt'
19-
java-version: '11'
18+
distribution: 'zulu'
19+
java-version: '17'
2020
cache: 'maven'
2121

2222
- name: Build and test

README.MD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
A repository containing different java tutorials
55

66
**Minimum requirements:**
7-
1. Java 11
7+
1. Java 17
88
2. Maven 3.5.0
99
3. Eclipse, Intellij IDEA (or any other text editor like VIM)
1010
4. A terminal

bypassing-overruling-ssl-configuration/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This projects demonstrates bypassing the ssl configuration of mysql-connector-j
66
This mechanism will also work with other libraries.
77

88
#### Requirements
9-
- Java 11
9+
- Java 17
1010
- Terminal
1111
- Docker
1212

bypassing-overruling-ssl-configuration/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>org.slf4j</groupId>
1919
<artifactId>slf4j-simple</artifactId>
20-
<version>${version.slf4j-simple}</version>
20+
<version>${version.slf4j}</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>io.github.hakky54</groupId>

console-captor-examples/console-captor-with-quarkus-jboss-lombok/src/test/resources/logback-test.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</encoder>
77
</appender>
88

9-
<root level="TRACE">
9+
<root level="INFO">
1010
<appender-ref ref="STDOUT" />
1111
</root>
1212

elasticsearch-with-ssl/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ElasticSearch with SSL 🔐
22

33
#### Requirements
4-
- Java 11
4+
- Java 17
55
- Terminal
66
- Docker
77
- Eclipse or Intellij IDEA

elasticsearch-with-ssl/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>org.slf4j</groupId>
3737
<artifactId>slf4j-simple</artifactId>
38-
<version>${version.slf4j-simple}</version>
38+
<version>${version.slf4j}</version>
3939
</dependency>
4040
<dependency>
4141
<groupId>org.apache.logging.log4j</groupId>

grpc-client-server-with-ssl/instant-server-ssl-reloading-with-grpc/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The server has currently one way to update the existing ssl material:
1111
- File based aka file change listener, see here for the implementation: [FilesBasedSslUpdateService](src/main/java/nl/altindag/grpc/server/service/FileBasedSslUpdateService.java)
1212

1313
#### Requirements
14-
- Java 11
14+
- Java 17
1515
- Terminal
1616

1717
#### Configure SSL Update Service

instant-server-ssl-reloading-with-netty/netty-server/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The server has currently one way to update the existing ssl material:
1111
- File based aka file change listener, see here for the implementation: [FilesBasedSslUpdateService](src/main/java/nl/altindag/server/service/FileBasedSslUpdateService.java)
1212

1313
#### Requirements
14-
- Java 11
14+
- Java 17
1515
- Terminal
1616

1717
#### Configure SSL Update Service

instant-server-ssl-reloading-with-quarkus/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The server has currently one way to update the existing ssl material:
1111
- File based aka file change listener, see here for the implementation: [FilesBasedSslUpdateService](src/main/java/nl/altindag/server/service/FileBasedSslUpdateService.java)
1212

1313
#### Requirements
14-
- Java 11
14+
- Java 17
1515
- Terminal
1616

1717
#### Configure SSL Update Service

instant-server-ssl-reloading-with-vertx/vertx-server/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The server has currently one way to update the existing ssl material:
1111
- File based aka file change listener, see here for the implementation: [FilesBasedSslUpdateService](src/main/java/nl/altindag/server/service/FileBasedSslUpdateService.java)
1212

1313
#### Requirements
14-
- Java 11
14+
- Java 17
1515
- Terminal
1616

1717
#### Configure SSL Update Service

instant-server-ssl-reloading/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The server has two ways to update the existing ssl material:
1313
- File based aka file change listener, see here for the implementation: [FilesBasedSslUpdateService](server/src/main/java/nl/altindag/server/service/FileBasedSslUpdateService.java)
1414
- 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)
1515
#### Requirements
16-
- Java 11
16+
- Java 17
1717
- Terminal
1818

1919
#### Start the server

instant-ssl-reloading-with-spring-jetty-database/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ It will be calling the database every 10 seconds to get the ssl material. The ss
1414
- [DatabaseBasedSslUpdateService](src/main/java/nl/altindag/server/service/DatabaseBasedSslUpdateService.java)
1515

1616
#### Requirements
17-
- Java 11
17+
- Java 17
1818
- Terminal
1919
- Docker
2020

instant-ssl-reloading-with-spring-jetty-database/src/main/java/nl/altindag/server/model/SSLMaterial.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@
1515
*/
1616
package nl.altindag.server.model;
1717

18-
import javax.persistence.*;
18+
import jakarta.persistence.Entity;
19+
import jakarta.persistence.GeneratedValue;
20+
import jakarta.persistence.GenerationType;
21+
import jakarta.persistence.Id;
22+
import jakarta.persistence.Table;
23+
1924
import java.sql.Timestamp;
2025

2126
@Entity

instant-ssl-reloading-with-spring-tomcat/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The server has two ways to update the existing ssl material:
1111
- File based aka file change listener, see here for the implementation: [FilesBasedSslUpdateService](src/main/java/nl/altindag/server/service/FileBasedSslUpdateService.java)
1212
- 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)
1313
#### Requirements
14-
- Java 11
14+
- Java 17
1515
- Terminal
1616

1717
#### Start the server

instant-ssl-reloading-with-spring-tomcat/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@
1414
<packaging>jar</packaging>
1515

1616
<dependencies>
17-
<dependency>
18-
<groupId>org.slf4j</groupId>
19-
<artifactId>slf4j-simple</artifactId>
20-
<version>${version.slf4j-simple}</version>
21-
</dependency>
2217
<dependency>
2318
<groupId>io.github.hakky54</groupId>
2419
<artifactId>sslcontext-kickstart</artifactId>

log-captor-examples/log-captor-with-quarkus-jboss-lombok/src/test/java/nl/altindag/quarkus/resource/GreetingsResourceWithQuarkusTestShould.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import io.quarkus.test.junit.QuarkusTest;
1919
import nl.altindag.log.LogCaptor;
20+
import nl.altindag.log.exception.LogCaptorException;
2021
import org.junit.jupiter.api.Test;
2122

2223
import static io.restassured.RestAssured.given;
@@ -29,7 +30,7 @@ public class GreetingsResourceWithQuarkusTestShould {
2930
@Test
3031
void capturingLogFailsBecauseOfDifferentClassloadersFromQuarkusTest() {
3132
assertThatThrownBy(LogCaptor::forRoot)
32-
.isInstanceOf(IllegalArgumentException.class)
33+
.isInstanceOf(LogCaptorException.class)
3334
.hasMessageContaining("Multiple classloaders are being used. " +
3435
"The Logging API is created by the following classloader: [jdk.internal.loader.ClassLoaders$AppClassLoader], " +
3536
"while it should have been created by the following classloader: [io.quarkus.bootstrap.classloading.QuarkusClassLoader].");

log-captor-examples/log-captor-with-spring-boot-starter-log4j2/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<version>${version.maven-surefire-plugin}</version>
3030
<configuration>
3131
<classpathDependencyExcludes>
32-
<classpathDependencyExclude>org.apache.logging.log4j:log4j-slf4j-impl</classpathDependencyExclude>
32+
<classpathDependencyExclude>org.apache.logging.log4j:log4j-slf4j2-impl</classpathDependencyExclude>
3333
</classpathDependencyExcludes>
3434
</configuration>
3535
</plugin>

mock-statics-with-mockito/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>org.mockito</groupId>
3636
<artifactId>mockito-inline</artifactId>
37-
<version>${version.mockito}</version>
37+
<version>${version.mockito-inline}</version>
3838
<scope>test</scope>
3939
</dependency>
4040
<dependency>

pom.xml

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,14 @@
5959
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6060
<license.git.copyrightYears>2022</license.git.copyrightYears>
6161

62-
<version.sslcontext-kickstart>8.3.2</version.sslcontext-kickstart>
63-
<version.logcaptor>2.9.0</version.logcaptor>
64-
<version.spring>2.7.5</version.spring>
65-
<version-tomcat>9.0.86</version-tomcat>
66-
<version.aspectweaver>1.9.9.1</version.aspectweaver>
67-
<version.jackson>2.14.1</version.jackson>
68-
<version.slf4j>2.0.6</version.slf4j>
69-
<version.slf4j-simple>2.0.6</version.slf4j-simple>
70-
<version.log4j-core>2.19.0</version.log4j-core>
62+
<version.sslcontext-kickstart>8.3.6</version.sslcontext-kickstart>
63+
<version.logcaptor>2.9.3</version.logcaptor>
64+
<version.spring>3.3.2</version.spring>
65+
<version-tomcat>10.1.26</version-tomcat>
66+
<version.aspectweaver>1.9.22.1</version.aspectweaver>
67+
<version.jackson>2.17.2</version.jackson>
68+
<version.slf4j>2.0.13</version.slf4j>
69+
<version.log4j-core>2.23.1</version.log4j-core>
7170
<version.log4j-slf4j>2.19.0</version.log4j-slf4j>
7271
<version.log4j-log4j-slf4j18>2.18.0</version.log4j-log4j-slf4j18>
7372
<version.logback-classic>1.3.5</version.logback-classic>
@@ -79,19 +78,37 @@
7978
<version.protoc>3.12.0</version.protoc>
8079
<version.websocket-client>9.4.50.v20221201</version.websocket-client>
8180
<version.vertx>4.3.7</version.vertx>
82-
<version.netty>4.1.86.Final</version.netty>
83-
<version.quarkus>3.0.3.Final</version.quarkus>
81+
<version.netty>4.1.112.Final</version.netty>
82+
<version.quarkus>3.13.0</version.quarkus>
8483
<version.mysql-connector>8.3.0</version.mysql-connector>
85-
<version.lombok>1.18.24</version.lombok>
86-
<version.jboss-logging>3.5.0.Final</version.jboss-logging>
84+
<version.lombok>1.18.34</version.lombok>
85+
<version.jboss-logging>3.6.0.Final</version.jboss-logging>
8786
<version.assertj-core>3.23.1</version.assertj-core>
88-
<version.junit>5.9.1</version.junit>
89-
<version.mockito>4.11.0</version.mockito>
87+
<version.junit>5.10.3</version.junit>
88+
<version.junit-platform>1.10.3</version.junit-platform>
89+
<version.mockito>5.12.0</version.mockito>
90+
<version.mockito-inline>5.2.0</version.mockito-inline>
9091
<version.consolecaptor>1.0.3</version.consolecaptor>
9192
<version.postgresql>42.5.0</version.postgresql>
9293
<version.testcontainers-postgresql>1.17.3</version.testcontainers-postgresql>
9394
</properties>
9495

96+
<!-- <dependencyManagement>-->
97+
<!-- <dependencies>-->
98+
<!-- <dependency>-->
99+
<!-- <groupId>org.junit.platform</groupId>-->
100+
<!-- <artifactId>junit-platform-commons</artifactId>-->
101+
<!-- <version>${version.junit-platform}</version>-->
102+
<!-- </dependency>-->
103+
<!-- <dependency>-->
104+
<!-- <groupId>org.junit.platform</groupId>-->
105+
<!-- <artifactId>junit-platform-engine</artifactId>-->
106+
<!-- <version>${version.junit-platform}</version>-->
107+
<!-- <scope>test</scope>-->
108+
<!-- </dependency>-->
109+
<!-- </dependencies>-->
110+
<!-- </dependencyManagement>-->
111+
95112
<build>
96113
<plugins>
97114
<plugin>

spring-cn-validation-with-aop/pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
<artifactId>spring-boot-starter-web</artifactId>
2626
<version>${version.spring}</version>
2727
</dependency>
28+
<dependency>
29+
<groupId>org.springframework.boot</groupId>
30+
<artifactId>spring-boot-starter-logging</artifactId>
31+
<version>${version.spring}</version>
32+
</dependency>
2833
<dependency>
2934
<groupId>org.aspectj</groupId>
3035
<artifactId>aspectjweaver</artifactId>
@@ -39,7 +44,7 @@
3944
<dependency>
4045
<groupId>org.slf4j</groupId>
4146
<artifactId>slf4j-simple</artifactId>
42-
<version>${version.slf4j-simple}</version>
47+
<version>${version.slf4j}</version>
4348
</dependency>
4449

4550
<dependency>

spring-cn-validation-with-aop/server-with-cn-validation/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
<groupId>org.springframework.boot</groupId>
3333
<artifactId>spring-boot-starter-test</artifactId>
3434
</dependency>
35+
<dependency>
36+
<groupId>org.springframework.boot</groupId>
37+
<artifactId>spring-boot-starter-logging</artifactId>
38+
</dependency>
3539
<dependency>
3640
<groupId>org.mockito</groupId>
3741
<artifactId>mockito-junit-jupiter</artifactId>

spring-security-cn-validation-for-reactive-server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>org.slf4j</groupId>
4646
<artifactId>slf4j-simple</artifactId>
47-
<version>${version.slf4j-simple}</version>
47+
<version>${version.slf4j}</version>
4848
</dependency>
4949
</dependencies>
5050
</dependencyManagement>

two-way-object-serialization/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The flow would be like the diagram below:
99
![alt text](https://github.com/Hakky54/java-tutorials/blob/main/two-way-object-serialization/images/flow.png?raw=true)
1010

1111
#### Requirements
12-
- Java 11
12+
- Java 17
1313
- Terminal
1414

1515
#### Start the server

0 commit comments

Comments
 (0)