signature test migration. (#523) Signed-off-by: gurunandan.rao@oracle.com <gurunandan.rao@oracle.com>
diff --git a/yasson-tck/pom.xml b/yasson-tck/pom.xml index 3bce315..f65e34b 100644 --- a/yasson-tck/pom.xml +++ b/yasson-tck/pom.xml
@@ -12,6 +12,8 @@ <properties> <jsonb.tck.version>3.0.0-SNAPSHOT</jsonb.tck.version> <yasson.version>3.0.0-SNAPSHOT</yasson.version> + <jakarta.json.bind.version>3.0.0-RC1</jakarta.json.bind.version> + <jakarta.json.version>2.1.0</jakarta.json.version> <maven.compiler.source>11</maven.compiler.source> <maven.compiler.target>11</maven.compiler.target> </properties> @@ -32,6 +34,18 @@ <version>${jsonb.tck.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>jakarta.json.bind</groupId> + <artifactId>jakarta.json.bind-api</artifactId> + <version>3.0.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-api</artifactId> + <version>2.1.0</version> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.eclipse</groupId> <artifactId>yasson</artifactId> @@ -44,24 +58,63 @@ <version>4.0.2.Final</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.jboss.arquillian.junit5</groupId> + <artifactId>arquillian-junit5-container</artifactId> + <version>1.7.0.Alpha10</version> + </dependency> </dependencies> <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>3.2.0</version> + <executions> + <execution> + <id>copy</id> + <phase>generate-test-sources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>jakarta.json.bind</groupId> + <artifactId>jakarta.json.bind-api</artifactId> + <version>${jakarta.json.bind.version}</version> + <type>jar</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/signaturedirectory</outputDirectory> + <destFileName>jakarta.json.bind-api.jar</destFileName> + </artifactItem> + <artifactItem> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-api</artifactId> + <version>${jakarta.json.version}</version> + <type>jar</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/signaturedirectory</outputDirectory> + <destFileName>jakarta.json-api.jar</destFileName> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <version>3.0.0-M5</version> <configuration> - <dependenciesToScan> - <dependency>jakarta.json.bind:jakarta.json.bind-tck</dependency> - </dependenciesToScan> - <!-- Temporal removal until it is properly set--> - <excludes> - <exclude>**/*JSONBSigTest.*</exclude> - </excludes> <trimStackTrace>false</trimStackTrace> <failIfNoTests>true</failIfNoTests> - </configuration> + <dependenciesToScan>jakarta.json.bind:jakarta.json.bind-tck</dependenciesToScan> + <systemPropertyVariables> + <jimage.dir>${project.build.directory}/jdk11-bundle</jimage.dir> + <signature.sigTestClasspath>${project.build.directory}/signaturedirectory/jakarta.json.bind-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> </plugin> <plugin> <artifactId>maven-surefire-report-plugin</artifactId>