Skip to content

Commit

Permalink
userguide and tck dist eftl bundle tuning (#322)
Browse files Browse the repository at this point in the history
Signed-off-by: David Kral <david.k.kral@oracle.com>
  • Loading branch information
Verdent committed Feb 24, 2022
1 parent ad73dd3 commit 29a2568
Show file tree
Hide file tree
Showing 5 changed files with 245 additions and 48 deletions.
7 changes: 6 additions & 1 deletion tck-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,15 @@
<properties>
<license>EFTL</license>
<bundle-name>jakarta-jsonb-tck</bundle-name>
<assembly-descriptor>src/main/assembly/assembly-eftl.xml</assembly-descriptor>
</properties>
</profile>
<profile>
<id>EPL</id>
<properties>
<license>EPL</license>
<bundle-name>jsonb-tck</bundle-name>
<assembly-descriptor>src/main/assembly/assembly.xml</assembly-descriptor>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
Expand All @@ -83,7 +85,9 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<id>distribution</id>
Expand All @@ -93,8 +97,9 @@
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
<descriptor>${assembly-descriptor}</descriptor>
</descriptors>
<escapeString>\</escapeString>
<appendAssemblyId>false</appendAssemblyId>
<finalName>${bundle-name}-${project.version}</finalName>
</configuration>
Expand Down
71 changes: 71 additions & 0 deletions tck-dist/src/main/assembly/assembly-eftl.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
http://www.eclipse.org/legal/epl-2.0.
This Source Code may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the
Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
version 2 with the GNU Classpath Exception, which is available at
https://www.gnu.org/software/classpath/license.html.
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->

<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>distribution</id>
<baseDirectory>jsonb-tck</baseDirectory>
<formats>
<format>zip</format>
</formats>

<files>
<!-- license -->
<file>
<source>${project.basedir}/src/main/resources/LICENSE_${license}.md</source>
<destName>LICENSE.md</destName>
</file>
</files>
<fileSets>
<fileSet>
<directory>${project.build.scriptSourceDirectory}</directory>
<outputDirectory>artifacts</outputDirectory>
<fileMode>755</fileMode>
<includes>
<include>**/*.sh</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/bin</directory>
<outputDirectory>bin</outputDirectory>
<includes>
<include>**/*.xml</include>
</includes>
<filtered>true</filtered>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
<includes>
<include>jakarta.json.bind:jakarta.json.bind-tck</include>
</includes>
<useTransitiveDependencies>true</useTransitiveDependencies>
<outputDirectory>artifacts</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<dependencySet>
<includes>
<include>jakarta.json.bind:jakarta.json.bind-tck-ug</include>
</includes>
<unpack>true</unpack>
<outputDirectory>.</outputDirectory>
</dependencySet>
</dependencySets>

</assembly>
154 changes: 154 additions & 0 deletions tck-dist/src/main/bin/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
http://www.eclipse.org/legal/epl-2.0.
This Source Code may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the
Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
version 2 with the GNU Classpath Exception, which is available at
https://www.gnu.org/software/classpath/license.html.
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
<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">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.7</version>
<relativePath/>
</parent>

<groupId>jakarta.json.bind</groupId>
<artifactId>jakarta.json.bind-tck-tests</artifactId>
<version>${project.version}</version>

<properties>
<!-- Vendor Implementation (VI) -->
<jsonb-api.groupId>jakarta.json.bind</jsonb-api.groupId>
<jsonb-api.artifactId>jakarta.json.bind-api</jsonb-api.artifactId>
<jsonb-api.version>3.0.0</jsonb-api.version>

<!-- Compatible Implementation (CI) -->
<jsonb-impl.groupId>org.eclipse</jsonb-impl.groupId>
<jsonb-impl.artifactId>yasson</jsonb-impl.artifactId>
<jsonb-impl.version>3.0.0-RC1</jsonb-impl.version>

<!-- TCK -->
<jsonb.tck.version>${project.version}</jsonb.tck.version>

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

<!-- !!! DO NOT EDIT !!! -->
<jakarta.jsonb-api.version>3.0.0</jakarta.jsonb-api.version>
<jakarta.json-api.version>2.1.0</jakarta.json-api.version>
</properties>


<dependencies>
<dependency>
<groupId>jakarta.json.bind</groupId>
<artifactId>jakarta.json.bind-tck</artifactId>
<version>\${jsonb.tck.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>\${jsonb-api.groupId}</groupId>
<artifactId>\${jsonb-api.artifactId}</artifactId>
<version>\${jsonb-api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>\${jsonb-impl.groupId}</groupId>
<artifactId>\${jsonb-impl.artifactId}</artifactId>
<version>\${jsonb-impl.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
<version>5.0.0.Beta1</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<defaultGoal>verify</defaultGoal>
<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.jsonb-api.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-api.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>
<trimStackTrace>false</trimStackTrace>
<failIfNoTests>true</failIfNoTests>
<dependenciesToScan>jakarta.json.bind:jakarta.json.bind-tck</dependenciesToScan>
<systemPropertyVariables>
<jimage.dir>\${jimage.dir}</jimage.dir>
<signature.sigTestClasspath>\${project.build.directory}/signaturedirectory/jakarta.json.bind-api.jar:\${jimage.dir}/java.base:\${jimage.dir}/java.rmi:\${jimage.dir}/java.sql:\${jimage.dir}/java.naming</signature.sigTestClasspath>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>3.0.0-M4</version>
<executions>
<execution>
<id>post-unit-test</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
57 changes: 10 additions & 47 deletions tck-docs/userguide/src/main/jbake/content/config.inc
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,15 @@ slashes as a path separator instead.
b. `sigTestClasspath` This property must be set when running signature tests.
This property should be set to a list of jar files and/or directories which contain your
Jakarta EE and Java SE classes. Paths must be separated by the appropriate path separator (';' windows, ':' Unixes).
c. `jsonb-impl.groupId` property is set to the Maven Group Id of the CI to test.
d. `jsonb-impl.artifactId` property is set to the Maven Artifact Id of the CI to test.
e. `jsonb-impl.version` property is set to the Maven Version of the CI to test.

3. Set the below jars to the classpath
a. JAR file for the {TechnologyShortName} {TechnologyVersion} CI. +
`jakarta.json.bind-api.jar`.
b. JUnit 5 jars ({JunitVersion})
c. sigtest-maven-plugin (1.4) to run the signature tests.
d. {TechnologyShortName} TCK tests (`jakarta.json.bind:jakarta.json.bind-tck`)
c. {TechnologyShortName} TCK tests (`jakarta.json.bind:jakarta.json.bind-tck`)

+
.Example: Maven configuration
Expand Down Expand Up @@ -84,7 +86,7 @@ slashes as a path separator instead.
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
<version>4.0.2.Final</version>
<version>5.0.0.Beta1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -93,26 +95,6 @@ slashes as a path separator instead.
<scope>test</scope>
</dependency>
</dependencies>
----
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<configuration>
<trimStackTrace>false</trimStackTrace>
<failIfNoTests>true</failIfNoTests>
<dependenciesToScan>jakarta.json.bind:jakarta.json.bind-tck</dependenciesToScan>
<systemPropertyVariables>
<!-- Needed for signature tests to pass -->
<jimage.dir>${project.build.directory}/jdk-bundles</jimage.dir>
<signature.sigTestClasspath>
${project.build.directory}/signaturedirectory/jakarta.json.bind-api.jar:
${jimage.dir}/java.base:${jimage.dir}/java.rmi:${jimage.dir}/java.sql:${jimage.dir}/java.naming
</signature.sigTestClasspath>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
----
+

Expand Down Expand Up @@ -157,13 +139,15 @@ slashes as a path separator instead.
b. `sigTestClasspath` This property must be set when running signature tests.
This property should be set to a list of jar files and/or directories which contain your
Java EE and Java SE classes. Paths must be separated by the appropriate path separator (';' windows, ':' Unixes).
c. `jsonb-api.groupId` property is set to the Maven Group Id of the VI to test.
d. `jsonb-api.artifactId` property is set to the Maven Artifact Id of the VI to test.
e. `jsonb-api.version` property is set to the Maven Version of the VI to test.

3. Set the below jars to the classpath
a. JAR file for the {TechnologyShortName} {TechnologyVersion} VI. +
`yasson.jar`.
b. JUnit 5 jars ({JunitVersion})
c. sigtest-maven-plugin (1.4) to run the signature tests.
d. {TechnologyShortName} TCK tests (`jakarta.json.bind:jakarta.json.bind-tck`)
c. {TechnologyShortName} TCK tests (`jakarta.json.bind:jakarta.json.bind-tck`)

+
.Example: Maven configuration
Expand Down Expand Up @@ -191,7 +175,7 @@ slashes as a path separator instead.
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
<version>4.0.2.Final</version>
<version>5.0.0.Beta1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -200,27 +184,6 @@ slashes as a path separator instead.
<scope>test</scope>
</dependency>
</dependencies>
----
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<configuration>
<trimStackTrace>false</trimStackTrace>
<failIfNoTests>true</failIfNoTests>
<dependenciesToScan>jakarta.json.bind:jakarta.json.bind-tck</dependenciesToScan>
<systemPropertyVariables>
<!-- Needed for signature tests to pass -->
<jimage.dir>${project.build.directory}/jdk-bundles</jimage.dir>
<signature.sigTestClasspath>
${project.build.directory}/signaturedirectory/jakarta.json.bind-api.jar:
${jimage.dir}/java.base:${jimage.dir}/java.rmi:${jimage.dir}/java.sql:${jimage.dir}/java.naming
</signature.sigTestClasspath>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>

----
+

Expand Down
Loading

0 comments on commit 29a2568

Please sign in to comment.