Skip to content

Commit 58be465

Browse files
thegridmanthegridman
committed
Bug 38282554 - [38277648->25.09] GraalVM Add Coherence GraalVM native feature - update native test logic
(merge main -> ce/main 118424) [git-p4: depot-paths = "//dev/coherence-ce/main/": change = 118425]
1 parent b6c1dfa commit 58be465

File tree

62 files changed

+688
-236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+688
-236
lines changed

‎prj/coherence-core/src/main/resources/META-INF/native-image/native-image.properties renamed to ‎prj/coherence-core/src/main/resources/META-INF/native-image/com.oracle.coherence/coherence/native-image.properties

File renamed without changes.

‎prj/coherence-dependencies/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@
131131
<maven.protobuf.plugin.version>0.6.1</maven.protobuf.plugin.version>
132132
<maven.groovy.plugin.version>2.1.1</maven.groovy.plugin.version>
133133

134-
<native.maven.plugin.version>0.10.6</native.maven.plugin.version>
134+
<native.maven.plugin.version>0.11.0</native.maven.plugin.version>
135135
<skip.native.build>false</skip.native.build>
136136
<skip.native.tests>false</skip.native.tests>
137-
137+
<bedrock.profile.native-image>bedrock-${project.artifactId}</bedrock.profile.native-image>
138138

139139
<!-- library dependency versions -->
140140
<asciidoctor.diagram.version>2.3.2</asciidoctor.diagram.version>

‎prj/test/functional/aggregator/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,13 @@
5353
</dependency>
5454
</dependencies>
5555

56+
<build>
57+
<plugins>
58+
<plugin>
59+
<groupId>org.graalvm.buildtools</groupId>
60+
<artifactId>native-maven-plugin</artifactId>
61+
<extensions>true</extensions>
62+
</plugin>
63+
</plugins>
64+
</build>
5665
</project>

‎prj/test/functional/ai/pom.xml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<properties>
2525
<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
26-
<coherence.graalvm.native.loadAllClassesFrom>ai_tests</coherence.graalvm.native.loadAllClassesFrom>
26+
<coherence.graalvm.native.loadAllClasses>ai_tests</coherence.graalvm.native.loadAllClasses>
2727
</properties>
2828

2929
<dependencies>
@@ -58,7 +58,17 @@
5858
</dependency>
5959
</dependencies>
6060

61-
<profiles>
61+
<build>
62+
<plugins>
63+
<plugin>
64+
<groupId>org.graalvm.buildtools</groupId>
65+
<artifactId>native-maven-plugin</artifactId>
66+
<extensions>true</extensions>
67+
</plugin>
68+
</plugins>
69+
</build>
70+
71+
<profiles>
6272
<profile>
6373
<id>stage6</id>
6474
<properties>

‎prj/test/functional/bootstrap/pom.xml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
~ Copyright (c) 2000, 2022, Oracle and/or its affiliates.
4-
~
5-
~ Licensed under the Universal Permissive License v 1.0 as shown at
6-
~ https://oss.oracle.com/licenses/upl.
3+
Copyright (c) 2000, 2025, Oracle and/or its affiliates.
4+
5+
Licensed under the Universal Permissive License v 1.0 as shown at
6+
https://oss.oracle.com/licenses/upl.
77
-->
88

99
<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -58,4 +58,14 @@
5858
<artifactId>junit-jupiter-api</artifactId>
5959
</dependency>
6060
</dependencies>
61+
62+
<build>
63+
<plugins>
64+
<plugin>
65+
<groupId>org.graalvm.buildtools</groupId>
66+
<artifactId>native-maven-plugin</artifactId>
67+
<extensions>true</extensions>
68+
</plugin>
69+
</plugins>
70+
</build>
6171
</project>

‎prj/test/functional/bundler/pom.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2000, 2022, Oracle and/or its affiliates.
3+
Copyright (c) 2000, 2025, Oracle and/or its affiliates.
44
55
Licensed under the Universal Permissive License v 1.0 as shown at
66
https://oss.oracle.com/licenses/upl.
@@ -47,4 +47,13 @@
4747
</dependency>
4848
</dependencies>
4949

50+
<build>
51+
<plugins>
52+
<plugin>
53+
<groupId>org.graalvm.buildtools</groupId>
54+
<artifactId>native-maven-plugin</artifactId>
55+
<extensions>true</extensions>
56+
</plugin>
57+
</plugins>
58+
</build>
5059
</project>

‎prj/test/functional/cache/pom.xml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
~ Copyright (c) 2000, 2025, Oracle and/or its affiliates.
4-
~
5-
~ Licensed under the Universal Permissive License v 1.0 as shown at
6-
~ https://oss.oracle.com/licenses/upl.
3+
Copyright (c) 2000, 2025, Oracle and/or its affiliates.
4+
5+
Licensed under the Universal Permissive License v 1.0 as shown at
6+
https://oss.oracle.com/licenses/upl.
77
-->
88
<project xmlns="http://maven.apache.org/POM/4.0.0"
99
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -33,7 +33,7 @@
3333
<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
3434
<failsafe.max.heap>2g</failsafe.max.heap>
3535
<failsafe.argLine>-Djdk.trackAllThreads=true -Djdk.tracePinnedThreads=full -XX:+PrintConcurrentLocks ${default.failsafe.argLine}</failsafe.argLine>
36-
<coherence.graalvm.native.loadAllClassesFrom>cache,override</coherence.graalvm.native.loadAllClassesFrom>
36+
<coherence.graalvm.native.loadAllClasses>cache,override</coherence.graalvm.native.loadAllClasses>
3737
</properties>
3838

3939
<dependencies>
@@ -63,4 +63,13 @@
6363
</dependency>
6464
</dependencies>
6565

66+
<build>
67+
<plugins>
68+
<plugin>
69+
<groupId>org.graalvm.buildtools</groupId>
70+
<artifactId>native-maven-plugin</artifactId>
71+
<extensions>true</extensions>
72+
</plugin>
73+
</plugins>
74+
</build>
6675
</project>

‎prj/test/functional/cdi-server/pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<properties>
2323
<module.name>cdi.testing</module.name>
2424
<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
25-
<coherence.graalvm.native.loadAllClassesFrom>cdi</coherence.graalvm.native.loadAllClassesFrom>
25+
<coherence.graalvm.native.loadAllClasses>cdi</coherence.graalvm.native.loadAllClasses>
2626

2727
<failsafe.modules.argline>
2828
${default.failsafe.modules.argline}
@@ -102,7 +102,13 @@
102102
</execution>
103103
</executions>
104104
</plugin>
105-
</plugins>
105+
106+
<plugin>
107+
<groupId>org.graalvm.buildtools</groupId>
108+
<artifactId>native-maven-plugin</artifactId>
109+
<extensions>true</extensions>
110+
</plugin>
111+
</plugins>
106112
</build>
107113

108114
<profiles>

‎prj/test/functional/cdi/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<!--
3-
Copyright (c) 2000, 2024, Oracle and/or its affiliates.
3+
Copyright (c) 2000, 2025, Oracle and/or its affiliates.
44
55
Licensed under the Universal Permissive License v 1.0 as shown at
66
https://oss.oracle.com/licenses/upl.
@@ -105,6 +105,12 @@
105105
</execution>
106106
</executions>
107107
</plugin>
108+
109+
<plugin>
110+
<groupId>org.graalvm.buildtools</groupId>
111+
<artifactId>native-maven-plugin</artifactId>
112+
<extensions>true</extensions>
113+
</plugin>
108114
</plugins>
109115
</build>
110116

‎prj/test/functional/concurrent-cdi/pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<properties>
2323
<module.name>concurrent.cdi.testing</module.name>
2424
<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
25-
<coherence.graalvm.native.loadAllClassesFrom>concurrent</coherence.graalvm.native.loadAllClassesFrom>
25+
<coherence.graalvm.native.loadAllClasses>concurrent</coherence.graalvm.native.loadAllClasses>
2626

2727
<!-- Currently fails native image testing -->
2828
<skip.native.build>true</skip.native.build>
@@ -116,7 +116,13 @@
116116
</execution>
117117
</executions>
118118
</plugin>
119-
</plugins>
119+
120+
<plugin>
121+
<groupId>org.graalvm.buildtools</groupId>
122+
<artifactId>native-maven-plugin</artifactId>
123+
<extensions>true</extensions>
124+
</plugin>
125+
</plugins>
120126
</build>
121127

122128
<profiles>

0 commit comments

Comments
 (0)