Skip to content

Commit 2b3a429

Browse files
thegridmanthegridman
committed
Create Java 21 specific gRPC client tests modules
(merge main -> ce/main 108370) [git-p4: depot-paths = "//dev/coherence-ce/main/": change = 108374]
1 parent 9897f6e commit 2b3a429

File tree

10 files changed

+330
-10
lines changed

10 files changed

+330
-10
lines changed

‎prj/test/functional/grpc-client-helidon/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@
5050
<artifactId>grpc-client-tck</artifactId>
5151
<version>${project.version}</version>
5252
</dependency>
53+
<dependency>
54+
<groupId>com.oracle.coherence.ce.tests</groupId>
55+
<artifactId>grpc-client-tck-21</artifactId>
56+
<version>${project.version}</version>
57+
</dependency>
5358

5459
<dependency>
5560
<groupId>org.junit.jupiter</groupId>
@@ -85,6 +90,7 @@
8590
<skip>true</skip>
8691
<dependenciesToScan>
8792
<dependency>com.oracle.coherence.tests:grpc-client-tck</dependency>
93+
<dependency>com.oracle.coherence.tests:grpc-client-tck-21</dependency>
8894
</dependenciesToScan>
8995
<systemPropertyVariables>
9096
<test.server.classpath>${test.server.classpath},${project.build.directory}</test.server.classpath>
@@ -116,7 +122,7 @@
116122
<profile>
117123
<id>stage8</id>
118124
<properties>
119-
<skipTests>false</skipTests>
125+
<skipTests>${is.not.java.21}</skipTests>
120126
</properties>
121127
</profile>
122128

‎prj/test/functional/grpc-client-netty-21/pom.xml‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright (c) 2000, 2024, 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.
7+
-->
8+
<project xmlns="http://maven.apache.org/POM/4.0.0"
9+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
11+
<modelVersion>4.0.0</modelVersion>
12+
13+
<parent>
14+
<groupId>com.oracle.coherence.ce.tests</groupId>
15+
<artifactId>coherence-functional-tests</artifactId>
16+
<version>${revision}</version>
17+
<relativePath>../pom.xml</relativePath>
18+
</parent>
19+
20+
<artifactId>grpc-client-netty-21</artifactId>
21+
<name>Coherence gRPC Java 21+ Client Tests (Netty)</name>
22+
23+
<properties>
24+
<module.name>grpc.client.java21.testing.netty</module.name>
25+
<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
26+
<test.server.classpath>${project.build.directory}/server</test.server.classpath>
27+
<is.not.java.21>false</is.not.java.21>
28+
29+
<java.version>21</java.version>
30+
<java.version.release>21</java.version.release>
31+
</properties>
32+
33+
<dependencies>
34+
<dependency>
35+
<groupId>${coherence.group.id}</groupId>
36+
<artifactId>coherence</artifactId>
37+
<version>${project.version}</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>${coherence.group.id}</groupId>
41+
<artifactId>coherence-java-client</artifactId>
42+
<version>${project.version}</version>
43+
<scope>provided</scope>
44+
</dependency>
45+
<dependency>
46+
<groupId>${coherence.group.id}</groupId>
47+
<artifactId>coherence-grpc-proxy</artifactId>
48+
<version>${project.version}</version>
49+
</dependency>
50+
<dependency>
51+
<groupId>com.oracle.coherence.ce.tests</groupId>
52+
<artifactId>grpc-client-tck-21</artifactId>
53+
<version>${project.version}</version>
54+
</dependency>
55+
56+
<dependency>
57+
<groupId>org.junit.jupiter</groupId>
58+
<artifactId>junit-jupiter-api</artifactId>
59+
</dependency>
60+
</dependencies>
61+
62+
<build>
63+
<plugins>
64+
<plugin>
65+
<groupId>com.oracle.coherence.moditect</groupId>
66+
<artifactId>moditect-maven-plugin</artifactId>
67+
</plugin>
68+
69+
<plugin>
70+
<groupId>org.apache.maven.plugins</groupId>
71+
<artifactId>maven-failsafe-plugin</artifactId>
72+
<configuration>
73+
<dependenciesToScan>
74+
<dependency>com.oracle.coherence.tests:grpc-client-tck-21</dependency>
75+
</dependenciesToScan>
76+
<systemPropertyVariables>
77+
<test.server.classpath>${test.server.classpath},${project.build.directory}</test.server.classpath>
78+
</systemPropertyVariables>
79+
</configuration>
80+
</plugin>
81+
82+
<plugin>
83+
<groupId>org.apache.maven.plugins</groupId>
84+
<artifactId>maven-dependency-plugin</artifactId>
85+
<executions>
86+
<execution>
87+
<id>get-dependencies</id>
88+
<goals>
89+
<goal>copy-dependencies</goal>
90+
</goals>
91+
<phase>prepare-package</phase>
92+
<configuration>
93+
<outputDirectory>${test.server.classpath}</outputDirectory>
94+
<excludeScope>provided</excludeScope>
95+
</configuration>
96+
</execution>
97+
</executions>
98+
</plugin>
99+
</plugins>
100+
</build>
101+
102+
<profiles>
103+
<profile>
104+
<id>stage8</id>
105+
<properties>
106+
<skipTests>${is.not.java.21}</skipTests>
107+
</properties>
108+
</profile>
109+
110+
<profile>
111+
<id>NotJava21</id>
112+
<activation>
113+
<jdk>(,20]</jdk>
114+
</activation>
115+
<properties>
116+
<is.not.java.21>true</is.not.java.21>
117+
<skipTests>true</skipTests>
118+
</properties>
119+
</profile>
120+
</profiles>
121+
</project>

‎prj/test/functional/grpc-client-netty/pom.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
<module.name>grpc.client.testing.netty</module.name>
2525
<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
2626
<test.server.classpath>${project.build.directory}/server</test.server.classpath>
27+
28+
<java.version>21</java.version>
29+
<java.version.release>21</java.version.release>
2730
</properties>
2831

2932
<dependencies>

‎prj/test/functional/grpc-client-tck-21/pom.xml‎

Lines changed: 166 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright (c) 2000, 2024, 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.
7+
-->
8+
<project xmlns="http://maven.apache.org/POM/4.0.0"
9+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
11+
<modelVersion>4.0.0</modelVersion>
12+
13+
<parent>
14+
<groupId>com.oracle.coherence.ce.tests</groupId>
15+
<artifactId>coherence-functional-tests</artifactId>
16+
<version>${revision}</version>
17+
<relativePath>../pom.xml</relativePath>
18+
</parent>
19+
20+
<artifactId>grpc-client-tck-21</artifactId>
21+
<name>Coherence gRPC Java 21+ Client Tests (TCK)</name>
22+
23+
<properties>
24+
<module.name>grpc.client.java21.testing</module.name>
25+
<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
26+
<test.server.classpath>${project.build.directory}/server</test.server.classpath>
27+
28+
<java.version>21</java.version>
29+
<java.version.release>21</java.version.release>
30+
</properties>
31+
32+
<dependencies>
33+
<dependency>
34+
<groupId>${coherence.group.id}</groupId>
35+
<artifactId>coherence-java-client</artifactId>
36+
<version>${project.version}</version>
37+
<scope>provided</scope>
38+
<optional>true</optional>
39+
</dependency>
40+
<dependency>
41+
<groupId>${coherence.group.id}</groupId>
42+
<artifactId>coherence-grpc-proxy</artifactId>
43+
<version>${project.version}</version>
44+
<scope>provided</scope>
45+
<optional>true</optional>
46+
</dependency>
47+
48+
<dependency>
49+
<groupId>${coherence.group.id}</groupId>
50+
<artifactId>coherence-json</artifactId>
51+
<version>${project.version}</version>
52+
</dependency>
53+
54+
<dependency>
55+
<groupId>${coherence.group.id}.tests</groupId>
56+
<artifactId>grpc-client-tck</artifactId>
57+
<version>${project.version}</version>
58+
</dependency>
59+
60+
<dependency>
61+
<groupId>${coherence.group.id}.tests</groupId>
62+
<artifactId>ai</artifactId>
63+
<version>${project.version}</version>
64+
</dependency>
65+
66+
<dependency>
67+
<groupId>org.junit.jupiter</groupId>
68+
<artifactId>junit-jupiter-api</artifactId>
69+
</dependency>
70+
<dependency>
71+
<groupId>org.junit.jupiter</groupId>
72+
<artifactId>junit-jupiter-params</artifactId>
73+
</dependency>
74+
75+
<dependency>
76+
<groupId>io.reactivex.rxjava3</groupId>
77+
<artifactId>rxjava</artifactId>
78+
</dependency>
79+
</dependencies>
80+
81+
<build>
82+
<extensions>
83+
<extension>
84+
<groupId>kr.motd.maven</groupId>
85+
<artifactId>os-maven-plugin</artifactId>
86+
<version>1.6.0</version>
87+
</extension>
88+
</extensions>
89+
90+
<plugins>
91+
<plugin>
92+
<groupId>org.xolstice.maven.plugins</groupId>
93+
<artifactId>protobuf-maven-plugin</artifactId>
94+
<version>${maven.protobuf.plugin.version}</version>
95+
<executions>
96+
<execution>
97+
<id>compile</id>
98+
<goals>
99+
<goal>compile</goal>
100+
<goal>compile-custom</goal>
101+
</goals>
102+
</execution>
103+
</executions>
104+
<configuration>
105+
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
106+
<pluginId>grpc-java</pluginId>
107+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
108+
</configuration>
109+
</plugin>
110+
111+
<plugin>
112+
<groupId>com.oracle.coherence.moditect</groupId>
113+
<artifactId>moditect-maven-plugin</artifactId>
114+
</plugin>
115+
116+
<plugin>
117+
<groupId>org.apache.maven.plugins</groupId>
118+
<artifactId>maven-surefire-plugin</artifactId>
119+
<configuration>
120+
<!--
121+
Tests are run by other modules
122+
grpc-proxy-helidon
123+
grpc-proxy-netty
124+
-->
125+
<skip>true</skip>
126+
<systemProperties>
127+
<test.server.classpath>${test.server.classpath}</test.server.classpath>
128+
</systemProperties>
129+
</configuration>
130+
</plugin>
131+
132+
<plugin>
133+
<groupId>org.apache.maven.plugins</groupId>
134+
<artifactId>maven-failsafe-plugin</artifactId>
135+
<configuration>
136+
<!--
137+
Tests are run by other modules
138+
grpc-client-helidon
139+
grpc-client-netty
140+
-->
141+
<skip>true</skip>
142+
<systemProperties>
143+
<test.server.classpath>${test.server.classpath}</test.server.classpath>
144+
</systemProperties>
145+
</configuration>
146+
</plugin>
147+
148+
<plugin>
149+
<groupId>org.apache.maven.plugins</groupId>
150+
<artifactId>maven-dependency-plugin</artifactId>
151+
<executions>
152+
<execution>
153+
<id>get-dependencies</id>
154+
<goals>
155+
<goal>copy-dependencies</goal>
156+
</goals>
157+
<phase>prepare-package</phase>
158+
<configuration>
159+
<outputDirectory>${test.server.classpath}</outputDirectory>
160+
</configuration>
161+
</execution>
162+
</executions>
163+
</plugin>
164+
</plugins>
165+
</build>
166+
</project>

‎prj/test/functional/grpc-client-tck/src/main/java/grpc/client/ai/GrpcVectorStoreIT.java‎ renamed to ‎prj/test/functional/grpc-client-tck-21/src/main/java/grpc/client/java21/GrpcVectorStoreIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* https://oss.oracle.com/licenses/upl.
66
*/
77

8-
package grpc.client.ai;
8+
package grpc.client.java21;
99

1010
import ai_tests.BaseVectorStoreIT;
1111

‎prj/test/functional/grpc-client-tck/pom.xml‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,15 @@
4949
</dependency>
5050

5151
<dependency>
52-
<groupId>${coherence.group.id}.tests</groupId>
53-
<artifactId>ai</artifactId>
52+
<groupId>${coherence.group.id}</groupId>
53+
<artifactId>coherence-testing-support</artifactId>
5454
<version>${project.version}</version>
55+
<exclusions>
56+
<exclusion>
57+
<groupId>junit</groupId>
58+
<artifactId>junit</artifactId>
59+
</exclusion>
60+
</exclusions>
5561
</dependency>
5662

5763
<dependency>
@@ -104,6 +110,22 @@
104110
<artifactId>moditect-maven-plugin</artifactId>
105111
</plugin>
106112

113+
<plugin>
114+
<groupId>org.apache.maven.plugins</groupId>
115+
<artifactId>maven-surefire-plugin</artifactId>
116+
<configuration>
117+
<!--
118+
Tests are run by other modules
119+
grpc-proxy-helidon
120+
grpc-proxy-netty
121+
-->
122+
<skip>true</skip>
123+
<systemProperties>
124+
<test.server.classpath>${test.server.classpath}</test.server.classpath>
125+
</systemProperties>
126+
</configuration>
127+
</plugin>
128+
107129
<plugin>
108130
<groupId>org.apache.maven.plugins</groupId>
109131
<artifactId>maven-failsafe-plugin</artifactId>

‎prj/test/functional/grpc-proxy-helidon/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
</dependency>
4949
<dependency>
5050
<groupId>${coherence.group.id}.tests</groupId>
51-
<artifactId>grpc-proxy-tck-java21</artifactId>
51+
<artifactId>grpc-proxy-tck-21</artifactId>
5252
<version>${project.version}</version>
5353
</dependency>
5454

@@ -71,7 +71,7 @@
7171
<configuration>
7272
<dependenciesToScan>
7373
<dependency>com.oracle.coherence.tests:grpc-proxy-tck</dependency>
74-
<dependency>com.oracle.coherence.tests:grpc-proxy-tck-java21</dependency>
74+
<dependency>com.oracle.coherence.tests:grpc-proxy-tck-21</dependency>
7575
</dependenciesToScan>
7676
<systemPropertyVariables>
7777
<test.server.classpath>${test.server.classpath},${project.build.directory}</test.server.classpath>

0 commit comments

Comments
 (0)