fix javadoc build for tcks, cleanup test run configurations

Signed-off-by: Lukas Jungmann <[email protected]>
rbygrave · Dec 8, 2021 · 2da545b · 2da545b
1 parent 4f88f4a
commit 2da545b
Show file tree

Hide file tree

Showing 4 changed files with 201 additions and 142 deletions.
diff --git a/impl-tck/tck-tests/pom.xml b/impl-tck/tck-tests/pom.xml
@@ -140,6 +140,43 @@
                     <forkCount>1</forkCount>
                     <reuseForks>false</reuseForks>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>sigtests</id>
+                        <configuration>
+                            <includes>
+                                <include>**/JSONPSigTest.java</include>
+                            </includes>
+                            <systemPropertyVariables>
+                                <jimage.dir>${project.build.directory}/jdk11-bundle</jimage.dir>
+                                <signature.mapfile>${project.build.directory}/signaturedirectory/jakarta/jsonp/tck/signaturetest/sig-test.map</signature.mapfile>
+                                <signature.repositoryDir>${project.build.directory}/signaturedirectory/jakarta/jsonp/tck/signaturetest</signature.repositoryDir>
+                                <signature.packagelist>${project.build.directory}/signaturedirectory/jakarta/jsonp/tck/signaturetest/sig-test-pkg-list.txt</signature.packagelist>
+                                <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>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>default-test</id>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/JSONPSigTest.java</exclude>
+                                <exclude>**/JsonProviderTest.java</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>providertests</id>
+                        <configuration>
+                            <includes>
+                                <include>**/JsonProviderTest.java</include>
+                            </includes>
+                            <systemPropertyVariables>
+                                <jakarta.json.provider>jakarta.jsonp.tck.api.provider.JsonProviderTest.DummyJsonProvider</jakarta.json.provider>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>

diff --git a/tck/pom.xml b/tck/pom.xml
@@ -90,4 +90,15 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.3.1</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 </project>