Skip to content

Commit 6bb8e13

Browse files
jbescosjbescos
committed
4.x: Micronaut Data cannot build on Java 24 with the current MN version helidon-io#9869
Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
1 parent 13d0e60 commit 6bb8e13

4 files changed

Lines changed: 35 additions & 81 deletions

File tree

‎dependencies/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@
112112
<version.lib.maven-wagon>2.10</version.lib.maven-wagon>
113113
<version.lib.micrometer>1.15.2</version.lib.micrometer>
114114
<version.lib.micrometer-prometheus>1.15.2</version.lib.micrometer-prometheus>
115-
<version.lib.micronaut>4.2.2</version.lib.micronaut>
116-
<version.lib.micronaut.validation>4.2.0</version.lib.micronaut.validation>
115+
<version.lib.micronaut>4.10.9</version.lib.micronaut>
116+
<version.lib.micronaut.validation>4.12.0</version.lib.micronaut.validation>
117117
<version.lib.micronaut.data>4.4.1</version.lib.micronaut.data>
118118
<version.lib.micronaut.sql>5.4.0</version.lib.micronaut.sql>
119119
<version.lib.microprofile-config>3.1</version.lib.microprofile-config>

‎integrations/micronaut/cdi/src/main/java/module-info.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, 2024 Oracle and/or its affiliates.
2+
* Copyright (c) 2020, 2025 Oracle and/or its affiliates.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,9 +24,9 @@
2424
requires jakarta.inject;
2525
requires microprofile.config.api;
2626

27-
requires transitive io.micronaut.aop;
28-
requires transitive io.micronaut.core;
29-
requires transitive io.micronaut.inject;
27+
requires transitive io.micronaut.micronaut_aop;
28+
requires transitive io.micronaut.micronaut_core;
29+
requires transitive io.micronaut.micronaut_inject;
3030
requires transitive jakarta.annotation;
3131
requires transitive jakarta.cdi;
3232

‎integrations/micronaut/data/pom.xml‎

Lines changed: 28 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -134,90 +134,44 @@
134134
<plugin>
135135
<groupId>org.apache.maven.plugins</groupId>
136136
<artifactId>maven-compiler-plugin</artifactId>
137-
<executions>
138-
<execution>
139-
<id>default-compile</id>
140-
<goals>
141-
<goal>compile</goal>
142-
</goals>
143-
</execution>
144-
</executions>
145137
<configuration>
138+
<compilerArgs>
139+
<arg>-Xlint:-path</arg>
140+
</compilerArgs>
146141
<annotationProcessorPaths>
147142
<path>
148143
<groupId>io.helidon.common.features</groupId>
149144
<artifactId>helidon-common-features-codegen</artifactId>
150145
<version>${helidon.version}</version>
151146
</path>
147+
<path>
148+
<groupId>io.micronaut</groupId>
149+
<artifactId>micronaut-inject-java</artifactId>
150+
<version>${version.lib.micronaut}</version>
151+
</path>
152+
<path>
153+
<groupId>io.micronaut</groupId>
154+
<artifactId>micronaut-core-processor</artifactId>
155+
<version>${version.lib.micronaut}</version>
156+
</path>
157+
<path>
158+
<groupId>io.micronaut.validation</groupId>
159+
<artifactId>micronaut-validation-processor</artifactId>
160+
<version>${version.lib.micronaut.validation}</version>
161+
</path>
162+
<path>
163+
<groupId>io.micronaut.data</groupId>
164+
<artifactId>micronaut-data-processor</artifactId>
165+
<version>${version.lib.micronaut.data}</version>
166+
</path>
167+
<path>
168+
<groupId>io.helidon.integrations.micronaut</groupId>
169+
<artifactId>helidon-integrations-micronaut-cdi-processor</artifactId>
170+
<version>${helidon.version}</version>
171+
</path>
152172
</annotationProcessorPaths>
153173
</configuration>
154174
</plugin>
155175
</plugins>
156176
</build>
157-
158-
<profiles>
159-
<profile>
160-
<!-- This fails on Java 24, until we resolve the problem, just limit to 21 -->
161-
<id>java-21</id>
162-
<activation>
163-
<jdk>21</jdk>
164-
</activation>
165-
<build>
166-
<plugins>
167-
<plugin>
168-
<groupId>org.apache.maven.plugins</groupId>
169-
<artifactId>maven-compiler-plugin</artifactId>
170-
<executions>
171-
<execution>
172-
<id>default-testCompile</id>
173-
<goals>
174-
<goal>testCompile</goal>
175-
</goals>
176-
<configuration>
177-
<forceJavacCompilerUse>true</forceJavacCompilerUse>
178-
<annotationProcessorPaths>
179-
<path>
180-
<groupId>io.micronaut</groupId>
181-
<artifactId>micronaut-inject-java</artifactId>
182-
<version>${version.lib.micronaut}</version>
183-
</path>
184-
<path>
185-
<groupId>io.micronaut</groupId>
186-
<artifactId>micronaut-core-processor</artifactId>
187-
<version>${version.lib.micronaut}</version>
188-
</path>
189-
<path>
190-
<groupId>io.micronaut.validation</groupId>
191-
<artifactId>micronaut-validation-processor</artifactId>
192-
<version>${version.lib.micronaut.validation}</version>
193-
</path>
194-
<path>
195-
<groupId>io.micronaut.data</groupId>
196-
<artifactId>micronaut-data-processor</artifactId>
197-
<version>${version.lib.micronaut.data}</version>
198-
</path>
199-
<path>
200-
<groupId>io.helidon.integrations.micronaut</groupId>
201-
<artifactId>helidon-integrations-micronaut-cdi-processor</artifactId>
202-
<version>${helidon.version}</version>
203-
</path>
204-
</annotationProcessorPaths>
205-
</configuration>
206-
</execution>
207-
</executions>
208-
</plugin>
209-
</plugins>
210-
</build>
211-
</profile>
212-
<profile>
213-
<!-- Disable tests on Java 24, until we resolve the problem -->
214-
<id>not-java-21</id>
215-
<activation>
216-
<jdk>!21</jdk>
217-
</activation>
218-
<properties>
219-
<skipTests>true</skipTests>
220-
</properties>
221-
</profile>
222-
</profiles>
223177
</project>

‎integrations/micronaut/data/src/main/java/module-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
@SuppressWarnings({ "requires-automatic"})
3030
module io.helidon.integrations.micronaut.data {
3131

32-
requires io.micronaut.inject;
32+
requires io.micronaut.micronaut_inject;
3333
requires jakarta.annotation;
3434
requires java.sql;
3535

0 commit comments

Comments
 (0)