Skip to content

Commit 05d3a9a

Browse files
gurunraolukasj
authored andcommitted
use classpath for jakarta api libraries.
Signed-off-by: Gurunandan Rao <[email protected]>
1 parent 357e30a commit 05d3a9a

File tree

2 files changed

+7
-28
lines changed

2 files changed

+7
-28
lines changed

tck/tck-dist-eftl/src/main/bin/pom.xml

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,47 +16,36 @@
1616
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
1717
1818
-->
19-
<project xmlns="http://maven.apache.org/POM/4.0.0"
20-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22-
19+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2320
<modelVersion>4.0.0</modelVersion>
24-
2521
<parent>
2622
<groupId>org.eclipse.ee4j</groupId>
2723
<artifactId>project</artifactId>
2824
<version>1.0.7</version>
2925
<relativePath/>
3026
</parent>
31-
3227
<groupId>jakarta.json</groupId>
3328
<artifactId>jakarta.json-tck-impl</artifactId>
3429
<version>${project.version}</version>
3530
<packaging>pom</packaging>
36-
3731
<properties>
3832
<!-- Vendor Implementation (VI) -->
3933
<jsonp-api.groupId>jakarta.json</jsonp-api.groupId>
4034
<jsonp-api.artifactId>jakarta.json-api</jsonp-api.artifactId>
4135
<jsonp-api.version>2.1.0</jsonp-api.version>
42-
4336
<!-- Compatible Implementation (CI) -->
4437
<jsonp-impl.groupId>org.eclipse.parsson</jsonp-impl.groupId>
4538
<jsonp-impl.artifactId>parsson</jsonp-impl.artifactId>
4639
<jsonp-impl.version>1.1.0</jsonp-impl.version>
47-
4840
<!-- TCK -->
4941
<jakarta.json-tck.version>${project.version}</jakarta.json-tck.version>
50-
5142
<!-- properties -->
5243
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5344
<jimage.dir>\${project.build.directory}/jdk-bundle</jimage.dir>
54-
5545
<!-- !!! DO NOT EDIT !!! -->
5646
<jakarta.json-api.version>2.1.0</jakarta.json-api.version>
5747
<impl.alltests>true</impl.alltests>
5848
</properties>
59-
6049
<dependencyManagement>
6150
<dependencies>
6251
<dependency>
@@ -68,12 +57,10 @@
6857
</dependency>
6958
</dependencies>
7059
</dependencyManagement>
71-
7260
<modules>
7361
<module>tck-tests</module>
7462
<module>tck-tests-pluggability</module>
7563
</modules>
76-
7764
<dependencies>
7865
<dependency>
7966
<groupId>\${jsonp-api.groupId}</groupId>
@@ -92,7 +79,6 @@
9279
<scope>test</scope>
9380
</dependency>
9481
</dependencies>
95-
9682
<build>
9783
<defaultGoal>verify</defaultGoal>
9884
<pluginManagement>
@@ -120,22 +106,21 @@
120106
<artifactId>maven-surefire-plugin</artifactId>
121107
<version>3.0.0-M5</version>
122108
<configuration>
109+
<useModulePath>false</useModulePath>
123110
<trimStackTrace>false</trimStackTrace>
124111
<failIfNoTests>\${impl.alltests}</failIfNoTests>
125112
<forkCount>1</forkCount>
126113
<reuseForks>false</reuseForks>
127114
<systemPropertyVariables>
128115
<jimage.dir>\${jimage.dir}</jimage.dir>
129-
<signature.sigTestClasspath>
130-
\${project.build.directory}/signaturedirectory/jakarta.json-api.jar:\${jimage.dir}/java.base:\${jimage.dir}/java.rmi:\${jimage.dir}/java.sql:\${jimage.dir}/java.naming
116+
<signature.sigTestClasspath>\${project.build.directory}/signaturedirectory/jakarta.json-api.jar:\${jimage.dir}/java.base:\${jimage.dir}/java.rmi:\${jimage.dir}/java.sql:\${jimage.dir}/java.naming
131117
</signature.sigTestClasspath>
132118
</systemPropertyVariables>
133119
</configuration>
134120
</plugin>
135121
</plugins>
136122
</pluginManagement>
137123
</build>
138-
139124
<profiles>
140125
<profile>
141126
<id>single-test</id>
@@ -149,4 +134,4 @@
149134
</properties>
150135
</profile>
151136
</profiles>
152-
</project>
137+
</project>

tck/tck-dist-eftl/src/main/bin/tck-tests-pluggability/pom.xml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,22 @@
1616
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
1717
1818
-->
19-
<project xmlns="http://maven.apache.org/POM/4.0.0"
20-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22-
19+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2320
<modelVersion>4.0.0</modelVersion>
24-
2521
<parent>
2622
<groupId>jakarta.json</groupId>
2723
<artifactId>jakarta.json-tck-impl</artifactId>
2824
<version>${project.version}</version>
2925
<relativePath>../pom.xml</relativePath>
3026
</parent>
31-
3227
<artifactId>tck-tests-pluggability</artifactId>
33-
3428
<dependencies>
3529
<dependency>
3630
<groupId>jakarta.json</groupId>
3731
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
3832
<scope>test</scope>
3933
</dependency>
4034
</dependencies>
41-
4235
<build>
4336
<plugins>
4437
<plugin>
@@ -48,8 +41,9 @@
4841
<dependenciesToScan>
4942
<dependency>jakarta.json:jakarta.json-tck-tests-pluggability</dependency>
5043
</dependenciesToScan>
44+
<useModulePath>false</useModulePath>
5145
</configuration>
5246
</plugin>
5347
</plugins>
5448
</build>
55-
</project>
49+
</project>

0 commit comments

Comments
 (0)