Skip to content

Commit 2da545b

Browse files
committed
fix javadoc build for tcks, cleanup test run configurations
Signed-off-by: Lukas Jungmann <[email protected]>
1 parent 4f88f4a commit 2da545b

File tree

4 files changed

+201
-142
lines changed

4 files changed

+201
-142
lines changed

impl-tck/tck-tests/pom.xml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,43 @@
140140
<forkCount>1</forkCount>
141141
<reuseForks>false</reuseForks>
142142
</configuration>
143+
<executions>
144+
<execution>
145+
<id>sigtests</id>
146+
<configuration>
147+
<includes>
148+
<include>**/JSONPSigTest.java</include>
149+
</includes>
150+
<systemPropertyVariables>
151+
<jimage.dir>${project.build.directory}/jdk11-bundle</jimage.dir>
152+
<signature.mapfile>${project.build.directory}/signaturedirectory/jakarta/jsonp/tck/signaturetest/sig-test.map</signature.mapfile>
153+
<signature.repositoryDir>${project.build.directory}/signaturedirectory/jakarta/jsonp/tck/signaturetest</signature.repositoryDir>
154+
<signature.packagelist>${project.build.directory}/signaturedirectory/jakarta/jsonp/tck/signaturetest/sig-test-pkg-list.txt</signature.packagelist>
155+
<signature.sigTestClasspath>${project.build.directory}/signaturedirectory/jakarta.json-api.jar:${project.build.directory}/jdk11-bundle/java.base:${project.build.directory}/jdk11-bundle/java.rmi:${project.build.directory}/jdk11-bundle/java.sql:${project.build.directory}/jdk11-bundle/java.naming</signature.sigTestClasspath>
156+
</systemPropertyVariables>
157+
</configuration>
158+
</execution>
159+
<execution>
160+
<id>default-test</id>
161+
<configuration>
162+
<excludes>
163+
<exclude>**/JSONPSigTest.java</exclude>
164+
<exclude>**/JsonProviderTest.java</exclude>
165+
</excludes>
166+
</configuration>
167+
</execution>
168+
<execution>
169+
<id>providertests</id>
170+
<configuration>
171+
<includes>
172+
<include>**/JsonProviderTest.java</include>
173+
</includes>
174+
<systemPropertyVariables>
175+
<jakarta.json.provider>jakarta.jsonp.tck.api.provider.JsonProviderTest.DummyJsonProvider</jakarta.json.provider>
176+
</systemPropertyVariables>
177+
</configuration>
178+
</execution>
179+
</executions>
143180
</plugin>
144181
</plugins>
145182
</build>

tck/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,15 @@
9090
</dependency>
9191
</dependencies>
9292

93+
<build>
94+
<pluginManagement>
95+
<plugins>
96+
<plugin>
97+
<groupId>org.apache.maven.plugins</groupId>
98+
<artifactId>maven-javadoc-plugin</artifactId>
99+
<version>3.3.1</version>
100+
</plugin>
101+
</plugins>
102+
</pluginManagement>
103+
</build>
93104
</project>

0 commit comments

Comments
 (0)