Fixes #4414 - Move Annotations TCK to coreprofile-tck module (#4424)

piranhacloud · Dec 22, 2024 · 032e1ef · 032e1ef
1 parent f2109a0
commit 032e1ef
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 217 deletions.
diff --git a/.github/workflows/tck-coreprofile.yml b/.github/workflows/tck-coreprofile.yml
@@ -23,12 +23,12 @@ jobs:
       run: mvn -B -DskipTests=true -ntp install
     - name: Run TCK
       run: |
-        cd external/tck/annotations
+        cd external/coreprofile-tck/annotations
         mvn -B -ntp verify
     - name: Test Summary
       uses: test-summary/action@v2
       with:
-        paths: "external/tck/annotations/runner/target/failsafe-reports/*IT.xml"
+        paths: "external/coreprofile-tck/annotations/runner/target/failsafe-reports/*IT.xml"
       if: always()
   cdi:
     if: github.repository == 'piranhacloud/piranha'

diff --git a/external/tck/annotations/installer/pom.xml b/external/tck/annotations/installer/pom.xml
diff --git a/external/tck/annotations/pom.xml b/external/tck/annotations/pom.xml
diff --git a/external/tck/annotations/runner/pom.xml b/external/tck/annotations/runner/pom.xml
diff --git a/external/tck/cdi/runner/core/pom.xml b/external/tck/cdi/runner/core/pom.xml
@@ -186,6 +186,7 @@
         <dependency>
             <groupId>org.jboss.shrinkwrap.descriptors</groupId>
             <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
+            <version>2.0.0</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/external/tck/pom.xml b/external/tck/pom.xml
@@ -16,7 +16,6 @@
     <name>Piranha - External - TCK - Project</name>
 
     <modules>
-        <module>annotations</module>
         <module>cdi</module>
         <module>coreprofile</module>
         <module>el</module>

diff --git a/external/webprofile-tck/cdi/runner/core/pom.xml b/external/webprofile-tck/cdi/runner/core/pom.xml
@@ -184,6 +184,7 @@
         <dependency>
             <groupId>org.jboss.shrinkwrap.descriptors</groupId>
             <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
+            <version>2.0.0</version>
             <scope>test</scope>
         </dependency>