Skip to content

Commit

Permalink
build both tck dist bundles at once,
Browse files Browse the repository at this point in the history
make sure EFTL one is not installed, deployed, staged

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
  • Loading branch information
lukasj committed Feb 17, 2022
1 parent 9160796 commit a37d179
Show file tree
Hide file tree
Showing 12 changed files with 243 additions and 117 deletions.
8 changes: 7 additions & 1 deletion tck/pom.xml
Expand Up @@ -38,7 +38,8 @@
<module>tck-tests</module>
<module>tck-tests-pluggability</module>
<module>tck-docs/userguide</module>
<module>tck-dist</module>
<module>tck-dist-eftl</module>
<module>tck-dist-epl</module>
</modules>

<licenses>
Expand Down Expand Up @@ -128,6 +129,11 @@
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down
40 changes: 17 additions & 23 deletions tck/tck-dist/pom.xml → tck/tck-dist-eftl/pom.xml
Expand Up @@ -28,9 +28,23 @@
</parent>

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

<licenses>
<license>
<name>Eclipse Foundation Technology Compatibility Kit License - v 1.0</name>
<distribution>manual</distribution>
<url>https://www.eclipse.org/legal/tck.php</url>
</license>
</licenses>

<properties>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.install.skip>true</maven.install.skip>
</properties>

<dependencies>
<dependency>
Expand Down Expand Up @@ -104,26 +118,6 @@
</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>

<build>
<plugins>
<plugin>
Expand All @@ -140,7 +134,7 @@
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
<finalName>${bundle-name}-${project.version}</finalName>
<finalName>jakarta-jsonp-tck-${project.version}</finalName>
</configuration>
</execution>
</executions>
Expand Down
Expand Up @@ -17,26 +17,27 @@
-->

<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<assembly xmlns="https://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>jsonp-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>
<!-- license -->
<directory>${project.basedir}/src/main/resources</directory>
<outputDirectory>.</outputDirectory>
<includes>
<include>*</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.build.scriptSourceDirectory}</directory>
<outputDirectory>artifacts</outputDirectory>
<fileMode>755</fileMode>
<fileMode>0755</fileMode>
<includes>
<include>**/*.sh</include>
</includes>
Expand All @@ -57,7 +58,7 @@
<include>jakarta.json:jakarta.json-tck-tests</include>
<include>jakarta.json:jakarta.json-tck-tests-pluggability</include>
</includes>
<useTransitiveDependencies>true</useTransitiveDependencies>
<useTransitiveDependencies>false</useTransitiveDependencies>
<outputDirectory>artifacts</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
Expand Down
File renamed without changes.
File renamed without changes.
166 changes: 166 additions & 0 deletions tck/tck-dist-epl/pom.xml
@@ -0,0 +1,166 @@
<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck</artifactId>
<version>2.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

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

<licenses>
<license>
<name>Eclipse Public License - v 2.0</name>
<distribution>repo</distribution>
<url>https://www.eclipse.org/legal/epl-2.0/</url>
</license>
</licenses>

<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>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>unpack</id>
<phase>package</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck-dist-eftl</artifactId>
<version>${project.version}</version>
<type>zip</type>
<overWrite>true</overWrite>
<excludes>**/LICENSE.md</excludes>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/generated</outputDirectory>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
</executions>
</plugin>
<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>jsonp-tck-${project.version}</finalName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
42 changes: 42 additions & 0 deletions tck/tck-dist-epl/src/main/assembly/assembly.xml
@@ -0,0 +1,42 @@
<?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>jsonp-tck</baseDirectory>
<formats>
<format>zip</format>
</formats>

<fileSets>
<fileSet>
<!-- license -->
<directory>${project.basedir}/src/main/resources</directory>
<outputDirectory>.</outputDirectory>
<includes>
<include>*</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/generated/jsonp-tck</directory>
<outputDirectory>.</outputDirectory>
</fileSet>
</fileSets>
</assembly>

0 comments on commit a37d179

Please sign in to comment.