Skip to content

Commit bfc1f11

Browse files
committed
maven config for java 25
* maven-plugin-plugin workaround, included ASM dependency does not support Java 25, manually configured dependency to use ASM version 9.8 * impsort-maven-plugin workaround, included com.github.javaparser:javaparser-core dependency does not support Java 25, set ignoreParseErrorsBelowImports option to true * removed async logging during test execution, no performance advantage and removes deprecated used of sun.misc.Unsafe warning during build
1 parent a9954f6 commit bfc1f11

File tree

6 files changed

+22
-29
lines changed

6 files changed

+22
-29
lines changed

dsf-bpe/dsf-bpe-server/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,6 @@
211211
<artifactId>log4j-slf4j2-impl</artifactId>
212212
<scope>test</scope>
213213
</dependency>
214-
<!-- For async logging with log4j2 -->
215-
<dependency>
216-
<groupId>com.lmax</groupId>
217-
<artifactId>disruptor</artifactId>
218-
<scope>test</scope>
219-
</dependency>
220214

221215
<dependency>
222216
<groupId>dev.dsf</groupId>

dsf-bpe/dsf-bpe-server/src/test/resources/log4j2-maven-surefire-config.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
<AppenderRef ref="DATA"/>
1515
</Logger>
1616

17-
<AsyncLogger name="dev.dsf" level="INFO"/>
18-
<AsyncLogger name="org.eclipse.jetty" level="INFO"/>
17+
<Logger name="dev.dsf" level="INFO"/>
18+
<Logger name="org.eclipse.jetty" level="INFO"/>
1919
<Logger name="ca.uhn.fhir.parser.LenientErrorHandler" level="ERROR"/>
2020

21-
<AsyncRoot level="WARN">
21+
<Root level="WARN">
2222
<AppenderRef ref="CONSOLE"/>
23-
</AsyncRoot>
23+
</Root>
2424
</Loggers>
2525
</Configuration>

dsf-fhir/dsf-fhir-server/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,12 +219,6 @@
219219
<artifactId>log4j-slf4j2-impl</artifactId>
220220
<scope>test</scope>
221221
</dependency>
222-
<!-- For async logging with log4j2 -->
223-
<dependency>
224-
<groupId>com.lmax</groupId>
225-
<artifactId>disruptor</artifactId>
226-
<scope>test</scope>
227-
</dependency>
228222
</dependencies>
229223

230224
<build>

dsf-fhir/dsf-fhir-server/src/test/resources/log4j2-maven-surefire-config.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
</Appenders>
88

99
<Loggers>
10-
<AsyncLogger name="dev.dsf" level="INFO"/>
11-
<AsyncLogger name="org.eclipse.jetty" level="INFO"/>
10+
<Logger name="dev.dsf" level="INFO"/>
11+
<Logger name="org.eclipse.jetty" level="INFO"/>
1212
<Logger name="ca.uhn.fhir.parser.LenientErrorHandler" level="ERROR"/>
1313

14-
<AsyncRoot level="WARN">
14+
<Root level="WARN">
1515
<AppenderRef ref="CONSOLE"/>
16-
</AsyncRoot>
16+
</Root>
1717
</Loggers>
1818
</Configuration>

dsf-maven/dsf-maven-plugin/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,14 @@
121121
</goals>
122122
</execution>
123123
</executions>
124+
<!-- TODO remove ASM dependency version override when maven-plugin-plugin supports Java 25 -->
125+
<dependencies>
126+
<dependency>
127+
<groupId>org.ow2.asm</groupId>
128+
<artifactId>asm</artifactId>
129+
<version>9.8</version>
130+
</dependency>
131+
</dependencies>
124132
</plugin>
125133
</plugins>
126134
</build>

pom.xml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
<properties>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18-
<maven.compiler.source>21</maven.compiler.source>
19-
<maven.compiler.target>21</maven.compiler.target>
20-
<maven.compiler.release>21</maven.compiler.release>
18+
<maven.compiler.source>25</maven.compiler.source>
19+
<maven.compiler.target>25</maven.compiler.target>
20+
<maven.compiler.release>25</maven.compiler.release>
2121

2222
<main.basedir>${project.basedir}</main.basedir>
2323

@@ -119,12 +119,6 @@
119119
<artifactId>log4j-layout-template-json</artifactId>
120120
<version>${log4j.version}</version>
121121
</dependency>
122-
<!-- async logging -->
123-
<dependency>
124-
<groupId>com.lmax</groupId>
125-
<artifactId>disruptor</artifactId>
126-
<version>3.4.4</version>
127-
</dependency>
128122

129123
<dependency>
130124
<groupId>com.sun.mail</groupId>
@@ -590,6 +584,7 @@
590584
<groupId>org.apache.maven.plugins</groupId>
591585
<artifactId>maven-plugin-plugin</artifactId>
592586
<version>3.15.1</version>
587+
<!-- TODO remove ASM dependency version override in dsf-maven-plugin when maven-plugin-plugin supports Java 25 -->
593588
</plugin>
594589
<plugin>
595590
<groupId>org.apache.maven.plugins</groupId>
@@ -981,6 +976,8 @@
981976
<configuration>
982977
<groups>java.,javax.,org.,com.</groups>
983978
<staticGroups>java,*</staticGroups>
979+
<!-- TODO remove config option when impsort-maven-plugin support Java 25 -->
980+
<ignoreParseErrorsBelowImports>true</ignoreParseErrorsBelowImports>
984981
</configuration>
985982
</plugin>
986983
<plugin>

0 commit comments

Comments
 (0)