Skip to content

Commit fdeed6d

Browse files
SentryManSentryMan
committed
try jdk 24
1 parent 80f2daa commit fdeed6d

File tree

5 files changed

+49
-146
lines changed

5 files changed

+49
-146
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ bin/**
1515
.settings/application.properties
1616
props.env
1717
.factorypath
18+
/target/

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM amazoncorretto:23-alpine-jdk as jreBuilder
1+
FROM amazoncorretto:24-alpine-jdk as jreBuilder
22

33
RUN apk add binutils
44
RUN jlink \
55
--add-modules \
6-
java.base,java.desktop,java.instrument,java.logging,java.management,java.naming,java.net.http,java.sql,java.xml,jdk.crypto.ec,jdk.naming.dns,jdk.unsupported\
6+
java.base,java.desktop,java.instrument,java.logging,java.management,java.naming,java.net.http,java.sql,java.xml,jdk.naming.dns,jdk.unsupported\
77
--verbose \
88
--strip-debug \
99
--no-header-files \

‎pom.xml‎

Lines changed: 45 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46
<parent>
57
<groupId>org.springframework.boot</groupId>
68
<artifactId>spring-boot-starter-parent</artifactId>
7-
<version>3.3.4</version>
9+
<version>3.4.5</version>
810
<relativePath /> <!-- lookup parent from repository -->
911
</parent>
1012
<groupId>com.mangasite</groupId>
@@ -13,9 +15,9 @@
1315
<name>MangaBackend</name>
1416
<description>RSocket API for Manga-Spring Site</description>
1517
<properties>
16-
<java.version>23</java.version>
17-
<maven.compiler.proc>full</maven.compiler.proc>
18-
<avaje.inject.version>9.10</avaje.inject.version>
18+
<java.version>24</java.version>
19+
<maven.compiler.proc>full</maven.compiler.proc>
20+
<avaje.inject.version>12.0-RC4</avaje.inject.version>
1921
<mainClass>com.mangasite.MangaBackendApplication</mainClass>
2022
<start-class>com.mangasite.MangaBackendApplication</start-class>
2123
</properties>
@@ -89,13 +91,8 @@
8991
<groupId>org.springframework.security</groupId>
9092
<artifactId>spring-security-oauth2-resource-server</artifactId>
9193
</dependency>
92-
<!--/Boot Dependencies -->
93-
<dependency>
94-
<groupId>com.google.errorprone</groupId>
95-
<artifactId>error_prone_core</artifactId>
96-
<version>2.32.0</version>
97-
<scope>provided</scope>
98-
</dependency>
94+
<!--/Boot
95+
Dependencies -->
9996
<dependency>
10097
<groupId>io.avaje</groupId>
10198
<artifactId>avaje-inject-generator</artifactId>
@@ -105,132 +102,40 @@
105102
</dependencies>
106103
<build>
107104
<plugins>
108-
<plugin>
109-
<groupId>org.apache.maven.plugins</groupId>
110-
<artifactId>maven-surefire-plugin</artifactId>
111-
<configuration>
112-
<argLine>@{argLine} --enable-preview</argLine>
113-
</configuration>
114-
</plugin>
115-
<plugin>
116-
<groupId>org.springframework.boot</groupId>
117-
<artifactId>spring-boot-maven-plugin</artifactId>
118-
</plugin>
119-
<plugin>
120-
<groupId>com.spotify.fmt</groupId>
121-
<artifactId>fmt-maven-plugin</artifactId>
122-
<version>2.21</version>
123-
<configuration>
124-
<skipSortingImports>true</skipSortingImports>
125-
</configuration>
126-
<executions>
127-
<execution>
128-
<goals>
129-
<goal>format</goal>
130-
</goals>
131-
</execution>
132-
</executions>
133-
</plugin>
134-
<plugin>
135-
<groupId>org.apache.maven.plugins</groupId>
136-
<artifactId>maven-compiler-plugin</artifactId>
137-
<configuration>
138-
<compilerArgs>
139-
<arg>--enable-preview</arg>
140-
<arg>-XDcompilePolicy=simple</arg>
141-
<arg>-Xplugin:ErrorProne</arg>
142-
</compilerArgs>
143-
</configuration>
144-
</plugin> <!--Enforce correct logging framework-->
145-
<plugin>
146-
<groupId>org.apache.maven.plugins</groupId>
147-
<artifactId>maven-enforcer-plugin</artifactId>
148-
<dependencies>
149-
<dependency>
150-
<groupId>de.skuzzle.enforcer</groupId>
151-
<artifactId>restrict-imports-enforcer-rule</artifactId>
152-
<version>2.0.0</version>
153-
</dependency>
154-
</dependencies>
155-
<executions>
156-
<execution>
157-
<id>enforce</id>
158-
<configuration>
159-
<rules>
160-
<banDuplicatePomDependencyVersions />
161-
<bannedDependencies>
162-
<excludes>
163-
<!--slf4j should be used instead-->
164-
<exclude>commons-logging:commons-logging</exclude>
165-
<exclude>commons-logging:commons-logging-api</exclude>
166-
<exclude>org.apache.logging.log4j:log4j-core</exclude>
167-
</excludes>
168-
</bannedDependencies>
169-
</rules>
170-
</configuration>
171-
<goals>
172-
<goal>enforce</goal>
173-
</goals>
174-
</execution>
175-
<execution>
176-
<id>check-imports</id>
177-
<phase>process-sources</phase>
178-
<goals>
179-
<goal>enforce</goal>
180-
</goals>
181-
<configuration>
182-
<rules>
183-
<RestrictImports>
184-
<reason>UseSLF4jforlogging</reason>
185-
<bannedImports>
186-
<bannedImport>java.util.logging.**</bannedImport>
187-
<bannedImport>org.apache.commons.logging.**</bannedImport>
188-
<bannedImport>org.apache.logging.log4j.**</bannedImport>
189-
</bannedImports>
190-
<basePackages>
191-
<basePackage>com.jojo.**</basePackage>
192-
</basePackages>
193-
<includeTestCode>false</includeTestCode>
194-
</RestrictImports>
195-
</rules>
196-
</configuration>
197-
</execution>
198-
</executions>
199-
</plugin>
200-
</plugins>
105+
<plugin>
106+
<groupId>org.apache.maven.plugins</groupId>
107+
<artifactId>maven-surefire-plugin</artifactId>
108+
<configuration>
109+
<argLine>@{argLine} --enable-preview</argLine>
110+
</configuration>
111+
</plugin>
112+
<plugin>
113+
<groupId>org.springframework.boot</groupId>
114+
<artifactId>spring-boot-maven-plugin</artifactId>
115+
</plugin>
116+
<plugin>
117+
<groupId>com.spotify.fmt</groupId>
118+
<artifactId>fmt-maven-plugin</artifactId>
119+
<version>2.21</version>
120+
<configuration>
121+
<skipSortingImports>true</skipSortingImports>
122+
</configuration>
123+
<executions>
124+
<execution>
125+
<goals>
126+
<goal>format</goal>
127+
</goals>
128+
</execution>
129+
</executions>
130+
</plugin>
131+
<plugin>
132+
<groupId>org.apache.maven.plugins</groupId>
133+
<artifactId>maven-compiler-plugin</artifactId>
134+
<configuration>
135+
<compilerArgs>
136+
<arg>--enable-preview</arg>
137+
</compilerArgs>
138+
</configuration>
139+
</plugin>
201140
</build>
202-
<repositories>
203-
<repository>
204-
<id>spring-libs-milestone</id>
205-
<url>https://repo.spring.io/milestone</url>
206-
<snapshots>
207-
<enabled>false</enabled>
208-
</snapshots>
209-
<releases>
210-
<enabled>true</enabled>
211-
</releases>
212-
</repository>
213-
<repository>
214-
<id>spring-release</id>
215-
<name>Spring release</name>
216-
<url>https://repo.spring.io/release</url>
217-
</repository>
218-
</repositories>
219-
<pluginRepositories>
220-
<pluginRepository>
221-
<id>spring-libs-milestone</id>
222-
<url>https://repo.spring.io/milestone</url>
223-
<snapshots>
224-
<enabled>true</enabled>
225-
</snapshots>
226-
<releases>
227-
<enabled>true</enabled>
228-
</releases>
229-
</pluginRepository>
230-
<pluginRepository>
231-
<id>spring-release</id>
232-
<name>Spring release</name>
233-
<url>https://repo.spring.io/release</url>
234-
</pluginRepository>
235-
</pluginRepositories>
236-
</project>
141+
</project>

‎src/main/java/com/mangasite/config/init/AvajeSpringAdapter.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ public void initialize(GenericApplicationContext context) {
7777
.addCustomResolver(new AuthenticationPrincipalArgumentResolver());
7878

7979
handler.registerMessagingAdvice(
80-
new ControllerAdviceWrapper(
81-
new ControllerAdviceBean(scope.get(RSocketAdvice.class))));
80+
new ControllerAdviceWrapper(context.getBean(ControllerAdviceBean.class)));
8281
});
8382
}
8483
}

‎src/main/java/com/mangasite/rsocket/RSocketAdvice.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@
66

77
import io.rsocket.exceptions.CustomRSocketException;
88
import io.rsocket.exceptions.RejectedException;
9-
import jakarta.inject.Singleton;
109
import reactor.core.publisher.Mono;
1110

12-
@Singleton
1311
@ControllerAdvice
1412
public class RSocketAdvice {
1513

0 commit comments

Comments
 (0)