From 5c1ce84aed7c72d80afa960709c72dcea2d27f38 Mon Sep 17 00:00:00 2001 From: Manfred Riem Date: Mon, 19 Aug 2024 20:00:08 -0500 Subject: [PATCH 1/6] First pass for #3847 --- .../tck/coreprofile/cdi/cdi-runner/pom.xml | 116 ++++++++++++++++++ external/tck/coreprofile/cdi/pom.xml | 90 ++++++++++++++ external/tck/coreprofile/pom.xml | 1 + 3 files changed, 207 insertions(+) create mode 100644 external/tck/coreprofile/cdi/cdi-runner/pom.xml create mode 100644 external/tck/coreprofile/cdi/pom.xml diff --git a/external/tck/coreprofile/cdi/cdi-runner/pom.xml b/external/tck/coreprofile/cdi/cdi-runner/pom.xml new file mode 100644 index 0000000000..9f3f5f9e56 --- /dev/null +++ b/external/tck/coreprofile/cdi/cdi-runner/pom.xml @@ -0,0 +1,116 @@ + + + + 4.0.0 + tck + cdi-runner + 1-SNAPSHOT + pom + Piranha - External - TCK - CoreProfile - Jakarta CDI TCK - Runner + + 24.9.0-SNAPSHOT + + + + + org.jboss.arquillian + arquillian-bom + 1.7.0.Alpha10 + test + pom + + + + + + unix + + + unix + + + + se + + + + cloud.piranha.arquillian + piranha-arquillian-jarcontainer + ${piranha.version} + + + org.testng + testng + 6.9.8 + test + + + jakarta.enterprise + cdi-tck-core-impl + 4.0.13 + test + + + jakarta.el + jakarta.el-api + + + jakarta.faces + jakarta.faces-api + + + container-se-api + org.jboss.arquillian.container + + + + + org.jboss.arquillian.protocol + arquillian-protocol-servlet-jakarta + 1.7.0.Alpha10 + test + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.3.1 + + + + test + + + + + cdi-full,se + + jakarta.enterprise:cdi-tck-core-impl + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + 3.3.1 + + + generate-test-report + test + + report-only + + + + + target/surefire-reports + test-report + + + + + + + diff --git a/external/tck/coreprofile/cdi/pom.xml b/external/tck/coreprofile/cdi/pom.xml new file mode 100644 index 0000000000..e87492e350 --- /dev/null +++ b/external/tck/coreprofile/cdi/pom.xml @@ -0,0 +1,90 @@ + + + + 4.0.0 + + cloud.piranha.external.tck.coreprofile + project + 24.9.0-SNAPSHOT + + cloud.piranha.external.tck.coreprofile.cdi + project + pom + Piranha - External - TCK - CoreProfile - Jakarta CDI TCK + + + + cloud.piranha + bom + ${project.version} + pom + import + + + + + + unix + + + unix + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + validate + validate + + run + + + + Executing UNIX profile + + + + + + + + + + + + + + + + + integration-test + integration-test + + run + + + + + + + + + + + + + + + + + diff --git a/external/tck/coreprofile/pom.xml b/external/tck/coreprofile/pom.xml index 1d550e72d2..3e6b3b9dcc 100644 --- a/external/tck/coreprofile/pom.xml +++ b/external/tck/coreprofile/pom.xml @@ -18,6 +18,7 @@ annotations atinject + cdi jsonb jsonp From b8c534534ac473a7276e2f2f216c14e85ed6b324 Mon Sep 17 00:00:00 2001 From: Manfred Riem Date: Tue, 20 Aug 2024 08:04:46 -0500 Subject: [PATCH 2/6] First pass for #3847 --- external/tck/coreprofile/cdi/cdi-runner/pom.xml | 12 ++++++++++++ .../src/test/resources/META-INF/cdi-tck.properties | 5 +++++ 2 files changed, 17 insertions(+) create mode 100644 external/tck/coreprofile/cdi/cdi-runner/src/test/resources/META-INF/cdi-tck.properties diff --git a/external/tck/coreprofile/cdi/cdi-runner/pom.xml b/external/tck/coreprofile/cdi/cdi-runner/pom.xml index 9f3f5f9e56..bef493b4b4 100644 --- a/external/tck/coreprofile/cdi/cdi-runner/pom.xml +++ b/external/tck/coreprofile/cdi/cdi-runner/pom.xml @@ -64,6 +64,18 @@ + + jakarta.enterprise + cdi-tck-web-impl + 4.0.13 + test + + + * + * + + + org.jboss.arquillian.protocol arquillian-protocol-servlet-jakarta diff --git a/external/tck/coreprofile/cdi/cdi-runner/src/test/resources/META-INF/cdi-tck.properties b/external/tck/coreprofile/cdi/cdi-runner/src/test/resources/META-INF/cdi-tck.properties new file mode 100644 index 0000000000..d21e302f18 --- /dev/null +++ b/external/tck/coreprofile/cdi/cdi-runner/src/test/resources/META-INF/cdi-tck.properties @@ -0,0 +1,5 @@ +# CDI TCK configuration - properties also used during in-container test execution +# JNDI JMS +org.jboss.cdi.tck.testJmsConnectionFactory=java:/ConnectionFactory +org.jboss.cdi.tck.testJmsQueue=java:/queue/test +org.jboss.cdi.tck.testJmsTopic=java:/topic/test \ No newline at end of file From ca59b539fcf89978439198c3e005275548fcb069 Mon Sep 17 00:00:00 2001 From: Manfred Riem Date: Tue, 20 Aug 2024 16:22:40 -0500 Subject: [PATCH 3/6] First pass for #3847 --- .../tck/coreprofile/cdi/cdi-runner/pom.xml | 54 ++++++++++++------- .../resources/META-INF/cdi-tck.properties | 5 +- .../src/test/resources/arquillian.xml | 5 ++ 3 files changed, 43 insertions(+), 21 deletions(-) create mode 100644 external/tck/coreprofile/cdi/cdi-runner/src/test/resources/arquillian.xml diff --git a/external/tck/coreprofile/cdi/cdi-runner/pom.xml b/external/tck/coreprofile/cdi/cdi-runner/pom.xml index bef493b4b4..0620c82d35 100644 --- a/external/tck/coreprofile/cdi/cdi-runner/pom.xml +++ b/external/tck/coreprofile/cdi/cdi-runner/pom.xml @@ -5,7 +5,7 @@ tck cdi-runner 1-SNAPSHOT - pom + jar Piranha - External - TCK - CoreProfile - Jakarta CDI TCK - Runner 24.9.0-SNAPSHOT @@ -20,7 +20,7 @@ pom - + unix @@ -29,9 +29,6 @@ unix - - se - cloud.piranha.arquillian @@ -64,18 +61,6 @@ - - jakarta.enterprise - cdi-tck-web-impl - 4.0.13 - test - - - * - * - - - org.jboss.arquillian.protocol arquillian-protocol-servlet-jakarta @@ -83,8 +68,38 @@ test - + + + + org.apache.maven.plugins + maven-jar-plugin + 3.4.2 + + + process-test-classes + + test-jar + + + ${project.build.directory}/dependency/lib + + + false + + + + + + org.apache.maven.plugins maven-surefire-plugin @@ -101,6 +116,9 @@ jakarta.enterprise:cdi-tck-core-impl + + ${project.build.directory}/dependency/lib + diff --git a/external/tck/coreprofile/cdi/cdi-runner/src/test/resources/META-INF/cdi-tck.properties b/external/tck/coreprofile/cdi/cdi-runner/src/test/resources/META-INF/cdi-tck.properties index d21e302f18..b3aba650d2 100644 --- a/external/tck/coreprofile/cdi/cdi-runner/src/test/resources/META-INF/cdi-tck.properties +++ b/external/tck/coreprofile/cdi/cdi-runner/src/test/resources/META-INF/cdi-tck.properties @@ -1,5 +1,4 @@ -# CDI TCK configuration - properties also used during in-container test execution -# JNDI JMS +org.jboss.cdi.tck.testDataSource=jdbc/__default org.jboss.cdi.tck.testJmsConnectionFactory=java:/ConnectionFactory org.jboss.cdi.tck.testJmsQueue=java:/queue/test -org.jboss.cdi.tck.testJmsTopic=java:/topic/test \ No newline at end of file +org.jboss.cdi.tck.testJmsTopic=java:/topic/test diff --git a/external/tck/coreprofile/cdi/cdi-runner/src/test/resources/arquillian.xml b/external/tck/coreprofile/cdi/cdi-runner/src/test/resources/arquillian.xml new file mode 100644 index 0000000000..16507cd026 --- /dev/null +++ b/external/tck/coreprofile/cdi/cdi-runner/src/test/resources/arquillian.xml @@ -0,0 +1,5 @@ + + + + + From 15f51a6e8fb928416d5a696308e299a4bf39fe5d Mon Sep 17 00:00:00 2001 From: Manfred Riem Date: Tue, 20 Aug 2024 17:08:03 -0500 Subject: [PATCH 4/6] Second pass for #3847 --- external/tck/coreprofile/cdi/cdi-runner/pom.xml | 13 +++++++++++-- .../src/test/resources/META-INF/cdi-tck.properties | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/external/tck/coreprofile/cdi/cdi-runner/pom.xml b/external/tck/coreprofile/cdi/cdi-runner/pom.xml index 0620c82d35..7a28bf830e 100644 --- a/external/tck/coreprofile/cdi/cdi-runner/pom.xml +++ b/external/tck/coreprofile/cdi/cdi-runner/pom.xml @@ -111,14 +111,23 @@ - - cdi-full,se + jakarta.enterprise:cdi-tck-core-impl + cdi-full,se + 8 + + + surefire.testng.verbose + 1 + + + false ${project.build.directory}/dependency/lib + true diff --git a/external/tck/coreprofile/cdi/cdi-runner/src/test/resources/META-INF/cdi-tck.properties b/external/tck/coreprofile/cdi/cdi-runner/src/test/resources/META-INF/cdi-tck.properties index b3aba650d2..2a3a900808 100644 --- a/external/tck/coreprofile/cdi/cdi-runner/src/test/resources/META-INF/cdi-tck.properties +++ b/external/tck/coreprofile/cdi/cdi-runner/src/test/resources/META-INF/cdi-tck.properties @@ -1,4 +1,4 @@ -org.jboss.cdi.tck.testDataSource=jdbc/__default +org.jboss.cdi.tck.testDataSource=java:comp/DefaultDataSource org.jboss.cdi.tck.testJmsConnectionFactory=java:/ConnectionFactory org.jboss.cdi.tck.testJmsQueue=java:/queue/test org.jboss.cdi.tck.testJmsTopic=java:/topic/test From 4d38cc48597960b94c7dbfc2d54417b270255e01 Mon Sep 17 00:00:00 2001 From: Manfred Riem Date: Wed, 21 Aug 2024 16:04:30 -0500 Subject: [PATCH 5/6] Third pass for #3847 --- external/tck/coreprofile/cdi/cdi-runner/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/external/tck/coreprofile/cdi/cdi-runner/pom.xml b/external/tck/coreprofile/cdi/cdi-runner/pom.xml index 7a28bf830e..7cd59a5366 100644 --- a/external/tck/coreprofile/cdi/cdi-runner/pom.xml +++ b/external/tck/coreprofile/cdi/cdi-runner/pom.xml @@ -15,7 +15,7 @@ org.jboss.arquillian arquillian-bom - 1.7.0.Alpha10 + 1.8.0.Final test pom @@ -64,7 +64,7 @@ org.jboss.arquillian.protocol arquillian-protocol-servlet-jakarta - 1.7.0.Alpha10 + 1.8.0.Final test @@ -116,7 +116,7 @@ jakarta.enterprise:cdi-tck-core-impl cdi-full,se - 8 + 16 surefire.testng.verbose From 48fa07cf926444bad83438e8fdb754c429a66433 Mon Sep 17 00:00:00 2001 From: Manfred Riem Date: Wed, 28 Aug 2024 17:36:25 -0500 Subject: [PATCH 6/6] Fixes #3859 - Setup GitHub workflow to Core Profile TCK (#3865) --- .github/workflows/tck-core-profile.yml | 21 +++++++++++++++++++++ docs/pom.xml | 8 ++++++++ 2 files changed, 29 insertions(+) diff --git a/.github/workflows/tck-core-profile.yml b/.github/workflows/tck-core-profile.yml index 87458f8bdb..fab2446a87 100644 --- a/.github/workflows/tck-core-profile.yml +++ b/.github/workflows/tck-core-profile.yml @@ -46,6 +46,27 @@ jobs: run: | cd external/tck/coreprofile/atinject mvn -B -ntp verify + cdi: + runs-on: ${{ matrix.os }} + strategy: + matrix: + java: [ '21' ] + os: [ubuntu-latest] + steps: + - name: Checkout Sources + uses: actions/checkout@v3 + - name: Set up Java ${{ matrix.java }} + uses: actions/setup-java@v3 + with: + cache: 'maven' + distribution: 'temurin' + java-version: ${{ matrix.java }} + - name: Setup for TCK + run: mvn -B -DskipTests=true -ntp install + - name: Run TCK + run: | + cd external/tck/coreprofile/cdi + mvn -B -ntp verify jsonb: runs-on: ${{ matrix.os }} strategy: diff --git a/docs/pom.xml b/docs/pom.xml index f9e383e97d..db1c2e2c79 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -19,6 +19,14 @@ maven-site-plugin 3.20.0 + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.3 + + true + +