Skip to content

Commit dad2bba

Browse files
committed
fix resource filtering in tck test runner
Signed-off-by: Lukas Jungmann <[email protected]>
1 parent bc37bf8 commit dad2bba

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

tck/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<dependency>
9090
<groupId>org.netbeans.tools</groupId>
9191
<artifactId>sigtest-maven-plugin</artifactId>
92-
<version>1.4</version>
92+
<version>1.6</version>
9393
</dependency>
9494

9595
<dependency>

tck/tck-dist-eftl/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@
133133
<descriptors>
134134
<descriptor>src/main/assembly/assembly.xml</descriptor>
135135
</descriptors>
136+
<escapeString>\</escapeString>
136137
<appendAssemblyId>false</appendAssemblyId>
137138
<finalName>jakarta-jsonp-tck-${project.version}</finalName>
138139
</configuration>

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
<!-- properties -->
4545
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
46-
<jimage.dir>${project.build.directory}/jdk-bundle</jimage.dir>
46+
<jimage.dir>\${project.build.directory}/jdk-bundle</jimage.dir>
4747

4848
<!-- !!! DO NOT EDIT !!! -->
4949
<jakarta.json-api.version>2.1.0</jakarta.json-api.version>
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>jakarta.json</groupId>
5757
<artifactId>jakarta.json-tck</artifactId>
58-
<version>${jakarta.json-tck.version}</version>
58+
<version>\${jakarta.json-tck.version}</version>
5959
<type>pom</type>
6060
<scope>import</scope>
6161
</dependency>
@@ -69,15 +69,15 @@
6969

7070
<dependencies>
7171
<dependency>
72-
<groupId>${jsonp-api.groupId}</groupId>
73-
<artifactId>${jsonp-api.artifactId}</artifactId>
74-
<version>${jsonp-api.version}</version>
72+
<groupId>\${jsonp-api.groupId}</groupId>
73+
<artifactId>\${jsonp-api.artifactId}</artifactId>
74+
<version>\${jsonp-api.version}</version>
7575
<scope>test</scope>
7676
</dependency>
7777
<dependency>
78-
<groupId>${jsonp-impl.groupId}</groupId>
79-
<artifactId>${jsonp-impl.artifactId}</artifactId>
80-
<version>${jsonp-impl.version}</version>
78+
<groupId>\${jsonp-impl.groupId}</groupId>
79+
<artifactId>\${jsonp-impl.artifactId}</artifactId>
80+
<version>\${jsonp-impl.version}</version>
8181
<scope>test</scope>
8282
</dependency>
8383
<dependency>
@@ -105,10 +105,10 @@
105105
<artifactItem>
106106
<groupId>jakarta.json</groupId>
107107
<artifactId>jakarta.json-api</artifactId>
108-
<version>${jakarta.json-api.version}</version>
108+
<version>\${jakarta.json-api.version}</version>
109109
<type>jar</type>
110110
<overWrite>true</overWrite>
111-
<outputDirectory>${project.build.directory}/signaturedirectory</outputDirectory>
111+
<outputDirectory>\${project.build.directory}/signaturedirectory</outputDirectory>
112112
<destFileName>jakarta.json-api.jar</destFileName>
113113
</artifactItem>
114114
</artifactItems>
@@ -120,13 +120,13 @@
120120
<version>3.0.0-M5</version>
121121
<configuration>
122122
<trimStackTrace>false</trimStackTrace>
123-
<failIfNoTests>${impl.alltests}</failIfNoTests>
123+
<failIfNoTests>\${impl.alltests}</failIfNoTests>
124124
<forkCount>1</forkCount>
125125
<reuseForks>false</reuseForks>
126126
<systemPropertyVariables>
127-
<jimage.dir>${jimage.dir}</jimage.dir>
127+
<jimage.dir>\${jimage.dir}</jimage.dir>
128128
<signature.sigTestClasspath>
129-
${project.build.directory}/signaturedirectory/jakarta.json-api.jar:${jimage.dir}/java.base:${jimage.dir}/java.rmi:${jimage.dir}/java.sql:${jimage.dir}/java.naming
129+
\${project.build.directory}/signaturedirectory/jakarta.json-api.jar:\${jimage.dir}/java.base:\${jimage.dir}/java.rmi:\${jimage.dir}/java.sql:\${jimage.dir}/java.naming
130130
</signature.sigTestClasspath>
131131
</systemPropertyVariables>
132132
</configuration>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
<dependency>jakarta.json:jakarta.json-tck-tests</dependency>
6868
</dependenciesToScan>
6969
</configuration>
70-
7170
</plugin>
7271
</plugins>
7372
</build>

0 commit comments

Comments
 (0)