Skip to content

Commit dc016bd

Browse files
committed
Use maven profile for Java25 specific part so it can work with Java 11
1 parent 172282c commit dc016bd

3 files changed

Lines changed: 65 additions & 28 deletions

File tree

.github/workflows/ci-matrix-5.x.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ jobs:
1010
strategy:
1111
matrix:
1212
include:
13-
# - os: ubuntu-latest
14-
# jdk: 11
15-
# - os: ubuntu-latest
16-
# jdk: 11
17-
# profile: '-PNativeEpoll'
18-
# - os: ubuntu-latest
19-
# jdk: 11
20-
# profile: '-PNativeIoUring'
21-
# - os: ubuntu-latest
22-
# jdk: 11
23-
# profile: '-PNativeEpoll+DomainSockets'
13+
- os: ubuntu-latest
14+
jdk: 11
15+
- os: ubuntu-latest
16+
jdk: 11
17+
profile: '-PNativeEpoll'
18+
- os: ubuntu-latest
19+
jdk: 11
20+
profile: '-PNativeIoUring'
21+
- os: ubuntu-latest
22+
jdk: 11
23+
profile: '-PNativeEpoll+DomainSockets'
2424
- os: ubuntu-latest
2525
jdk: 25
26-
# - os: windows-2022
27-
# jdk: 11
28-
# stable: true
26+
- os: windows-2022
27+
jdk: 11
28+
stable: true
2929
# - os: macos-latest
3030
# jdk: 11
3131
# profile: '-PNativeKQueue'

pom.xml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,20 @@
6868
<modules>
6969
<module>vertx-core-logging</module>
7070
<module>vertx-core</module>
71-
<module>vertx-core-jackson-v3</module>
7271
</modules>
7372

73+
<profiles>
74+
<profile>
75+
<id>Java25</id>
76+
<activation>
77+
<jdk>[25,)</jdk>
78+
</activation>
79+
<modules>
80+
<module>vertx-core-logging</module>
81+
<module>vertx-core</module>
82+
<module>vertx-core-jackson-v3</module>
83+
</modules>
84+
</profile>
85+
</profiles>
86+
7487
</project>

vertx-core/pom.xml

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -251,19 +251,6 @@
251251
</annotationProcessorPaths>
252252
</configuration>
253253
</execution>
254-
<execution>
255-
<id>jdk25</id>
256-
<goals>
257-
<goal>compile</goal>
258-
</goals>
259-
<configuration>
260-
<release>25</release>
261-
<compileSourceRoots>
262-
<compileSourceRoot>${project.basedir}/src/main/java25</compileSourceRoot>
263-
</compileSourceRoots>
264-
<multiReleaseOutput>true</multiReleaseOutput>
265-
</configuration>
266-
</execution>
267254
</executions>
268255
</plugin>
269256

@@ -458,6 +445,9 @@
458445
<vertx.jackson.defaultReadMaxNameLength>100</vertx.jackson.defaultReadMaxNameLength>
459446
<vertx.jackson.defaultReadMaxTokenCount>100</vertx.jackson.defaultReadMaxTokenCount>
460447
</systemProperties>
448+
<classpathDependencyExcludes>
449+
<classpathDependencyExclude>tools.jackson.core:jackson-core</classpathDependencyExclude>
450+
</classpathDependencyExcludes>
461451
</configuration>
462452
</execution>
463453
<execution>
@@ -473,6 +463,7 @@
473463
<classpathDependencyExcludes>
474464
<classpathDependencyExclude>com.fasterxml.jackson.core:jackson-core</classpathDependencyExclude>
475465
<classpathDependencyExclude>com.fasterxml.jackson.core:jackson-databind</classpathDependencyExclude>
466+
<classpathDependencyExclude>tools.jackson.core:jackson-core</classpathDependencyExclude>
476467
</classpathDependencyExcludes>
477468
</configuration>
478469
</execution>
@@ -503,6 +494,7 @@
503494
</includes>
504495
<classpathDependencyExcludes>
505496
<classpathDependencyExclude>com.fasterxml.jackson.core:jackson-databind</classpathDependencyExclude>
497+
<classpathDependencyExclude>tools.jackson.core:jackson-core</classpathDependencyExclude>
506498
</classpathDependencyExcludes>
507499
</configuration>
508500
</execution>
@@ -522,6 +514,7 @@
522514
<classpathDependencyExcludes>
523515
<classpathDependencyExclude>com.fasterxml.jackson.core:jackson-core</classpathDependencyExclude>
524516
<classpathDependencyExclude>com.fasterxml.jackson.core:jackson-databind</classpathDependencyExclude>
517+
<classpathDependencyExclude>tools.jackson.core:jackson-core</classpathDependencyExclude>
525518
</classpathDependencyExcludes>
526519
</configuration>
527520
</execution>
@@ -772,6 +765,37 @@
772765

773766
<profiles>
774767

768+
<profile>
769+
<id>Java25</id>
770+
<activation>
771+
<jdk>[25,)</jdk>
772+
</activation>
773+
<build>
774+
<pluginManagement>
775+
<plugins>
776+
<plugin>
777+
<artifactId>maven-compiler-plugin</artifactId>
778+
<executions>
779+
<execution>
780+
<id>Java25</id>
781+
<goals>
782+
<goal>compile</goal>
783+
</goals>
784+
<configuration>
785+
<release>25</release>
786+
<compileSourceRoots>
787+
<compileSourceRoot>${project.basedir}/src/main/java25</compileSourceRoot>
788+
</compileSourceRoots>
789+
<multiReleaseOutput>true</multiReleaseOutput>
790+
</configuration>
791+
</execution>
792+
</executions>
793+
</plugin>
794+
</plugins>
795+
</pluginManagement>
796+
</build>
797+
</profile>
798+
775799
<profile>
776800
<id>NativeEpoll</id>
777801
<properties>

0 commit comments

Comments
 (0)