Fixes #3966 - Move Core Profile TCK up in project hierarchy (#3967)

piranhacloud · Sep 25, 2024 · 277c3de · 277c3de
1 parent 580a26b
commit 277c3de
Show file tree

Hide file tree

Showing 31 changed files with 98 additions and 84 deletions.
diff --git a/.github/workflows/tck-coreprofile.yml b/.github/workflows/tck-coreprofile.yml
@@ -22,7 +22,7 @@ jobs:
  run: mvn -B -DskipTests=true -ntp install
  - name: Run TCK
  run: |
- cd external/tck/coreprofile/annotations
+ cd external/coreprofile-tck/annotations
  mvn -B -ntp verify
  cat target/tck/report/text/summary.txt >> $GITHUB_STEP_SUMMARY
  atinject:
@@ -43,12 +43,12 @@ jobs:
  run: mvn -B -DskipTests=true -ntp install
  - name: Run TCK
  run: |
- cd external/tck/coreprofile/atinject
+ cd external/coreprofile-tck/atinject
  mvn -B -ntp verify
  - name: Test Summary
  uses: test-summary/action@v2
  with:
- paths: "external/tck/coreprofile/atinject/target/tck/example/target/surefire-reports/TEST-*.xml"
+ paths: "external/coreprofile-tck/atinject/target/tck/example/target/surefire-reports/TEST-*.xml"
  if: always()
  cdi:
  runs-on: ${{ matrix.os }}
@@ -68,12 +68,12 @@ jobs:
  run: mvn -B -DskipTests=true -ntp install
  - name: Run TCK
  run: |
- cd external/tck/coreprofile/cdi
+ cd external/coreprofile-tck/cdi
  mvn -B -ntp verify
  - name: Test Summary
  uses: test-summary/action@v2
  with:
- paths: "external/tck/coreprofile/cdi/runner/target/surefire-reports/junitreports/TEST-*.xml"
+ paths: "external/coreprofile-tck/cdi/runner/target/surefire-reports/junitreports/TEST-*.xml"
  if: always()
  coreprofile:
  runs-on: ${{ matrix.os }}
@@ -93,12 +93,12 @@ jobs:
  run: mvn -B -DskipTests=true -ntp install
  - name: Run TCK
  run: |
- cd external/tck/coreprofile/coreprofile
+ cd external/coreprofile-tck/coreprofile
  mvn -B -ntp verify 
  - name: Test Summary
  uses: test-summary/action@v2
  with:
- paths: "external/tck/coreprofile/coreprofile/runner/target/failsafe-reports/**/TEST-*.xml"
+ paths: "external/coreprofile-tck/coreprofile/runner/target/failsafe-reports/**/TEST-*.xml"
  if: always()
  jsonb:
  runs-on: ${{ matrix.os }}
@@ -118,12 +118,12 @@ jobs:
  run: mvn -B -DskipTests=true -ntp install
  - name: Run TCK
  run: |
- cd external/tck/coreprofile/jsonb
+ cd external/coreprofile-tck/jsonb
  mvn -B -ntp verify
  - name: Test Summary
  uses: test-summary/action@v2
  with:
- paths: "external/tck/coreprofile/jsonb/target/tck/bin/target/surefire-reports/TEST-*.xml"
+ paths: "external/coreprofile-tck/jsonb/target/tck/bin/target/surefire-reports/TEST-*.xml"
  if: always()
  jsonp:
  runs-on: ${{ matrix.os }}
@@ -143,14 +143,14 @@ jobs:
  run: mvn -B -DskipTests=true -ntp install
  - name: Run TCK
  run: |
- cd external/tck/coreprofile/jsonp
+ cd external/coreprofile-tck/jsonp
  mvn -B -ntp verify
  - name: Test Summary
  uses: test-summary/action@v2
  with:
  paths: |
- external/tck/coreprofile/jsonp/target/tck/bin/tck-tests/target/surefire-reports/TEST-*.xml
- external/tck/coreprofile/jsonp/target/tck/bin/tck-tests-pluggability/target/surefire-reports/TEST-*.xml
+ external/coreprofile-tck/jsonp/target/tck/bin/tck-tests/target/surefire-reports/TEST-*.xml
+ external/coreprofile-tck/jsonp/target/tck/bin/tck-tests-pluggability/target/surefire-reports/TEST-*.xml
  if: always()
  rest:
  runs-on: ${{ matrix.os }}
@@ -175,5 +175,5 @@ jobs:
  - name: Test Summary
  uses: test-summary/action@v2
  with:
- paths: "external/tck/coreprofile/rest/runner/target/failsafe-reports/**/TEST-*.xml"
+ paths: "external/coreprofile-tck/rest/runner/target/failsafe-reports/**/TEST-*.xml"
  if: always()
diff --git a/external/tck/coreprofile/annotations/pom.xml → external/coreprofile-tck/annotations/pom.xml b/external/tck/coreprofile/annotations/pom.xml → external/coreprofile-tck/annotations/pom.xml
@@ -3,13 +3,13 @@
 <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/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <parent>
- <groupId>cloud.piranha.external.tck.coreprofile</groupId>
+ <groupId>cloud.piranha.external.coreprofiletck</groupId>
  <artifactId>project</artifactId>
  <version>24.10.99-SNAPSHOT</version>
  </parent>
  <artifactId>annotations-tck</artifactId>
  <packaging>pom</packaging>
- <name>Piranha Core Profile - Jakarta Annotations TCK</name>
+ <name>Piranha Core Profile - Annotations TCK</name>
  <properties>
  <ant.home>${project.build.directory}/ant</ant.home>
  <signature.home>${project.build.directory}/signature</signature.home>

diff --git a/external/tck/coreprofile/atinject/pom.xml → external/coreprofile-tck/atinject/pom.xml b/external/tck/coreprofile/atinject/pom.xml → external/coreprofile-tck/atinject/pom.xml
@@ -3,13 +3,13 @@
 <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/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <parent>
- <groupId>cloud.piranha.external.tck.coreprofile</groupId>
+ <groupId>cloud.piranha.external.coreprofiletck</groupId>
  <artifactId>project</artifactId>
  <version>24.10.99-SNAPSHOT</version>
  </parent>
  <artifactId>inject-tck</artifactId>
  <packaging>pom</packaging>
- <name>Piranha Core Profile - Jakarta Inject TCK</name>
+ <name>Piranha Core Profile - Inject TCK</name>
  <properties>
  <tck.home>${project.build.directory}/tck</tck.home>
  </properties>

diff --git a/...nal/tck/coreprofile/cdi/installer/pom.xml → ...nal/coreprofile-tck/cdi/installer/pom.xml b/...nal/tck/coreprofile/cdi/installer/pom.xml → ...nal/coreprofile-tck/cdi/installer/pom.xml
@@ -4,15 +4,15 @@
  <modelVersion>4.0.0</modelVersion>
 
  <parent>
- <groupId>cloud.piranha.external.tck.coreprofile</groupId>
- <artifactId>cdi-tck</artifactId>
+ <groupId>cloud.piranha.external.coreprofiletck.cditck</groupId>
+ <artifactId>project</artifactId>
  <version>24.10.99-SNAPSHOT</version>
  </parent>
 
  <artifactId>installer</artifactId>
  <packaging>pom</packaging>
 
- <name>Piranha Core Profile - Jakarta CDI TCK - Installer</name>
+ <name>Piranha Core Profile - CDI TCK - Installer</name>
 
  <dependencyManagement>
  <dependencies>

diff --git a/external/tck/coreprofile/coreprofile/pom.xml → external/coreprofile-tck/cdi/pom.xml b/external/tck/coreprofile/coreprofile/pom.xml → external/coreprofile-tck/cdi/pom.xml
@@ -4,15 +4,15 @@
  <modelVersion>4.0.0</modelVersion>
 
  <parent>
- <groupId>cloud.piranha.external.tck.coreprofile</groupId>
+ <groupId>cloud.piranha.external.coreprofiletck</groupId>
  <artifactId>project</artifactId>
  <version>24.10.99-SNAPSHOT</version>
  </parent>
-
- <artifactId>coreprofile-tck</artifactId>
+ <groupId>cloud.piranha.external.coreprofiletck.cditck</groupId>
+ <artifactId>project</artifactId>
  <packaging>pom</packaging>
 
- <name>Piranha Core Profile - Jakarta Core Profile TCK</name>
+ <name>Piranha Core Profile - CDI TCK - Project</name>
 
  <modules>
  <module>installer</module>

diff --git a/...l/tck/coreprofile/cdi/runner/core/pom.xml → ...l/coreprofile-tck/cdi/runner/core/pom.xml b/...l/tck/coreprofile/cdi/runner/core/pom.xml → ...l/coreprofile-tck/cdi/runner/core/pom.xml
@@ -3,15 +3,17 @@
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>cloud.piranha.external.coreprofiletck.cditck.runner</groupId>
+ <artifactId>project</artifactId>
+ <version>24.10.99-SNAPSHOT</version>
+ </parent>
+ <artifactId>core</artifactId>
 
- <groupId>cloud.piranha.external.tck.coreprofile</groupId>
- <artifactId>cdi-tck</artifactId>
- <version>24.10.99-SNAPSHOT</version>
-
- <name>Piranha Core Profile - Jakarta CDI TCK - Runner - Core</name>
+ <name>Piranha Core Profile - CDI TCK - Runner - Core</name>
 
  <properties>
- <piranha.version>24.9.0-SNAPSHOT</piranha.version>
+ <piranha.version>24.10.99-SNAPSHOT</piranha.version>
  <weld.version>5.1.2.Final</weld.version>
  </properties>
 

diff --git a/...iranhaDeploymentExceptionTransformer.java → ...iranhaDeploymentExceptionTransformer.java b/...iranhaDeploymentExceptionTransformer.java → ...iranhaDeploymentExceptionTransformer.java
diff --git a/...ss/weld/tck/piranha/PiranhaExtension.java → ...ss/weld/tck/piranha/PiranhaExtension.java b/...ss/weld/tck/piranha/PiranhaExtension.java → ...ss/weld/tck/piranha/PiranhaExtension.java
diff --git a/...jboss/weld/tck/piranha/WeldBeansImpl.java → ...jboss/weld/tck/piranha/WeldBeansImpl.java b/...jboss/weld/tck/piranha/WeldBeansImpl.java → ...jboss/weld/tck/piranha/WeldBeansImpl.java
diff --git a/...oss/weld/tck/piranha/WeldContextImpl.java → ...oss/weld/tck/piranha/WeldContextImpl.java b/...oss/weld/tck/piranha/WeldContextImpl.java → ...oss/weld/tck/piranha/WeldContextImpl.java
diff --git a/...rg/jboss/weld/tck/piranha/WeldELImpl.java → ...rg/jboss/weld/tck/piranha/WeldELImpl.java b/...rg/jboss/weld/tck/piranha/WeldELImpl.java → ...rg/jboss/weld/tck/piranha/WeldELImpl.java
diff --git a/...est/resources/META-INF/cdi-tck.properties → ...est/resources/META-INF/cdi-tck.properties b/...est/resources/META-INF/cdi-tck.properties → ...est/resources/META-INF/cdi-tck.properties
diff --git a/...oss.arquillian.core.spi.LoadableExtension → ...oss.arquillian.core.spi.LoadableExtension b/...oss.arquillian.core.spi.LoadableExtension → ...oss.arquillian.core.spi.LoadableExtension
diff --git a/...er/core/src/test/resources/arquillian.xml → ...er/core/src/test/resources/arquillian.xml b/...er/core/src/test/resources/arquillian.xml → ...er/core/src/test/resources/arquillian.xml
diff --git a/.../tck/coreprofile/cdi/runner/model/pom.xml → .../coreprofile-tck/cdi/runner/model/pom.xml b/.../tck/coreprofile/cdi/runner/model/pom.xml → .../coreprofile-tck/cdi/runner/model/pom.xml
@@ -18,16 +18,19 @@
 -->
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>cloud.piranha.external.coreprofiletck.cditck.runner</groupId>
+ <artifactId>project</artifactId>
+ <version>24.10.99-SNAPSHOT</version>
+ </parent>
 
- <groupId>cloud.piranha.external.tck.coreprofile</groupId>
- <artifactId>cdi-model</artifactId>
- <version>1-SNAPSHOT</version>
+ <artifactId>lang-model</artifactId>
 
- <name>Piranha Core Profile - Jakarta CDI TCK - Runner - Model</name>
+ <name>Piranha Core Profile - CDI TCK - Runner - Lang Model</name>
  <description>Aggregates dependencies and runs the CDI Lang Model TCK on Piranha</description>
 
  <properties>
- <piranha.version>24.9.0-SNAPSHOT</piranha.version>
+ <piranha.version>${project.version}</piranha.version>
  </properties>
 
  <dependencyManagement>
@@ -86,13 +89,15 @@
  <plugins>
  <plugin>
  <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.13.0</version>
  <configuration>
  <!-- Disable annotation processor for test sources -->
  <testCompilerArgument>-proc:none</testCompilerArgument>
  </configuration>
  </plugin>
  <plugin>
  <artifactId>maven-jar-plugin</artifactId>
+ <version>3.4.2</version>
  <executions>
  <execution>
  <goals>
@@ -113,6 +118,7 @@
 
  <plugin>
  <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.5.0</version>
  <configuration>
  <argLine>-Xmx768m</argLine>
  <forkCount>1</forkCount>
@@ -130,6 +136,7 @@
 
  <plugin>
  <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>3.5.0</version>
  <executions>
  <execution>
  <id>generate-test-report</id>

diff --git a/...cdi/lang/model/CDILangModelTCKRunner.java → ...cdi/lang/model/CDILangModelTCKRunner.java b/...cdi/lang/model/CDILangModelTCKRunner.java → ...cdi/lang/model/CDILangModelTCKRunner.java
diff --git a/...odelVerifierBuildCompatibleExtension.java → ...odelVerifierBuildCompatibleExtension.java b/...odelVerifierBuildCompatibleExtension.java → ...odelVerifierBuildCompatibleExtension.java
diff --git a/external/tck/coreprofile/cdi/runner/pom.xml → external/coreprofile-tck/cdi/runner/pom.xml b/external/tck/coreprofile/cdi/runner/pom.xml → external/coreprofile-tck/cdi/runner/pom.xml
@@ -4,15 +4,16 @@
  <modelVersion>4.0.0</modelVersion>
 
  <parent>
- <groupId>cloud.piranha.external.tck.coreprofile</groupId>
- <artifactId>cdi-tck</artifactId>
+ <groupId>cloud.piranha.external.coreprofiletck.cditck</groupId>
+ <artifactId>project</artifactId>
  <version>24.10.99-SNAPSHOT</version>
  </parent>
 
- <artifactId>runner</artifactId>
+ <groupId>cloud.piranha.external.coreprofiletck.cditck.runner</groupId>
+ <artifactId>project</artifactId>
  <packaging>pom</packaging>
 
- <name>Piranha Core Profile - Jakarta CDI TCK - Runner</name>
+ <name>Piranha Core Profile - CDI TCK - Runner - Project</name>
 
  <modules>
  <module>core</module>

diff --git a/.../coreprofile/cdi/runner/signature/pom.xml → ...eprofile-tck/cdi/runner/signature/pom.xml b/.../coreprofile/cdi/runner/signature/pom.xml → ...eprofile-tck/cdi/runner/signature/pom.xml
@@ -18,16 +18,19 @@
 -->
 <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">
  <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>cloud.piranha.external.coreprofiletck.cditck.runner</groupId>
+ <artifactId>project</artifactId>
+ <version>24.10.99-SNAPSHOT</version>
+ </parent>
 
- <groupId>cloud.piranha.external.tck.coreprofile</groupId>
- <artifactId>cdi-signature</artifactId>
- <version>1-SNAPSHOT</version>
+ <artifactId>signature</artifactId>
 
- <name>Piranha Core Profile - Jakarta CDI TCK - Runner - Model</name>
+ <name>Piranha Core Profile - CDI TCK - Runner - Signature</name>
  <description>Aggregates dependencies and runs the CDI Signature TCK on Piranha</description>
 
  <properties>
- <piranha.version>24.9.0-SNAPSHOT</piranha.version>
+ <piranha.version>${project.version}</piranha.version>
  <piranha.root>${project.build.directory}/piranha</piranha.root>
  </properties>
 

diff --git a/...coreprofile/coreprofile/installer/pom.xml → ...profile-tck/coreprofile/installer/pom.xml b/...coreprofile/coreprofile/installer/pom.xml → ...profile-tck/coreprofile/installer/pom.xml
@@ -2,19 +2,17 @@
 
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
-
- <groupId>cloud.piranha.external.tck.coreprofile</groupId>
- <artifactId>coreprofile.installer</artifactId>
- <version>1-SNAPSHOT</version>
+ <parent>
+ <groupId>cloud.piranha.external.coreprofiletck.coreprofiletck</groupId>
+ <artifactId>project</artifactId>
+ <version>24.10.99-SNAPSHOT</version>
+ </parent>
+ <artifactId>installer</artifactId>
  <packaging>pom</packaging>
-
- <name>Piranha Core Profile - Jakarta Core Profile TCK - Installer</name>
-
+ <name>Piranha Core Profile - Core Profile TCK - Installer</name>
  <properties>
  <tck.home>${project.build.directory}/tck</tck.home>
- <coreprofile.tck.version>10.0.3</coreprofile.tck.version>
  </properties>
-
  <build>
  <plugins>
  <plugin>

diff --git a/external/tck/coreprofile/cdi/pom.xml → external/coreprofile-tck/coreprofile/pom.xml b/external/tck/coreprofile/cdi/pom.xml → external/coreprofile-tck/coreprofile/pom.xml
@@ -4,15 +4,15 @@
  <modelVersion>4.0.0</modelVersion>
 
  <parent>
- <groupId>cloud.piranha.external.tck.coreprofile</groupId>
+ <groupId>cloud.piranha.external.coreprofiletck</groupId>
  <artifactId>project</artifactId>
  <version>24.10.99-SNAPSHOT</version>
  </parent>
-
- <artifactId>cdi-tck</artifactId>
+ <groupId>cloud.piranha.external.coreprofiletck.coreprofiletck</groupId>
+ <artifactId>project</artifactId>
  <packaging>pom</packaging>
 
- <name>Piranha Core Profile - Jakarta CDI TCK</name>
+ <name>Piranha Core Profile - Core Profile TCK - Project</name>
 
  <modules>
  <module>installer</module>

diff --git a/...ck/coreprofile/coreprofile/runner/pom.xml → ...oreprofile-tck/coreprofile/runner/pom.xml b/...ck/coreprofile/coreprofile/runner/pom.xml → ...oreprofile-tck/coreprofile/runner/pom.xml
@@ -4,18 +4,17 @@
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
-
- <groupId>cloud.piranha.external.tck.coreprofile</groupId>
- <artifactId>core-runner</artifactId>
- <version>1-SNAPSHOT</version>
+ <parent>
+ <groupId>cloud.piranha.external.coreprofiletck.coreprofiletck</groupId>
+ <artifactId>project</artifactId>
+ <version>24.10.99-SNAPSHOT</version>
+ </parent>
+ <artifactId>runner</artifactId>
  <packaging>jar</packaging>
-
- <name>Piranha Core Profile - Jakarta Core Profile TCK - Runner</name>
-
+ <name>Piranha Core Profile - Core Profile TCK - Runner</name>
  <properties>
- <piranha.version>24.9.0-SNAPSHOT</piranha.version>
+ <piranha.version>${project.version}</piranha.version>
  </properties>
-
  <dependencyManagement>
  <dependencies>
  <dependency>
@@ -31,9 +30,9 @@
  <dependencies>
  <!-- Run the installer first. Matters when executing in parallel -->
  <dependency>
- <groupId>cloud.piranha.external.tck.coreprofile</groupId>
- <artifactId>coreprofile.installer</artifactId>
- <version>1-SNAPSHOT</version>
+ <groupId>cloud.piranha.external.coreprofiletck.coreprofiletck</groupId>
+ <artifactId>installer</artifactId>
+ <version>${project.version}</version>
  <type>pom</type>
  </dependency>
 

diff --git a/.../runner/src/test/resources/arquillian.xml → .../runner/src/test/resources/arquillian.xml b/.../runner/src/test/resources/arquillian.xml → .../runner/src/test/resources/arquillian.xml
diff --git a/external/tck/coreprofile/jsonb/pom.xml → external/coreprofile-tck/jsonb/pom.xml b/external/tck/coreprofile/jsonb/pom.xml → external/coreprofile-tck/jsonb/pom.xml
@@ -3,13 +3,13 @@
 <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/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <parent>
- <groupId>cloud.piranha.external.tck.coreprofile</groupId>
+ <groupId>cloud.piranha.external.coreprofiletck</groupId>
  <artifactId>project</artifactId>
  <version>24.10.99-SNAPSHOT</version>
  </parent>
  <artifactId>jsonb-tck</artifactId>
  <packaging>pom</packaging>
- <name>Piranha Core Profile - Jakarta JSON Binding TCK</name>
+ <name>Piranha Core Profile - JSON Binding TCK</name>
  <properties>
  <tck.home>${project.build.directory}/tck</tck.home>
  </properties>