Skip to content

Commit 1dd8b14

Browse files
lukasjlukasj
committed
tweak project IDs, fix the typo in plugability
Signed-off-by: Lukas Jungmann <[email protected]>
1 parent a58c466 commit 1dd8b14

File tree

24 files changed

+58
-60
lines changed

24 files changed

+58
-60
lines changed

‎impl-tck/pom.xml

Lines changed: 3 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) 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
@@ -23,13 +23,13 @@
2323
<modelVersion>4.0.0</modelVersion>
2424

2525
<groupId>org.eclipse.jsonp</groupId>
26-
<artifactId>jakarta.json-tck</artifactId>
26+
<artifactId>tck-project</artifactId>
2727
<version>2.1.0-SNAPSHOT</version>
2828
<packaging>pom</packaging>
2929

3030
<modules>
3131
<module>tck-tests</module>
32-
<module>tck-tests-plugability</module>
32+
<module>tck-tests-pluggability</module>
3333
</modules>
3434

3535
<properties>

‎impl-tck/tck-tests-plugability/pom.xml renamed to ‎impl-tck/tck-tests-pluggability/pom.xml

Lines changed: 5 additions & 5 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
@@ -24,16 +24,16 @@
2424

2525
<parent>
2626
<groupId>org.eclipse.jsonp</groupId>
27-
<artifactId>jakarta.json-tck</artifactId>
27+
<artifactId>tck-project</artifactId>
2828
<version>2.1.0-SNAPSHOT</version>
2929
</parent>
3030

31-
<artifactId>jakarta.json-tck-tests-plugability</artifactId>
31+
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
3232

3333
<dependencies>
3434
<dependency>
3535
<groupId>jakarta.json</groupId>
36-
<artifactId>jakarta.json-tck-tests-plugability</artifactId>
36+
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
3737
<version>${jsonp-tck.version}</version>
3838
<scope>test</scope>
3939
</dependency>
@@ -52,7 +52,7 @@
5252
<version>3.0.0-M4</version>
5353
<configuration>
5454
<dependenciesToScan>
55-
<dependency>jakarta.json:jakarta.json-tck-tests-plugability</dependency>
55+
<dependency>jakarta.json:jakarta.json-tck-tests-pluggability</dependency>
5656
</dependenciesToScan>
5757
<trimStackTrace>false</trimStackTrace>
5858
<failIfNoTests>true</failIfNoTests>

‎impl-tck/tck-tests/pom.xml

Lines changed: 2 additions & 2 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
@@ -24,7 +24,7 @@
2424

2525
<parent>
2626
<groupId>org.eclipse.jsonp</groupId>
27-
<artifactId>jakarta.json-tck</artifactId>
27+
<artifactId>tck-project</artifactId>
2828
<version>2.1.0-SNAPSHOT</version>
2929
</parent>
3030

‎tck/pom.xml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
</parent>
2828

2929
<groupId>jakarta.json</groupId>
30-
<artifactId>jakarta.json-tck</artifactId>
30+
<artifactId>jakarta.json-tck-project</artifactId>
3131
<version>2.1.0-SNAPSHOT</version>
3232
<packaging>pom</packaging>
3333

3434
<modules>
3535
<module>tck-common</module>
3636
<module>tck-tests</module>
37-
<module>tck-tests-plugability</module>
37+
<module>tck-tests-pluggability</module>
3838
<module>tck-docs/userguide</module>
3939
<module>tck-dist</module>
4040
</modules>
@@ -132,21 +132,11 @@
132132
<build>
133133
<pluginManagement>
134134
<plugins>
135-
<plugin>
136-
<groupId>org.apache.maven.plugins</groupId>
137-
<artifactId>maven-assembly-plugin</artifactId>
138-
<version>3.3.0</version>
139-
</plugin>
140135
<plugin>
141136
<groupId>org.apache.maven.plugins</groupId>
142137
<artifactId>maven-javadoc-plugin</artifactId>
143138
<version>3.3.1</version>
144139
</plugin>
145-
<plugin>
146-
<groupId>org.apache.maven.plugins</groupId>
147-
<artifactId>maven-source-plugin</artifactId>
148-
<version>3.2.0</version>
149-
</plugin>
150140
</plugins>
151141
</pluginManagement>
152142
</build>

‎tck/tck-common/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121

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

2829

‎tck/tck-dist/pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
<modelVersion>4.0.0</modelVersion>
2222
<parent>
2323
<groupId>jakarta.json</groupId>
24-
<artifactId>jakarta.json-tck</artifactId>
25-
<version>2.1.0-SNAPSHOT</version>
24+
<artifactId>jakarta.json-tck-project</artifactId>
25+
<version>2.1.0-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

2929
<groupId>jakarta.json</groupId>
30-
<artifactId>jsonp-tck-dist</artifactId>
30+
<artifactId>jakarta.json-tck</artifactId>
3131
<packaging>pom</packaging>
3232
<name>JSONP TCK Distribution</name>
3333

@@ -40,7 +40,7 @@
4040
</dependency>
4141
<dependency>
4242
<groupId>jakarta.json</groupId>
43-
<artifactId>jakarta.json-tck</artifactId>
43+
<artifactId>jakarta.json-tck-project</artifactId>
4444
<version>${project.version}</version>
4545
<type>pom</type>
4646
</dependency>
@@ -84,19 +84,19 @@
8484
</dependency>
8585
<dependency>
8686
<groupId>jakarta.json</groupId>
87-
<artifactId>jakarta.json-tck-tests-plugability</artifactId>
87+
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
8888
<version>${project.version}</version>
8989
<type>jar</type>
9090
</dependency>
9191
<dependency>
9292
<groupId>jakarta.json</groupId>
93-
<artifactId>jakarta.json-tck-tests-plugability</artifactId>
93+
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
9494
<version>${project.version}</version>
9595
<type>pom</type>
9696
</dependency>
9797
<dependency>
9898
<groupId>jakarta.json</groupId>
99-
<artifactId>jakarta.json-tck-tests-plugability</artifactId>
99+
<artifactId>jakarta.json-tck-tests-pluggability</artifactId>
100100
<version>${project.version}</version>
101101
<classifier>sources</classifier>
102102
<optional>true</optional>

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,27 @@
2828
<files>
2929
<!-- license -->
3030
<file>
31-
<source>LICENSE_${license}.md</source>
31+
<source>${project.basedir}/src/main/resources/LICENSE_${license}.md</source>
3232
<destName>LICENSE.md</destName>
3333
</file>
34-
<file>
35-
<source>artifact-install.sh</source>
36-
<outputDirectory>artifacts</outputDirectory>
37-
</file>
3834
</files>
39-
35+
<fileSets>
36+
<fileSet>
37+
<directory>${project.build.scriptSourceDirectory}</directory>
38+
<outputDirectory>artifacts</outputDirectory>
39+
<fileMode>755</fileMode>
40+
<includes>
41+
<include>**/*.sh</include>
42+
</includes>
43+
</fileSet>
44+
</fileSets>
4045
<dependencySets>
4146
<dependencySet>
4247
<includes>
43-
<include>jakarta.json:jakarta.json-tck</include>
48+
<include>jakarta.json:jakarta.json-tck-project</include>
4449
<include>jakarta.json:jakarta.json-tck-common</include>
4550
<include>jakarta.json:jakarta.json-tck-tests</include>
46-
<include>jakarta.json:jakarta.json-tck-tests-plugability</include>
51+
<include>jakarta.json:jakarta.json-tck-tests-pluggability</include>
4752
</includes>
4853
<useTransitiveDependencies>true</useTransitiveDependencies>
4954
<outputDirectory>artifacts</outputDirectory>

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

File renamed without changes.

‎tck/tck-dist/LICENSE_EPL.md renamed to ‎tck/tck-dist/src/main/resources/LICENSE_EPL.md

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

281281
## The GNU General Public License (GPL) Version 2, June 1991
282282

283-
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
283+
Copyright (C) 1989, 2022 Free Software Foundation, Inc.
284284
51 Franklin Street, Fifth Floor
285285
Boston, MA 02110-1335
286286
USA

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fi
1111
# Parent pom
1212
mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \
1313
-Dfile=jakarta.json-tck-"$VERSION".pom -DgroupId=jakarta.json \
14-
-DartifactId=jakarta.json-tck -Dversion="$VERSION" -Dpackaging=pom
14+
-DartifactId=jakarta.json-tck-project -Dversion="$VERSION" -Dpackaging=pom
1515

1616
# pom
1717
mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \
@@ -45,15 +45,15 @@ mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \
4545

4646
# pom
4747
mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \
48-
-Dfile=jakarta.json-tck-tests-plugability-"$VERSION".pom -DgroupId=jakarta.json \
49-
-DartifactId=jakarta.json-tck-tests-plugability -Dversion="$VERSION" -Dpackaging=pom
48+
-Dfile=jakarta.json-tck-tests-pluggability-"$VERSION".pom -DgroupId=jakarta.json \
49+
-DartifactId=jakarta.json-tck-tests-pluggability -Dversion="$VERSION" -Dpackaging=pom
5050

5151
# jar
5252
mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \
53-
-Dfile=jakarta.json-tck-tests-plugability-"$VERSION".jar -DgroupId=jakarta.json \
54-
-DartifactId=jakarta.json-tck-tests-plugability -Dversion="$VERSION" -Dpackaging=jar
53+
-Dfile=jakarta.json-tck-tests-pluggability-"$VERSION".jar -DgroupId=jakarta.json \
54+
-DartifactId=jakarta.json-tck-tests-pluggability -Dversion="$VERSION" -Dpackaging=jar
5555

5656
# sources jar
5757
mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \
58-
-Dfile=jakarta.json-tck-tests-plugability-"$VERSION"-sources.jar -DgroupId=jakarta.json \
59-
-DartifactId=jakarta.json-tck-tests-plugability-sources -Dversion="$VERSION" -Dpackaging=jar
58+
-Dfile=jakarta.json-tck-tests-pluggability-"$VERSION"-sources.jar -DgroupId=jakarta.json \
59+
-DartifactId=jakarta.json-tck-tests-pluggability-sources -Dversion="$VERSION" -Dpackaging=jar

0 commit comments

Comments
 (0)