Skip to content

Commit 25b528c

Browse files
lukasjlukasj
committed
add poms to run tests,
reflect changes in the UG, remove obsolete content from the UG Signed-off-by: Lukas Jungmann <[email protected]>
1 parent 2c4ef80 commit 25b528c

File tree

18 files changed

+633
-265
lines changed

18 files changed

+633
-265
lines changed

‎tck/pom.xml‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@
2727
</parent>
2828

2929
<groupId>jakarta.json</groupId>
30-
<artifactId>jakarta.json-tck-project</artifactId>
30+
<artifactId>jakarta.json-tck</artifactId>
3131
<version>2.1.0-SNAPSHOT</version>
3232
<packaging>pom</packaging>
33+
<name>Jakarta JSON Processing TCK</name>
34+
<description>Jakarta JSON Processing TCK</description>
3335

3436
<modules>
3537
<module>tck-common</module>
@@ -39,9 +41,6 @@
3941
<module>tck-dist</module>
4042
</modules>
4143

42-
<name>JSON-P TCK</name>
43-
<description>Jakarta JSON-P TCK</description>
44-
4544
<licenses>
4645
<license>
4746
<name>Eclipse Public License 2.0</name>
@@ -71,11 +70,26 @@
7170
<artifactId>jakarta.json-tck-common</artifactId>
7271
<version>${project.version}</version>
7372
</dependency>
73+
<dependency>
74+
<groupId>jakarta.json</groupId>
75+
<artifactId>jakarta.json-tck-tests</artifactId>
76+
<version>${project.version}</version>
77+
</dependency>
78+
<dependency>
79+
<groupId>jakarta.json</groupId>
80+
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
81+
<version>${project.version}</version>
82+
</dependency>
7483
<dependency>
7584
<groupId>jakarta.json</groupId>
7685
<artifactId>jakarta.json-tck-ug</artifactId>
7786
<version>${project.version}</version>
7887
</dependency>
88+
<dependency>
89+
<groupId>org.netbeans.tools</groupId>
90+
<artifactId>sigtest-maven-plugin</artifactId>
91+
<version>1.4</version>
92+
</dependency>
7993

8094
<dependency>
8195
<groupId>jakarta.json</groupId>

‎tck/tck-common/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<parent>
2323
<groupId>jakarta.json</groupId>
24-
<artifactId>jakarta.json-tck-project</artifactId>
24+
<artifactId>jakarta.json-tck</artifactId>
2525
<version>2.1.0-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>

‎tck/tck-dist/pom.xml‎

Lines changed: 123 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -17,133 +17,134 @@
1717
1818
-->
1919

20-
<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">
21-
<modelVersion>4.0.0</modelVersion>
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>
2223
<parent>
2324
<groupId>jakarta.json</groupId>
24-
<artifactId>jakarta.json-tck-project</artifactId>
25-
<version>2.1.0-SNAPSHOT</version>
26-
<relativePath>../pom.xml</relativePath>
25+
<artifactId>jakarta.json-tck</artifactId>
26+
<version>2.1.0-SNAPSHOT</version>
27+
<relativePath>../pom.xml</relativePath>
2728
</parent>
2829

29-
<groupId>jakarta.json</groupId>
30-
<artifactId>jakarta.json-tck</artifactId>
31-
<packaging>pom</packaging>
32-
<name>JSONP TCK Distribution</name>
30+
<groupId>jakarta.json</groupId>
31+
<artifactId>jakarta.json-tck-dist</artifactId>
32+
<packaging>pom</packaging>
33+
<name>JSONP TCK Distribution</name>
3334

34-
<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>
41-
<dependency>
42-
<groupId>jakarta.json</groupId>
43-
<artifactId>jakarta.json-tck-project</artifactId>
44-
<version>${project.version}</version>
45-
<type>pom</type>
46-
</dependency>
47-
<dependency>
48-
<groupId>jakarta.json</groupId>
49-
<artifactId>jakarta.json-tck-common</artifactId>
50-
<version>${project.version}</version>
51-
<type>jar</type>
52-
</dependency>
53-
<dependency>
54-
<groupId>jakarta.json</groupId>
55-
<artifactId>jakarta.json-tck-common</artifactId>
56-
<version>${project.version}</version>
57-
<type>pom</type>
58-
</dependency>
59-
<dependency>
60-
<groupId>jakarta.json</groupId>
61-
<artifactId>jakarta.json-tck-common</artifactId>
62-
<version>${project.version}</version>
63-
<classifier>sources</classifier>
64-
<optional>true</optional>
65-
</dependency>
66-
<dependency>
67-
<groupId>jakarta.json</groupId>
68-
<artifactId>jakarta.json-tck-tests</artifactId>
69-
<version>${project.version}</version>
70-
<type>jar</type>
71-
</dependency>
72-
<dependency>
73-
<groupId>jakarta.json</groupId>
74-
<artifactId>jakarta.json-tck-tests</artifactId>
75-
<version>${project.version}</version>
76-
<type>pom</type>
77-
</dependency>
78-
<dependency>
79-
<groupId>jakarta.json</groupId>
80-
<artifactId>jakarta.json-tck-tests</artifactId>
81-
<version>${project.version}</version>
82-
<classifier>sources</classifier>
83-
<optional>true</optional>
84-
</dependency>
85-
<dependency>
86-
<groupId>jakarta.json</groupId>
87-
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
88-
<version>${project.version}</version>
89-
<type>jar</type>
90-
</dependency>
91-
<dependency>
92-
<groupId>jakarta.json</groupId>
93-
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
94-
<version>${project.version}</version>
95-
<type>pom</type>
96-
</dependency>
97-
<dependency>
98-
<groupId>jakarta.json</groupId>
99-
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
100-
<version>${project.version}</version>
101-
<classifier>sources</classifier>
102-
<optional>true</optional>
103-
</dependency>
104-
</dependencies>
35+
<dependencies>
36+
<dependency>
37+
<groupId>jakarta.json</groupId>
38+
<artifactId>jakarta.json-tck-ug</artifactId>
39+
<version>${project.version}</version>
40+
<type>zip</type>
41+
</dependency>
42+
<dependency>
43+
<groupId>jakarta.json</groupId>
44+
<artifactId>jakarta.json-tck</artifactId>
45+
<version>${project.version}</version>
46+
<type>pom</type>
47+
</dependency>
48+
<dependency>
49+
<groupId>jakarta.json</groupId>
50+
<artifactId>jakarta.json-tck-common</artifactId>
51+
<version>${project.version}</version>
52+
<type>jar</type>
53+
</dependency>
54+
<dependency>
55+
<groupId>jakarta.json</groupId>
56+
<artifactId>jakarta.json-tck-common</artifactId>
57+
<version>${project.version}</version>
58+
<type>pom</type>
59+
</dependency>
60+
<dependency>
61+
<groupId>jakarta.json</groupId>
62+
<artifactId>jakarta.json-tck-common</artifactId>
63+
<version>${project.version}</version>
64+
<classifier>sources</classifier>
65+
<optional>true</optional>
66+
</dependency>
67+
<dependency>
68+
<groupId>jakarta.json</groupId>
69+
<artifactId>jakarta.json-tck-tests</artifactId>
70+
<version>${project.version}</version>
71+
<type>jar</type>
72+
</dependency>
73+
<dependency>
74+
<groupId>jakarta.json</groupId>
75+
<artifactId>jakarta.json-tck-tests</artifactId>
76+
<version>${project.version}</version>
77+
<type>pom</type>
78+
</dependency>
79+
<dependency>
80+
<groupId>jakarta.json</groupId>
81+
<artifactId>jakarta.json-tck-tests</artifactId>
82+
<version>${project.version}</version>
83+
<classifier>sources</classifier>
84+
<optional>true</optional>
85+
</dependency>
86+
<dependency>
87+
<groupId>jakarta.json</groupId>
88+
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
89+
<version>${project.version}</version>
90+
<type>jar</type>
91+
</dependency>
92+
<dependency>
93+
<groupId>jakarta.json</groupId>
94+
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
95+
<version>${project.version}</version>
96+
<type>pom</type>
97+
</dependency>
98+
<dependency>
99+
<groupId>jakarta.json</groupId>
100+
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
101+
<version>${project.version}</version>
102+
<classifier>sources</classifier>
103+
<optional>true</optional>
104+
</dependency>
105+
</dependencies>
105106

106-
<profiles>
107-
<profile>
108-
<id>EFTL</id>
109-
<properties>
110-
<license>EFTL</license>
111-
<bundle-name>jakarta-jsonp-tck</bundle-name>
112-
</properties>
113-
</profile>
114-
<profile>
115-
<id>EPL</id>
116-
<properties>
117-
<license>EPL</license>
118-
<bundle-name>jsonp-tck</bundle-name>
119-
</properties>
120-
<activation>
121-
<activeByDefault>true</activeByDefault>
122-
</activation>
123-
</profile>
124-
</profiles>
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>
125126

126-
<build>
127-
<plugins>
128-
<plugin>
129-
<artifactId>maven-assembly-plugin</artifactId>
130-
<executions>
131-
<execution>
132-
<id>distribution</id>
133-
<phase>package</phase>
134-
<goals>
135-
<goal>single</goal>
136-
</goals>
137-
<configuration>
138-
<descriptors>
139-
<descriptor>src/main/assembly/assembly.xml</descriptor>
140-
</descriptors>
141-
<appendAssemblyId>false</appendAssemblyId>
142-
<finalName>${bundle-name}-${project.version}</finalName>
143-
</configuration>
144-
</execution>
145-
</executions>
146-
</plugin>
147-
</plugins>
148-
</build>
127+
<build>
128+
<plugins>
129+
<plugin>
130+
<artifactId>maven-assembly-plugin</artifactId>
131+
<executions>
132+
<execution>
133+
<id>distribution</id>
134+
<phase>package</phase>
135+
<goals>
136+
<goal>single</goal>
137+
</goals>
138+
<configuration>
139+
<descriptors>
140+
<descriptor>src/main/assembly/assembly.xml</descriptor>
141+
</descriptors>
142+
<appendAssemblyId>false</appendAssemblyId>
143+
<finalName>${bundle-name}-${project.version}</finalName>
144+
</configuration>
145+
</execution>
146+
</executions>
147+
</plugin>
148+
</plugins>
149+
</build>
149150
</project>

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,18 @@
4141
<include>**/*.sh</include>
4242
</includes>
4343
</fileSet>
44+
<fileSet>
45+
<directory>${project.basedir}/src/main/bin</directory>
46+
<outputDirectory>bin</outputDirectory>
47+
<includes>
48+
<include>**/*.xml</include>
49+
</includes>
50+
</fileSet>
4451
</fileSets>
4552
<dependencySets>
4653
<dependencySet>
4754
<includes>
48-
<include>jakarta.json:jakarta.json-tck-project</include>
55+
<include>jakarta.json:jakarta.json-tck</include>
4956
<include>jakarta.json:jakarta.json-tck-common</include>
5057
<include>jakarta.json:jakarta.json-tck-tests</include>
5158
<include>jakarta.json:jakarta.json-tck-tests-pluggability</include>

0 commit comments

Comments
 (0)