Skip to content

Commit b96a030

Browse files
lukasjlukasj
committed
cleanup tck dist build
Signed-off-by: Lukas Jungmann <[email protected]>
1 parent 5011e1e commit b96a030

File tree

8 files changed

+193
-85
lines changed

8 files changed

+193
-85
lines changed

‎tck/pom.xml

Lines changed: 54 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2020, 2022 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,7 +22,8 @@
2222
<parent>
2323
<groupId>org.eclipse.ee4j</groupId>
2424
<artifactId>project</artifactId>
25-
<version>1.0.6</version>
25+
<version>1.0.7</version>
26+
<relativePath/>
2627
</parent>
2728

2829
<groupId>jakarta.json</groupId>
@@ -62,44 +63,90 @@
6263
<arquillian.junit5.version>1.7.0.Alpha5</arquillian.junit5.version>
6364
</properties>
6465

66+
<dependencyManagement>
67+
<dependencies>
68+
<dependency>
69+
<groupId>jakarta.json</groupId>
70+
<artifactId>jakarta.json-tck-common</artifactId>
71+
<version>${project.version}</version>
72+
</dependency>
73+
<dependency>
74+
<groupId>jakarta.json</groupId>
75+
<artifactId>jakarta.json-tck-ug</artifactId>
76+
<version>${project.version}</version>
77+
</dependency>
78+
79+
<dependency>
80+
<groupId>jakarta.json</groupId>
81+
<artifactId>jakarta.json-api</artifactId>
82+
<version>2.1.0-SNAPSHOT</version>
83+
</dependency>
84+
<dependency>
85+
<groupId>jakarta.inject</groupId>
86+
<artifactId>jakarta.inject-api</artifactId>
87+
<version>1.0</version>
88+
</dependency>
89+
<dependency>
90+
<groupId>org.junit.jupiter</groupId>
91+
<artifactId>junit-jupiter-api</artifactId>
92+
<version>${junit.jupiter.version}</version>
93+
</dependency>
94+
<dependency>
95+
<groupId>org.junit.jupiter</groupId>
96+
<artifactId>junit-jupiter-engine</artifactId>
97+
<version>${junit.jupiter.version}</version>
98+
</dependency>
99+
<dependency>
100+
<groupId>org.jboss.arquillian.junit5</groupId>
101+
<artifactId>arquillian-junit5-container</artifactId>
102+
<version>${arquillian.junit5.version}</version>
103+
</dependency>
104+
</dependencies>
105+
</dependencyManagement>
106+
65107
<dependencies>
66108
<dependency>
67109
<groupId>jakarta.json</groupId>
68110
<artifactId>jakarta.json-api</artifactId>
69-
<version>2.1.0-SNAPSHOT</version>
70111
<scope>provided</scope>
71112
</dependency>
72113
<dependency>
73114
<groupId>jakarta.inject</groupId>
74115
<artifactId>jakarta.inject-api</artifactId>
75-
<version>1.0</version>
76116
<scope>provided</scope>
77117
</dependency>
78118
<dependency>
79119
<groupId>org.junit.jupiter</groupId>
80120
<artifactId>junit-jupiter-api</artifactId>
81-
<version>${junit.jupiter.version}</version>
82121
</dependency>
83122
<dependency>
84123
<groupId>org.junit.jupiter</groupId>
85124
<artifactId>junit-jupiter-engine</artifactId>
86-
<version>${junit.jupiter.version}</version>
87125
</dependency>
88126
<dependency>
89127
<groupId>org.jboss.arquillian.junit5</groupId>
90128
<artifactId>arquillian-junit5-container</artifactId>
91-
<version>${arquillian.junit5.version}</version>
92129
</dependency>
93130
</dependencies>
94131

95132
<build>
96133
<pluginManagement>
97134
<plugins>
135+
<plugin>
136+
<groupId>org.apache.maven.plugins</groupId>
137+
<artifactId>maven-assembly-plugin</artifactId>
138+
<version>3.3.0</version>
139+
</plugin>
98140
<plugin>
99141
<groupId>org.apache.maven.plugins</groupId>
100142
<artifactId>maven-javadoc-plugin</artifactId>
101143
<version>3.3.1</version>
102144
</plugin>
145+
<plugin>
146+
<groupId>org.apache.maven.plugins</groupId>
147+
<artifactId>maven-source-plugin</artifactId>
148+
<version>3.2.0</version>
149+
</plugin>
103150
</plugins>
104151
</pluginManagement>
105152
</build>

‎tck/tck-common/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -27,7 +27,6 @@
2727

2828

2929
<artifactId>jakarta.json-tck-common</artifactId>
30-
<packaging>jar</packaging>
3130

3231
<build>
3332
<plugins>
@@ -45,7 +44,7 @@
4544
<execution>
4645
<id>attach-sources</id>
4746
<goals>
48-
<goal>jar</goal>
47+
<goal>jar-no-fork</goal>
4948
</goals>
5049
</execution>
5150
</executions>

‎tck/tck-dist/pom.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,6 +23,7 @@
2323
<groupId>jakarta.json</groupId>
2424
<artifactId>jakarta.json-tck</artifactId>
2525
<version>2.1.0-SNAPSHOT</version>
26+
<relativePath>../pom.xml</relativePath>
2627
</parent>
2728

2829
<groupId>jakarta.json</groupId>
@@ -31,6 +32,12 @@
3132
<name>JSONP TCK Distribution</name>
3233

3334
<dependencies>
35+
<dependency>
36+
<groupId>jakarta.json</groupId>
37+
<artifactId>jakarta.json-tck-ug</artifactId>
38+
<version>${project.version}</version>
39+
<type>zip</type>
40+
</dependency>
3441
<dependency>
3542
<groupId>jakarta.json</groupId>
3643
<artifactId>jakarta.json-tck</artifactId>
@@ -131,6 +138,7 @@
131138
<descriptors>
132139
<descriptor>src/main/assembly/assembly.xml</descriptor>
133140
</descriptors>
141+
<appendAssemblyId>false</appendAssemblyId>
134142
<finalName>${bundle-name}-${project.version}</finalName>
135143
</configuration>
136144
</execution>

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

Lines changed: 35 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -19,68 +19,43 @@
1919

2020
<assembly xmlns="http://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">
22-
<baseDirectory>jsonp-tck</baseDirectory>
23-
<formats>
24-
<format>zip</format>
25-
</formats>
26-
27-
<files>
28-
<!-- license -->
29-
<file>
30-
<source>LICENSE_${license}.md</source>
31-
<destName>LICENSE.md</destName>
32-
</file>
33-
<file>
34-
<source>artifact-install.sh</source>
35-
<outputDirectory>artifacts</outputDirectory>
36-
</file>
37-
</files>
38-
<fileSets>
39-
<fileSet>
40-
<directory>../tck-docs/</directory>
41-
<outputDirectory>docs/</outputDirectory>
42-
<includes>
43-
<include>*.*</include>
44-
</includes>
45-
</fileSet>
46-
<fileSet>
47-
<directory>../tck-docs/userguide/target/generated-docs</directory>
48-
<outputDirectory>docs/pdf-usersguide</outputDirectory>
22+
<id>distribution</id>
23+
<baseDirectory>jsonp-tck</baseDirectory>
24+
<formats>
25+
<format>zip</format>
26+
</formats>
27+
28+
<files>
29+
<!-- license -->
30+
<file>
31+
<source>LICENSE_${license}.md</source>
32+
<destName>LICENSE.md</destName>
33+
</file>
34+
<file>
35+
<source>artifact-install.sh</source>
36+
<outputDirectory>artifacts</outputDirectory>
37+
</file>
38+
</files>
39+
40+
<dependencySets>
41+
<dependencySet>
4942
<includes>
50-
<include>**/*.pdf</include>
43+
<include>jakarta.json:jakarta.json-tck</include>
44+
<include>jakarta.json:jakarta.json-tck-common</include>
45+
<include>jakarta.json:jakarta.json-tck-tests</include>
46+
<include>jakarta.json:jakarta.json-tck-tests-plugability</include>
5147
</includes>
52-
</fileSet>
53-
<fileSet>
54-
<directory>../tck-docs/assertions</directory>
55-
<outputDirectory>/docs/assertions</outputDirectory>
48+
<useTransitiveDependencies>true</useTransitiveDependencies>
49+
<outputDirectory>artifacts</outputDirectory>
50+
<useProjectArtifact>false</useProjectArtifact>
51+
</dependencySet>
52+
<dependencySet>
5653
<includes>
57-
<include>*Assertions.html</include>
54+
<include>jakarta.json:jakarta.json-tck-ug</include>
5855
</includes>
59-
</fileSet>
60-
<fileSet>
61-
<directory>../tck-docs/userguide/target/staging</directory>
62-
<outputDirectory>docs/html-usersguide</outputDirectory>
63-
<excludes>
64-
<exclude>*.inc</exclude>
65-
<exclude>*.conf</exclude>
66-
<exclude>*.yml</exclude>
67-
<exclude>*.md</exclude>
68-
<exclude>README</exclude>
69-
</excludes>
70-
</fileSet>
71-
</fileSets>
72-
<dependencySets>
73-
<dependencySet>
74-
<includes>
75-
<include>jakarta.json:jakarta.json-tck</include>
76-
<include>jakarta.json:jakarta.json-tck-common</include>
77-
<include>jakarta.json:jakarta.json-tck-tests</include>
78-
<include>jakarta.json:jakarta.json-tck-tests-plugability</include>
79-
</includes>
80-
<useTransitiveDependencies>true</useTransitiveDependencies>
81-
<outputDirectory>artifacts</outputDirectory>
82-
<useProjectArtifact>false</useProjectArtifact>
83-
</dependencySet>
84-
</dependencySets>
56+
<unpack>true</unpack>
57+
<outputDirectory>.</outputDirectory>
58+
</dependencySet>
59+
</dependencySets>
8560

8661
</assembly>

‎tck/tck-docs/userguide/pom.xml

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,14 +20,15 @@
2020
<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">
2121
<modelVersion>4.0.0</modelVersion>
2222
<parent>
23-
<groupId>org.eclipse.ee4j</groupId>
24-
<artifactId>project</artifactId>
25-
<version>1.0.5</version>
23+
<groupId>jakarta.json</groupId>
24+
<artifactId>jakarta.json-tck</artifactId>
25+
<version>2.1.0-SNAPSHOT</version>
26+
<relativePath>../../pom.xml</relativePath>
2627
</parent>
27-
<groupId>org.glassfish</groupId>
28-
<artifactId>tck_jsonp</artifactId>
28+
<groupId>jakarta.json</groupId>
29+
<artifactId>jakarta.json-tck-ug</artifactId>
2930
<packaging>pom</packaging>
30-
<version>2.1.0</version>
31+
<version>2.1.0-SNAPSHOT</version>
3132
<name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta JSON Processing for Jakarta EE, Release 2.1</name>
3233

3334
<properties>
@@ -41,7 +42,7 @@
4142
<jbake.maven.plugin.version>0.3.3</jbake.maven.plugin.version>
4243
<freemarker.version>2.3.30</freemarker.version>
4344
<!-- status: DRAFT, BETA, etc., or blank for final -->
44-
<status></status>
45+
<status>DRAFT</status>
4546
<doc.pdf>Jakarta-JSON-Processing-TCK-Users-Guide.pdf</doc.pdf>
4647
<maven.deploy.skip>true</maven.deploy.skip>
4748
</properties>
@@ -171,6 +172,24 @@
171172
</execution>
172173
</executions>
173174
</plugin>
175+
<plugin>
176+
<artifactId>maven-assembly-plugin</artifactId>
177+
<executions>
178+
<execution>
179+
<id>distribution</id>
180+
<phase>package</phase>
181+
<goals>
182+
<goal>single</goal>
183+
</goals>
184+
<configuration>
185+
<descriptors>
186+
<descriptor>src/main/assembly/assembly.xml</descriptor>
187+
</descriptors>
188+
<appendAssemblyId>false</appendAssemblyId>
189+
</configuration>
190+
</execution>
191+
</executions>
192+
</plugin>
174193
<plugin>
175194
<groupId>org.apache.maven.plugins</groupId>
176195
<artifactId>maven-scm-publish-plugin</artifactId>

0 commit comments

Comments
 (0)