Skip to content

Commit a37d179

Browse files
lukasjlukasj
committed
build both tck dist bundles at once,
make sure EFTL one is not installed, deployed, staged Signed-off-by: Lukas Jungmann <[email protected]>
1 parent 9160796 commit a37d179

File tree

12 files changed

+243
-117
lines changed

12 files changed

+243
-117
lines changed

‎tck/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
<module>tck-tests</module>
3939
<module>tck-tests-pluggability</module>
4040
<module>tck-docs/userguide</module>
41-
<module>tck-dist</module>
41+
<module>tck-dist-eftl</module>
42+
<module>tck-dist-epl</module>
4243
</modules>
4344

4445
<licenses>
@@ -128,6 +129,11 @@
128129
<build>
129130
<pluginManagement>
130131
<plugins>
132+
<plugin>
133+
<groupId>org.apache.maven.plugins</groupId>
134+
<artifactId>maven-assembly-plugin</artifactId>
135+
<version>3.3.0</version>
136+
</plugin>
131137
<plugin>
132138
<groupId>org.apache.maven.plugins</groupId>
133139
<artifactId>maven-javadoc-plugin</artifactId>

‎tck/tck-dist/pom.xml‎ renamed to ‎tck/tck-dist-eftl/pom.xml‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,23 @@
2828
</parent>
2929

3030
<groupId>jakarta.json</groupId>
31-
<artifactId>jakarta.json-tck-dist</artifactId>
31+
<artifactId>jakarta.json-tck-dist-eftl</artifactId>
3232
<packaging>pom</packaging>
33-
<name>JSONP TCK Distribution</name>
33+
<name>JSONP TCK EFTL Distribution</name>
34+
35+
<licenses>
36+
<license>
37+
<name>Eclipse Foundation Technology Compatibility Kit License - v 1.0</name>
38+
<distribution>manual</distribution>
39+
<url>https://www.eclipse.org/legal/tck.php</url>
40+
</license>
41+
</licenses>
42+
43+
<properties>
44+
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
45+
<maven.deploy.skip>true</maven.deploy.skip>
46+
<maven.install.skip>true</maven.install.skip>
47+
</properties>
3448

3549
<dependencies>
3650
<dependency>
@@ -104,26 +118,6 @@
104118
</dependency>
105119
</dependencies>
106120

107-
<profiles>
108-
<profile>
109-
<id>EFTL</id>
110-
<properties>
111-
<license>EFTL</license>
112-
<bundle-name>jakarta-jsonp-tck</bundle-name>
113-
</properties>
114-
</profile>
115-
<profile>
116-
<id>EPL</id>
117-
<properties>
118-
<license>EPL</license>
119-
<bundle-name>jsonp-tck</bundle-name>
120-
</properties>
121-
<activation>
122-
<activeByDefault>true</activeByDefault>
123-
</activation>
124-
</profile>
125-
</profiles>
126-
127121
<build>
128122
<plugins>
129123
<plugin>
@@ -140,7 +134,7 @@
140134
<descriptor>src/main/assembly/assembly.xml</descriptor>
141135
</descriptors>
142136
<appendAssemblyId>false</appendAssemblyId>
143-
<finalName>${bundle-name}-${project.version}</finalName>
137+
<finalName>jakarta-jsonp-tck-${project.version}</finalName>
144138
</configuration>
145139
</execution>
146140
</executions>

‎tck/tck-dist/src/main/assembly/assembly.xml‎ renamed to ‎tck/tck-dist-eftl/src/main/assembly/assembly.xml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,27 @@
1717
1818
-->
1919

20-
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
<assembly xmlns="https://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2121
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
2222
<id>distribution</id>
2323
<baseDirectory>jsonp-tck</baseDirectory>
2424
<formats>
2525
<format>zip</format>
2626
</formats>
2727

28-
<files>
29-
<!-- license -->
30-
<file>
31-
<source>${project.basedir}/src/main/resources/LICENSE_${license}.md</source>
32-
<destName>LICENSE.md</destName>
33-
</file>
34-
</files>
3528
<fileSets>
29+
<fileSet>
30+
<!-- license -->
31+
<directory>${project.basedir}/src/main/resources</directory>
32+
<outputDirectory>.</outputDirectory>
33+
<includes>
34+
<include>*</include>
35+
</includes>
36+
</fileSet>
3637
<fileSet>
3738
<directory>${project.build.scriptSourceDirectory}</directory>
3839
<outputDirectory>artifacts</outputDirectory>
39-
<fileMode>755</fileMode>
40+
<fileMode>0755</fileMode>
4041
<includes>
4142
<include>**/*.sh</include>
4243
</includes>
@@ -57,7 +58,7 @@
5758
<include>jakarta.json:jakarta.json-tck-tests</include>
5859
<include>jakarta.json:jakarta.json-tck-tests-pluggability</include>
5960
</includes>
60-
<useTransitiveDependencies>true</useTransitiveDependencies>
61+
<useTransitiveDependencies>false</useTransitiveDependencies>
6162
<outputDirectory>artifacts</outputDirectory>
6263
<useProjectArtifact>false</useProjectArtifact>
6364
</dependencySet>

‎tck/tck-dist/src/main/bin/pom.xml‎ renamed to ‎tck/tck-dist-eftl/src/main/bin/pom.xml‎

File renamed without changes.

‎tck/tck-dist/src/main/bin/tck-tests-pluggability/pom.xml‎ renamed to ‎tck/tck-dist-eftl/src/main/bin/tck-tests-pluggability/pom.xml‎

File renamed without changes.

‎tck/tck-dist/src/main/bin/tck-tests/pom.xml‎ renamed to ‎tck/tck-dist-eftl/src/main/bin/tck-tests/pom.xml‎

File renamed without changes.

‎tck/tck-dist/src/main/resources/LICENSE_EFTL.md‎ renamed to ‎tck/tck-dist-eftl/src/main/resources/LICENSE.md‎

File renamed without changes.

‎tck/tck-dist/src/main/scripts/artifact-install.sh‎ renamed to ‎tck/tck-dist-eftl/src/main/scripts/artifact-install.sh‎

File renamed without changes.

‎tck/tck-dist-epl/pom.xml‎

Lines changed: 166 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
5+
6+
This program and the accompanying materials are made available under the
7+
terms of the Eclipse Public License v. 2.0, which is available at
8+
http://www.eclipse.org/legal/epl-2.0.
9+
10+
This Source Code may also be made available under the following Secondary
11+
Licenses when the conditions for such availability set forth in the
12+
Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
13+
version 2 with the GNU Classpath Exception, which is available at
14+
https://www.gnu.org/software/classpath/license.html.
15+
16+
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
17+
18+
-->
19+
20+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
22+
<modelVersion>4.0.0</modelVersion>
23+
<parent>
24+
<groupId>jakarta.json</groupId>
25+
<artifactId>jakarta.json-tck</artifactId>
26+
<version>2.1.0-SNAPSHOT</version>
27+
<relativePath>../pom.xml</relativePath>
28+
</parent>
29+
30+
<groupId>jakarta.json</groupId>
31+
<artifactId>jakarta.json-tck-dist-epl</artifactId>
32+
<packaging>pom</packaging>
33+
<name>JSONP TCK EPL Distribution</name>
34+
35+
<licenses>
36+
<license>
37+
<name>Eclipse Public License - v 2.0</name>
38+
<distribution>repo</distribution>
39+
<url>https://www.eclipse.org/legal/epl-2.0/</url>
40+
</license>
41+
</licenses>
42+
43+
<dependencies>
44+
<dependency>
45+
<groupId>jakarta.json</groupId>
46+
<artifactId>jakarta.json-tck-ug</artifactId>
47+
<version>${project.version}</version>
48+
<type>zip</type>
49+
</dependency>
50+
<dependency>
51+
<groupId>jakarta.json</groupId>
52+
<artifactId>jakarta.json-tck</artifactId>
53+
<version>${project.version}</version>
54+
<type>pom</type>
55+
</dependency>
56+
<dependency>
57+
<groupId>jakarta.json</groupId>
58+
<artifactId>jakarta.json-tck-common</artifactId>
59+
<version>${project.version}</version>
60+
<type>jar</type>
61+
</dependency>
62+
<dependency>
63+
<groupId>jakarta.json</groupId>
64+
<artifactId>jakarta.json-tck-common</artifactId>
65+
<version>${project.version}</version>
66+
<type>pom</type>
67+
</dependency>
68+
<dependency>
69+
<groupId>jakarta.json</groupId>
70+
<artifactId>jakarta.json-tck-common</artifactId>
71+
<version>${project.version}</version>
72+
<classifier>sources</classifier>
73+
<optional>true</optional>
74+
</dependency>
75+
<dependency>
76+
<groupId>jakarta.json</groupId>
77+
<artifactId>jakarta.json-tck-tests</artifactId>
78+
<version>${project.version}</version>
79+
<type>jar</type>
80+
</dependency>
81+
<dependency>
82+
<groupId>jakarta.json</groupId>
83+
<artifactId>jakarta.json-tck-tests</artifactId>
84+
<version>${project.version}</version>
85+
<type>pom</type>
86+
</dependency>
87+
<dependency>
88+
<groupId>jakarta.json</groupId>
89+
<artifactId>jakarta.json-tck-tests</artifactId>
90+
<version>${project.version}</version>
91+
<classifier>sources</classifier>
92+
<optional>true</optional>
93+
</dependency>
94+
<dependency>
95+
<groupId>jakarta.json</groupId>
96+
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
97+
<version>${project.version}</version>
98+
<type>jar</type>
99+
</dependency>
100+
<dependency>
101+
<groupId>jakarta.json</groupId>
102+
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
103+
<version>${project.version}</version>
104+
<type>pom</type>
105+
</dependency>
106+
<dependency>
107+
<groupId>jakarta.json</groupId>
108+
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
109+
<version>${project.version}</version>
110+
<classifier>sources</classifier>
111+
<optional>true</optional>
112+
</dependency>
113+
</dependencies>
114+
115+
<build>
116+
<plugins>
117+
<plugin>
118+
<groupId>org.apache.maven.plugins</groupId>
119+
<artifactId>maven-dependency-plugin</artifactId>
120+
<version>3.2.0</version>
121+
<executions>
122+
<execution>
123+
<id>unpack</id>
124+
<phase>package</phase>
125+
<goals>
126+
<goal>unpack</goal>
127+
</goals>
128+
<configuration>
129+
<artifactItems>
130+
<artifactItem>
131+
<groupId>jakarta.json</groupId>
132+
<artifactId>jakarta.json-tck-dist-eftl</artifactId>
133+
<version>${project.version}</version>
134+
<type>zip</type>
135+
<overWrite>true</overWrite>
136+
<excludes>**/LICENSE.md</excludes>
137+
</artifactItem>
138+
</artifactItems>
139+
<outputDirectory>${project.build.directory}/generated</outputDirectory>
140+
<overWriteSnapshots>true</overWriteSnapshots>
141+
</configuration>
142+
</execution>
143+
</executions>
144+
</plugin>
145+
<plugin>
146+
<artifactId>maven-assembly-plugin</artifactId>
147+
<executions>
148+
<execution>
149+
<id>distribution</id>
150+
<phase>package</phase>
151+
<goals>
152+
<goal>single</goal>
153+
</goals>
154+
<configuration>
155+
<descriptors>
156+
<descriptor>src/main/assembly/assembly.xml</descriptor>
157+
</descriptors>
158+
<appendAssemblyId>false</appendAssemblyId>
159+
<finalName>jsonp-tck-${project.version}</finalName>
160+
</configuration>
161+
</execution>
162+
</executions>
163+
</plugin>
164+
</plugins>
165+
</build>
166+
</project>

‎tck/tck-dist-epl/src/main/assembly/assembly.xml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
5+
6+
This program and the accompanying materials are made available under the
7+
terms of the Eclipse Public License v. 2.0, which is available at
8+
http://www.eclipse.org/legal/epl-2.0.
9+
10+
This Source Code may also be made available under the following Secondary
11+
Licenses when the conditions for such availability set forth in the
12+
Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
13+
version 2 with the GNU Classpath Exception, which is available at
14+
https://www.gnu.org/software/classpath/license.html.
15+
16+
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
17+
18+
-->
19+
20+
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
22+
<id>distribution</id>
23+
<baseDirectory>jsonp-tck</baseDirectory>
24+
<formats>
25+
<format>zip</format>
26+
</formats>
27+
28+
<fileSets>
29+
<fileSet>
30+
<!-- license -->
31+
<directory>${project.basedir}/src/main/resources</directory>
32+
<outputDirectory>.</outputDirectory>
33+
<includes>
34+
<include>*</include>
35+
</includes>
36+
</fileSet>
37+
<fileSet>
38+
<directory>${project.build.directory}/generated/jsonp-tck</directory>
39+
<outputDirectory>.</outputDirectory>
40+
</fileSet>
41+
</fileSets>
42+
</assembly>

0 commit comments

Comments
 (0)