Skip to content

Commit

Permalink
add poms to run tests,
Browse files Browse the repository at this point in the history 
reflect changes in the UG,
remove obsolete content from the UG

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
  • Loading branch information
@lukasj
lukasj committed Jan 27, 2022
1 parent 2c4ef80 commit 25b528c
Show file tree
Hide file tree
Showing 18 changed files with 633 additions and 265 deletions.
22 changes: 18 additions & 4 deletions tck/pom.xml
View file
Expand Up @@ -27,9 +27,11 @@
</parent>

<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-project</artifactId>
<artifactId>jakarta.json-tck</artifactId>
<version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Jakarta JSON Processing TCK</name>
<description>Jakarta JSON Processing TCK</description>

<modules>
<module>tck-common</module>
Expand All @@ -39,9 +41,6 @@
<module>tck-dist</module>
</modules>

<name>JSON-P TCK</name>
<description>Jakarta JSON-P TCK</description>

<licenses>
<license>
<name>Eclipse Public License 2.0</name>
Expand Down Expand Up @@ -71,11 +70,26 @@
<artifactId>jakarta.json-tck-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-tests</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-ug</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.netbeans.tools</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>1.4</version>
</dependency>

<dependency>
<groupId>jakarta.json</groupId>
Expand Down
2 changes: 1 addition & 1 deletion tck/tck-common/pom.xml
View file
Expand Up @@ -21,7 +21,7 @@

<parent>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-project</artifactId>
<artifactId>jakarta.json-tck</artifactId>
<version>2.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
245 changes: 123 additions & 122 deletions tck/tck-dist/pom.xml
View file
Expand Up @@ -17,133 +17,134 @@
-->

<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-project</artifactId>
<version>2.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<artifactId>jakarta.json-tck</artifactId>
<version>2.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck</artifactId>
<packaging>pom</packaging>
<name>JSONP TCK Distribution</name>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-dist</artifactId>
<packaging>pom</packaging>
<name>JSONP TCK Distribution</name>

<dependencies>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-ug</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-project</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-common</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-common</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-common</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-tests</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-tests</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-tests</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
</dependencies>
<dependencies>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-ug</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-common</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-common</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-common</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-tests</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-tests</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-tests</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
</dependencies>

<profiles>
<profile>
<id>EFTL</id>
<properties>
<license>EFTL</license>
<bundle-name>jakarta-jsonp-tck</bundle-name>
</properties>
</profile>
<profile>
<id>EPL</id>
<properties>
<license>EPL</license>
<bundle-name>jsonp-tck</bundle-name>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
</profiles>
<profiles>
<profile>
<id>EFTL</id>
<properties>
<license>EFTL</license>
<bundle-name>jakarta-jsonp-tck</bundle-name>
</properties>
</profile>
<profile>
<id>EPL</id>
<properties>
<license>EPL</license>
<bundle-name>jsonp-tck</bundle-name>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>distribution</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
<finalName>${bundle-name}-${project.version}</finalName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>distribution</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
<finalName>${bundle-name}-${project.version}</finalName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
9 changes: 8 additions & 1 deletion tck/tck-dist/src/main/assembly/assembly.xml
View file
Expand Up @@ -41,11 +41,18 @@
<include>**/*.sh</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/bin</directory>
<outputDirectory>bin</outputDirectory>
<includes>
<include>**/*.xml</include>
</includes>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
<includes>
<include>jakarta.json:jakarta.json-tck-project</include>
<include>jakarta.json:jakarta.json-tck</include>
<include>jakarta.json:jakarta.json-tck-common</include>
<include>jakarta.json:jakarta.json-tck-tests</include>
<include>jakarta.json:jakarta.json-tck-tests-pluggability</include>
Expand Down

0 comments on commit 25b528c

Please sign in to comment.