From 6158d2864e1dcc4ecc5468d5702f291c6ed1d265 Mon Sep 17 00:00:00 2001 From: Kyle Aure Date: Tue, 28 Nov 2023 09:18:16 -0600 Subject: [PATCH 1/3] Update parent --- api/pom.xml | 2 +- pom.xml | 2 +- spec/pom.xml | 2 +- tck-dist/pom.xml | 2 +- tck-dist/src/main/artifacts/artifact-install.sh | 4 ++-- tck-dist/src/main/assembly/assembly.xml | 2 +- tck/pom.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 4908a46a..f4720e5a 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -23,7 +23,7 @@ jakarta.data - jakarta-data-parent + jakarta.data-parent 1.0.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index af8decec..a20d9be1 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ jakarta.data - jakarta-data-parent + jakarta.data-parent 1.0.0-SNAPSHOT pom diff --git a/spec/pom.xml b/spec/pom.xml index 74c2a32f..c64169db 100644 --- a/spec/pom.xml +++ b/spec/pom.xml @@ -22,7 +22,7 @@ jakarta.data - jakarta-data-parent + jakarta.data-parent 1.0.0-SNAPSHOT diff --git a/tck-dist/pom.xml b/tck-dist/pom.xml index 77d5cf94..07e96238 100644 --- a/tck-dist/pom.xml +++ b/tck-dist/pom.xml @@ -14,7 +14,7 @@ jakarta.data - jakarta-data-parent + jakarta.data-parent 1.0.0-SNAPSHOT diff --git a/tck-dist/src/main/artifacts/artifact-install.sh b/tck-dist/src/main/artifacts/artifact-install.sh index 2a28bd43..4816c90d 100644 --- a/tck-dist/src/main/artifacts/artifact-install.sh +++ b/tck-dist/src/main/artifacts/artifact-install.sh @@ -11,9 +11,9 @@ fi # Parent pom mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ --Dfile=jakarta-data-parent-"$VERSION".pom \ +-Dfile=jakarta.data-parent-"$VERSION".pom \ -DgroupId=jakarta.data \ --DartifactId=jakarta-data-parent \ +-DartifactId=jakarta.data-parent \ -Dversion="$VERSION" \ -Dpackaging=pom diff --git a/tck-dist/src/main/assembly/assembly.xml b/tck-dist/src/main/assembly/assembly.xml index 3de321e4..ad0c50d3 100644 --- a/tck-dist/src/main/assembly/assembly.xml +++ b/tck-dist/src/main/assembly/assembly.xml @@ -77,7 +77,7 @@ jakarta.data:jakarta-data-tck jakarta.data:jakarta-data-tck:jar:sources - jakarta.data:jakarta-data-parent + jakarta.data:jakarta.data-parent true artifacts diff --git a/tck/pom.xml b/tck/pom.xml index 86b07a76..2321601a 100644 --- a/tck/pom.xml +++ b/tck/pom.xml @@ -19,7 +19,7 @@ jakarta.data - jakarta-data-parent + jakarta.data-parent 1.0.0-SNAPSHOT From 9b84af1d57569875c84a4a08d6da3773fc1e715f Mon Sep 17 00:00:00 2001 From: Kyle Aure Date: Tue, 28 Nov 2023 09:22:00 -0600 Subject: [PATCH 2/3] Update tck --- tck-dist/pom.xml | 29 ++++++++++++------- .../src/main/artifacts/artifact-install.sh | 2 +- tck-dist/src/main/assembly/assembly.xml | 6 ++-- tck-dist/src/main/starter/ee-pom.xml | 4 +-- tck-dist/src/main/starter/se-pom.xml | 4 +-- tck/pom.xml | 2 +- 6 files changed, 27 insertions(+), 20 deletions(-) diff --git a/tck-dist/pom.xml b/tck-dist/pom.xml index 07e96238..1e30b2fe 100644 --- a/tck-dist/pom.xml +++ b/tck-dist/pom.xml @@ -1,12 +1,19 @@ - + @@ -18,7 +25,7 @@ 1.0.0-SNAPSHOT - jakarta-data-tck-dist + jakarta.data-tck-dist Jakarta Data Technology Compatibility Kit Distribution Jakarta Data :: TCK Distribution @@ -50,7 +57,7 @@ jakarta.data - jakarta-data-tck + jakarta.data-tck ${jakarta.data.tck.version} @@ -113,7 +120,7 @@ ee.jakarta.tck.data.metadata.CollectMetaData true - ${jakarta.data:jakarta-data-tck:jar} + ${jakarta.data:jakarta.data-tck:jar} ${project.basedir}/src/main/asciidoc/sections/generated diff --git a/tck-dist/src/main/artifacts/artifact-install.sh b/tck-dist/src/main/artifacts/artifact-install.sh index 4816c90d..dce8dc59 100644 --- a/tck-dist/src/main/artifacts/artifact-install.sh +++ b/tck-dist/src/main/artifacts/artifact-install.sh @@ -19,4 +19,4 @@ mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ # Jakarta Data TCK Installed Library mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ --Dfile=jakarta-data-tck-"$VERSION".jar +-Dfile=jakarta.data-tck-"$VERSION".jar diff --git a/tck-dist/src/main/assembly/assembly.xml b/tck-dist/src/main/assembly/assembly.xml index ad0c50d3..3e0125be 100644 --- a/tck-dist/src/main/assembly/assembly.xml +++ b/tck-dist/src/main/assembly/assembly.xml @@ -1,6 +1,6 @@ jakarta-data - jakarta-data-tck + jakarta.data-tck ${jakarta.data.tck.version} @@ -150,7 +150,7 @@ ${maven.surefire.plugin.version} - jakarta.data:jakarta-data-tck + jakarta.data:jakarta.data-tck diff --git a/tck-dist/src/main/starter/se-pom.xml b/tck-dist/src/main/starter/se-pom.xml index d7c80fe9..2dcd33e9 100644 --- a/tck-dist/src/main/starter/se-pom.xml +++ b/tck-dist/src/main/starter/se-pom.xml @@ -77,7 +77,7 @@ jakarta-data - jakarta-data-tck + jakarta.data-tck ${jakarta.data.tck.version} @@ -145,7 +145,7 @@ ${maven.surefire.plugin.version} - jakarta.data:jakarta-data-tck + jakarta.data:jakarta.data-tck diff --git a/tck/pom.xml b/tck/pom.xml index 2321601a..c1f85eeb 100644 --- a/tck/pom.xml +++ b/tck/pom.xml @@ -23,7 +23,7 @@ 1.0.0-SNAPSHOT - jakarta-data-tck + jakarta.data-tck Jakarta Data Technology Compatibility Kit Jakarta Data :: TCK From 1f1776fe1cbbdd02e847f94367b1882ee005bf50 Mon Sep 17 00:00:00 2001 From: Kyle Aure Date: Tue, 28 Nov 2023 09:22:45 -0600 Subject: [PATCH 3/3] update spec --- spec/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/pom.xml b/spec/pom.xml index c64169db..c2831fa5 100644 --- a/spec/pom.xml +++ b/spec/pom.xml @@ -1,6 +1,6 @@