Skip to content

Commit c765522

Browse files
emeraldjavaemeraldjava
committed
Use JDK 21 and lombok 1.18.30+
1 parent cd604e7 commit c765522

File tree

8 files changed

+214
-22
lines changed

8 files changed

+214
-22
lines changed

‎dual-contexts/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<packaging>jar</packaging>
1818

1919
<properties>
20-
<maven.compiler.source>11</maven.compiler.source>
21-
<maven.compiler.target>11</maven.compiler.target>
20+
<maven.compiler.source>21</maven.compiler.source>
21+
<maven.compiler.target>21</maven.compiler.target>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2323
</properties>
2424

@@ -49,6 +49,7 @@
4949
<dependency>
5050
<groupId>org.projectlombok</groupId>
5151
<artifactId>lombok</artifactId>
52+
<version>1.18.30</version>
5253
<optional>true</optional>
5354
</dependency>
5455
<dependency>

‎httpbin-gateway/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>3.2.5</version>
9+
<version>2.7.18</version>
1010
<relativePath/>
1111
</parent>
1212

@@ -30,6 +30,10 @@
3030
<groupId>org.springframework.boot</groupId>
3131
<artifactId>spring-boot-starter-actuator</artifactId>
3232
</dependency>
33+
<dependency>
34+
<groupId>org.springframework.boot</groupId>
35+
<artifactId>spring-boot-starter-web</artifactId>
36+
</dependency>
3337
<dependency>
3438
<groupId>org.springframework.cloud</groupId>
3539
<artifactId>spring-cloud-starter-circuitbreaker-resilience4j</artifactId>

‎inmemory-messages/pom.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
<properties>
2121
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2222
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
23-
<java.version>11</java.version>
23+
<!-- <java.version>11</java.version>-->
2424
<jackson.library>2.7.5</jackson.library>
2525
<springframework.boot.version>2.7.10</springframework.boot.version>
26-
<maven.compiler.source>11</maven.compiler.source>
27-
<maven.compiler.target>11</maven.compiler.target>
26+
<maven.compiler.source>21</maven.compiler.source>
27+
<maven.compiler.target>21</maven.compiler.target>
2828
</properties>
2929

3030
<dependencies>
@@ -47,7 +47,7 @@
4747
<dependency>
4848
<groupId>org.projectlombok</groupId>
4949
<artifactId>lombok</artifactId>
50-
<version>1.18.24</version>
50+
<version>1.18.30</version>
5151
<scope>compile</scope>
5252
</dependency>
5353
</dependencies>
@@ -74,14 +74,14 @@
7474

7575
<build>
7676
<plugins>
77-
<plugin>
78-
<artifactId>maven-compiler-plugin</artifactId>
79-
<version>3.8.1</version>
80-
</plugin>
81-
<plugin>
82-
<artifactId>maven-surefire-plugin</artifactId>
83-
<version>3.0.0-M6</version>
84-
</plugin>
77+
<!-- <plugin>-->
78+
<!-- <artifactId>maven-compiler-plugin</artifactId>-->
79+
<!-- <version>3.8.1</version>-->
80+
<!-- </plugin>-->
81+
<!-- <plugin>-->
82+
<!-- <artifactId>maven-surefire-plugin</artifactId>-->
83+
<!-- <version>3.0.0-M6</version>-->
84+
<!-- </plugin>-->
8585
<plugin>
8686
<groupId>org.springframework.boot</groupId>
8787
<artifactId>spring-boot-maven-plugin</artifactId>

‎kafka-streams/pom.xml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<groupId>ie.emeraldjava</groupId>
8+
<artifactId>spring</artifactId>
9+
<version>0.0.1-SNAPSHOT</version>
10+
</parent>
11+
12+
<artifactId>kafka-streams</artifactId>
13+
14+
<properties>
15+
<maven.compiler.source>17</maven.compiler.source>
16+
<maven.compiler.target>17</maven.compiler.target>
17+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18+
<kafka.version>3.7.0</kafka.version>
19+
<slf4j.version>1.7.36</slf4j.version>
20+
</properties>
21+
22+
<dependencies>
23+
<!-- To enable console logging -->
24+
<dependency>
25+
<groupId>org.slf4j</groupId>
26+
<artifactId>slf4j-reload4j</artifactId>
27+
<version>${slf4j.version}</version>
28+
</dependency>
29+
<dependency>
30+
<groupId>org.projectlombok</groupId>
31+
<artifactId>lombok</artifactId>
32+
<version>1.18.32</version>
33+
<optional>true</optional>
34+
</dependency>
35+
36+
<!-- Apache Kafka dependencies -->
37+
<dependency>
38+
<groupId>org.apache.kafka</groupId>
39+
<artifactId>kafka-streams</artifactId>
40+
<version>${kafka.version}</version>
41+
</dependency>
42+
</dependencies>
43+
44+
</project>

‎opentelemetry/pom.xml

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<groupId>ie.emeraldjava</groupId>
8+
<artifactId>spring</artifactId>
9+
<version>0.0.1-SNAPSHOT</version>
10+
</parent>
11+
12+
<!-- <parent>-->
13+
<!-- <groupId>org.springframework.boot</groupId>-->
14+
<!-- <artifactId>spring-boot-starter-parent</artifactId>-->
15+
<!-- <version>3.2.5</version>-->
16+
<!-- <relativePath/>-->
17+
<!-- </parent>-->
18+
19+
<artifactId>opentelemetry</artifactId>
20+
<packaging>jar</packaging>
21+
22+
<properties>
23+
<maven.compiler.source>17</maven.compiler.source>
24+
<maven.compiler.target>17</maven.compiler.target>
25+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
26+
<spring.version>3.2.5</spring.version>
27+
</properties>
28+
29+
<dependencies>
30+
<dependency>
31+
<groupId>io.opentelemetry.instrumentation</groupId>
32+
<artifactId>opentelemetry-spring-boot-starter</artifactId>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.springframework.boot</groupId>
36+
<artifactId>spring-boot-starter-web</artifactId>
37+
<version>${spring.version}</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>org.springframework.boot</groupId>
41+
<artifactId>spring-boot-starter-actuator</artifactId>
42+
<version>${spring.version}</version>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.springframework.boot</groupId>
46+
<artifactId>spring-boot-devtools</artifactId>
47+
<version>${spring.version}</version>
48+
<optional>true</optional>
49+
</dependency>
50+
<!-- <dependency>-->
51+
<!-- <groupId>ch.qos.logback</groupId>-->
52+
<!-- <artifactId>logback-core</artifactId>-->
53+
<!-- <version>1.3.5</version>-->
54+
<!-- </dependency>-->
55+
<!-- <dependency>-->
56+
<!-- <groupId>ch.qos.logback</groupId>-->
57+
<!-- <artifactId>logback-classic</artifactId>-->
58+
<!-- <version>1.3.5</version>-->
59+
<!-- </dependency>-->
60+
61+
<!-- <dependency>-->
62+
<!-- <groupId>org.apache.logging.log4j</groupId>-->
63+
<!-- <artifactId>log4j-api</artifactId>-->
64+
<!-- </dependency>-->
65+
<!-- <dependency>-->
66+
<!-- <groupId>org.apache.logging.log4j</groupId>-->
67+
<!-- <artifactId>log4j-core</artifactId>-->
68+
<!-- </dependency>-->
69+
70+
<dependency>
71+
<groupId>org.projectlombok</groupId>
72+
<artifactId>lombok</artifactId>
73+
<version>1.18.30</version>
74+
<scope>provided</scope>
75+
</dependency>
76+
77+
78+
</dependencies>
79+
80+
<dependencyManagement>
81+
<dependencies>
82+
<!-- <dependency>-->
83+
<!-- <groupId>org.slf4j</groupId>-->
84+
<!-- <artifactId>slf4j-api</artifactId>-->
85+
<!-- <version>1.7.30</version>-->
86+
<!-- </dependency>-->
87+
<!-- <dependency>-->
88+
<!-- <groupId>org.springframework.boot</groupId>-->
89+
<!-- <artifactId>spring-boot-dependencies</artifactId>-->
90+
<!-- <version>3.2.5</version>-->
91+
<!-- <type>pom</type>-->
92+
<!-- <scope>import</scope>-->
93+
<!-- </dependency>-->
94+
<dependency>
95+
<groupId>io.opentelemetry</groupId>
96+
<artifactId>opentelemetry-bom</artifactId>
97+
<version>1.37.0</version>
98+
<type>pom</type>
99+
<scope>import</scope>
100+
</dependency>
101+
<dependency>
102+
<groupId>io.opentelemetry.instrumentation</groupId>
103+
<artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
104+
<version>2.3.0-alpha</version>
105+
<type>pom</type>
106+
<scope>import</scope>
107+
</dependency>
108+
109+
<dependency>
110+
<groupId>org.junit</groupId>
111+
<artifactId>junit-bom</artifactId>
112+
<version>5.9.2</version>
113+
<type>pom</type>
114+
<scope>import</scope>
115+
</dependency>
116+
</dependencies>
117+
</dependencyManagement>
118+
119+
<build>
120+
<plugins>
121+
<plugin>
122+
<groupId>org.springframework.boot</groupId>
123+
<artifactId>spring-boot-maven-plugin</artifactId>
124+
<executions>
125+
<execution>
126+
<goals>
127+
<goal>build-info</goal>
128+
<goal>repackage</goal>
129+
</goals>
130+
</execution>
131+
</executions>
132+
</plugin>
133+
</plugins>
134+
</build>
135+
136+
</project>

‎pom.xml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,15 @@
55

66
<groupId>ie.emeraldjava</groupId>
77
<artifactId>spring</artifactId>
8+
<name>emeraldjava-spring</name>
89
<version>0.0.1-SNAPSHOT</version>
910
<packaging>pom</packaging>
1011

11-
<name>emeraldjava-spring</name>
12+
<properties>
13+
<maven.compiler.source>21</maven.compiler.source>
14+
<maven.compiler.target>21</maven.compiler.target>
15+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16+
</properties>
1217

1318
<modules>
1419
<module>spring-aop</module>
@@ -20,12 +25,12 @@
2025
<module>apache-poi-racemaster</module>
2126
<module>spring-aop-multi</module>
2227
<module>dual-contexts</module>
23-
<module>vaadin</module>
28+
<!-- <module>vaadin</module>-->
2429
<module>flink-inmemory</module>
2530
<module>joinfaces</module>
2631
<module>yaml-properties</module>
2732
<module>httpbin-gateway</module>
28-
<module>springboot3</module>
33+
<module>springboot3</module>
2934
<module>vuejs-webjar</module>
3035
<module>graalvm</module>
3136
<module>graalvm/graaljs</module>

‎spring-aop-multi/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
</modules>
2323

2424
<properties>
25-
<maven.compiler.source>11</maven.compiler.source>
26-
<maven.compiler.target>11</maven.compiler.target>
25+
<maven.compiler.source>21</maven.compiler.source>
26+
<maven.compiler.target>21</maven.compiler.target>
2727
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2828
</properties>
2929

@@ -50,6 +50,7 @@
5050
<dependency>
5151
<groupId>org.projectlombok</groupId>
5252
<artifactId>lombok</artifactId>
53+
<version>1.18.30</version>
5354
<optional>true</optional>
5455
</dependency>
5556
<dependency>

‎yaml-properties/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<artifactId>yaml-properties</artifactId>
1414

1515
<properties>
16-
<maven.compiler.source>17</maven.compiler.source>
17-
<maven.compiler.target>17</maven.compiler.target>
16+
<maven.compiler.source>21</maven.compiler.source>
17+
<maven.compiler.target>21</maven.compiler.target>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919
</properties>
2020
<dependencies>
@@ -35,6 +35,7 @@
3535
<dependency>
3636
<groupId>org.projectlombok</groupId>
3737
<artifactId>lombok</artifactId>
38+
<version>1.18.30</version>
3839
<scope>provided</scope>
3940
</dependency>
4041
<dependency>

0 commit comments

Comments
 (0)