Skip to content

Commit fececcd

Browse files
committed
ARIES-2165: Test proxy on java 25
1 parent 770e4d2 commit fececcd

File tree

3 files changed

+38
-6
lines changed

3 files changed

+38
-6
lines changed

.github/workflows/proxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
strategy:
3535
fail-fast: false
3636
matrix:
37-
java: [ 8, 11, 17, 21 ]
37+
java: [ 8, 11, 17, 21, 25 ]
3838
os: [ ubuntu-latest ]
3939
name: JDK${{ matrix.java }} ${{ matrix.os }}
4040
runs-on: ${{ matrix.os }}

proxy/proxy-impl/pom.xml

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@
180180

181181
<profiles>
182182
<profile>
183-
<id>java9To21</id>
183+
<id>java9To25</id>
184184
<activation>
185-
<jdk>(8,22)</jdk>
185+
<jdk>(8,26)</jdk>
186186
</activation>
187187
<build>
188188
<plugins>
@@ -231,7 +231,7 @@
231231
</build>
232232
</profile>
233233
<profile>
234-
<id>java21+</id>
234+
<id>java21</id>
235235
<activation>
236236
<jdk>21</jdk>
237237
</activation>
@@ -263,6 +263,38 @@
263263
</plugins>
264264
</build>
265265
</profile>
266+
<profile>
267+
<id>java25</id>
268+
<activation>
269+
<jdk>25</jdk>
270+
</activation>
271+
<build>
272+
<plugins>
273+
<plugin>
274+
<groupId>org.apache.maven.plugins</groupId>
275+
<artifactId>maven-antrun-plugin</artifactId>
276+
<executions>
277+
<execution>
278+
<phase>process-classes</phase>
279+
<configuration>
280+
<target>
281+
<!-- run the Synthesizer on the WovenProxy class -->
282+
<!-- diff from previous java versions: fork and jvmarg -->
283+
<java classname="org.apache.aries.proxy.synthesizer.Synthesizer" classpathref="maven.runtime.classpath" fork="true">
284+
<arg value="${project.build.outputDirectory}/org/apache/aries/proxy/weaving/WovenProxy.class"/>
285+
</java>
286+
<delete dir="${project.build.outputDirectory}/org/apache/aries/proxy/synthesizer"/>
287+
</target>
288+
</configuration>
289+
<goals>
290+
<goal>run</goal>
291+
</goals>
292+
</execution>
293+
</executions>
294+
</plugin>
295+
</plugins>
296+
</build>
297+
</profile>
266298
</profiles>
267299

268300
</project>

proxy/proxy-itests/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,9 @@
192192

193193
<profiles>
194194
<profile>
195-
<id>java9To21</id>
195+
<id>java9To25</id>
196196
<activation>
197-
<jdk>(8,22)</jdk>
197+
<jdk>(8,26)</jdk>
198198
</activation>
199199
<build>
200200
<plugins>

0 commit comments

Comments
 (0)