Merge branch 'master' into customthreadlocal

arquillian · Jul 23, 2024 · 72d5a30 · 72d5a30
2 parents 0260ab2 + 305702f
commit 72d5a30
Show file tree

Hide file tree

Showing 80 changed files with 2,251 additions and 218 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ name: Java CI with Maven
 on:
   push:
     branches:
-      - '*'
+      - main
   pull_request:
     branches:
       - '*'
@@ -70,3 +70,19 @@ jobs:
           cache: maven
       - name: Build with Maven
         run: mvn --batch-mode --no-transfer-progress clean verify
+
+  arquillian-build-jdk21:
+    name: Integration - JDK 21
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - name: Build with Maven
+        uses: actions/checkout@v4
+      - name: Setup JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
+          cache: maven
+      - name: Build with Maven
+        run: mvn --batch-mode --no-transfer-progress clean verify
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -0,0 +1,84 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
+
+name: Arquillian Integration Tests
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - '**'
+  schedule:
+    - cron: '0 0 * * *' # Every day at 00:00 UTC
+
+# Only run the latest job
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+jobs:
+  wildfly-integration:
+    name: 'WildFly Integration Tests'
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 90
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest ]
+        java: ['11', '17', '21']
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'temurin'
+          cache: 'maven'
+      - name: Build with Maven Java ${{ matrix.java }} - ${{ matrix.os }}
+        run:  |
+          ./mvnw -V clean install -U -B -fae '-Pwildfly' '-T1' '-Pintegration-tests'
+      - uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}
+          path: '**/surefire-reports/*'
+      - uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: server-logs-${{ matrix.os }}-${{ matrix.java }}
+          path: '**/server.log'
+
+  payara-integration:
+    name: 'Payara Integration Tests'
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 90
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest ]
+        java: ['11', '17', '21']
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'temurin'
+          cache: 'maven'
+      - name: Build with Maven Java ${{ matrix.java }} - ${{ matrix.os }}
+        run:  |
+          ./mvnw -V clean install -U -B -fae '-Ppayara' '-T1' '-Pintegration-tests'
+      - uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}
+          path: '**/surefire-reports/*'
+      - uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: server-logs-${{ matrix.os }}-${{ matrix.java }}
+          path: '**/server.log'
diff --git a/.github/workflows/maven-jboss-snapshot-publish.yml b/.github/workflows/maven-jboss-snapshot-publish.yml
@@ -40,5 +40,5 @@ jobs:
       run: mvn -B package --file pom.xml
 
     - name: Publish to JBoss Nexus Maven Snapshot Repo
-      run: mvn -s .github/settings.xml deploy -Prelease
+      run: mvn -s .github/settings.xml deploy -Prelease -DskipItTests=true
 
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -7,15 +7,15 @@
   <!-- Artifact Information -->
   <groupId>org.jboss.arquillian</groupId>
   <artifactId>arquillian-bom</artifactId>
-  <version>1.8.2.Final-SNAPSHOT</version>
+  <version>1.9.1.Final-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Arquillian BOM</name>
   <url>http://arquillian.org</url>
-  <description>Arquillian Bill Of Material</description>
+  <description>Arquillian Bill Of Materials</description>
 
   <issueManagement>
     <system>jira</system>
-    <url>http://jira.jboss.com/jira/browse/ARQ</url>
+    <url>https://issues.redhat.com/browse/ARQ</url>
   </issueManagement>
 
   <licenses>
@@ -42,18 +42,10 @@
   </developers>
 
   <properties>
-
-    <version.shrinkwrap_core>1.2.6</version.shrinkwrap_core>
-    <version.shrinkwrap_descriptors>2.0.0</version.shrinkwrap_descriptors>
-    <version.shrinkwrap_resolver>3.3.0</version.shrinkwrap_resolver>
-
     <jboss.releases.repo.id>jboss-releases-repository</jboss.releases.repo.id>
-    <jboss.releases.repo.url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/
-    </jboss.releases.repo.url>
+    <jboss.releases.repo.url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</jboss.releases.repo.url>
     <jboss.snapshots.repo.id>jboss-snapshots-repository</jboss.snapshots.repo.id>
-    <jboss.snapshots.repo.url>https://repository.jboss.org/nexus/content/repositories/snapshots/
-    </jboss.snapshots.repo.url>
-
+    <jboss.snapshots.repo.url>https://repository.jboss.org/nexus/content/repositories/snapshots/</jboss.snapshots.repo.url>
   </properties>
 
   <dependencyManagement>
@@ -218,33 +210,6 @@
         <version>${project.version}</version>
       </dependency>
 
-      <!-- ShrinkWrap -->
-      <dependency>
-        <groupId>org.jboss.shrinkwrap</groupId>
-        <artifactId>shrinkwrap-bom</artifactId>
-        <version>${version.shrinkwrap_core}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-
-      <!-- ShrinkWrap Resolver -->
-      <dependency>
-        <groupId>org.jboss.shrinkwrap.resolver</groupId>
-        <artifactId>shrinkwrap-resolver-bom</artifactId>
-        <version>${version.shrinkwrap_resolver}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-
-      <!-- ShrinkWrap Descriptors -->
-      <dependency>
-        <groupId>org.jboss.shrinkwrap.descriptors</groupId>
-        <artifactId>shrinkwrap-descriptors-bom</artifactId>
-        <version>${version.shrinkwrap_descriptors}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-
     </dependencies>
   </dependencyManagement>
 

diff --git a/build/pom.xml b/build/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-parent</artifactId>
-    <version>1.8.2.Final-SNAPSHOT</version>
+    <version>1.9.1.Final-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -25,8 +25,8 @@
     <!-- Arquillian Core common Deps, Test related -->
     <version.javax.inject>1</version.javax.inject>
     <version.junit>4.13.2</version.junit>
-    <version.junit5.platform>1.10.1</version.junit5.platform>
-    <version.junit5>5.10.2</version.junit5>
+    <version.junit5.platform>1.10.3</version.junit5.platform>
+    <version.junit5>5.10.3</version.junit5>
     <version.mockito>4.10.0</version.mockito>
     <version.testng>7.5</version.testng>
     <version.assertj>3.24.2</version.assertj>

diff --git a/config/api/pom.xml b/config/api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-build</artifactId>
-    <version>1.8.2.Final-SNAPSHOT</version>
+    <version>1.9.1.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/config/impl-base/pom.xml b/config/impl-base/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-build</artifactId>
-    <version>1.8.2.Final-SNAPSHOT</version>
+    <version>1.9.1.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/config/pom.xml b/config/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-parent</artifactId>
-    <version>1.8.2.Final-SNAPSHOT</version>
+    <version>1.9.1.Final-SNAPSHOT</version>
   </parent>
 
   <!-- Model Information -->

diff --git a/config/spi/pom.xml b/config/spi/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-build</artifactId>
-    <version>1.8.2.Final-SNAPSHOT</version>
+    <version>1.9.1.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/container/impl-base/pom.xml b/container/impl-base/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-build</artifactId>
-    <version>1.8.2.Final-SNAPSHOT</version>
+    <version>1.9.1.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/container/pom.xml b/container/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-parent</artifactId>
-    <version>1.8.2.Final-SNAPSHOT</version>
+    <version>1.9.1.Final-SNAPSHOT</version>
   </parent>
 
   <!-- Model Information -->

diff --git a/container/spi/pom.xml b/container/spi/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-build</artifactId>
-    <version>1.8.2.Final-SNAPSHOT</version>
+    <version>1.9.1.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/container/test-api/pom.xml b/container/test-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-build</artifactId>
-    <version>1.8.2.Final-SNAPSHOT</version>
+    <version>1.9.1.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/container/test-api/src/main/java/org/jboss/arquillian/container/test/api/Deployment.java b/container/test-api/src/main/java/org/jboss/arquillian/container/test/api/Deployment.java
@@ -78,6 +78,9 @@
 
     /**
      * Defines if this deployment should be wrapped up based on the protocol so the testcase can be executed incontainer.
+     * <p>
+     * Setting this to {@code false} for a deployment used in {@link RunAsClient} tests allows you to avoid needing to
+     * package client-side test resources in the deployment.
      */
     boolean testable() default true;
 }
diff --git a/...r/test-api/src/main/java/org/jboss/arquillian/container/test/api/OperateOnDeployment.java b/...r/test-api/src/main/java/org/jboss/arquillian/container/test/api/OperateOnDeployment.java
@@ -46,10 +46,10 @@
  *          .addClass(MyServletY.class);
  * }
  *
- * &#64;Test &#64;OperatesOnDeployment("X")
+ * &#64;Test &#64;OperateOnDeployment("X")
  * public void shouldExecuteInX() { ... }
  *
- * &#64;Test &#64;OperatesOnDeployment("Y")
+ * &#64;Test &#64;OperateOnDeployment("Y")
  * public void shouldExecuteInY() { ... }
  * </code></pre>
  * <p>
@@ -70,10 +70,10 @@
  *          .addClass(MyServletY.class);
  * }
  *
- * &#64;Test &#64;OperatesOnDeployment("X")
+ * &#64;Test &#64;OperateOnDeployment("X")
  * public void shouldExecuteInX() { ... }
  *
- * &#64;Test &#64;OperatesOnDeployment("Y") &#64;RunAsClient
+ * &#64;Test &#64;OperateOnDeployment("Y") &#64;RunAsClient
  * public void shouldExecuteInY(&#64;ArquillianResource &#64;OperateOnDeployment("X") URL deploymentXURLContext) { ... }
  * </code></pre>
  *

diff --git a/container/test-impl-base/pom.xml b/container/test-impl-base/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss.arquillian</groupId>
     <artifactId>arquillian-build</artifactId>
-    <version>1.8.2.Final-SNAPSHOT</version>
+    <version>1.9.1.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/...l-base/src/main/java/org/jboss/arquillian/container/test/impl/ContainerTestExtension.java b/...l-base/src/main/java/org/jboss/arquillian/container/test/impl/ContainerTestExtension.java
@@ -90,6 +90,7 @@ public void register(ExtensionBuilder builder) {
         builder.observer(ContainerEventController.class)
             .observer(ContainerRestarter.class)
             .observer(DeploymentGenerator.class)
+            .observer(AnnotationDeploymentScenarioGenerator.class)
             .observer(ArchiveDeploymentToolingExporter.class)
             .observer(ProtocolRegistryCreator.class)
             .observer(ClientContainerControllerCreator.class)

diff --git a/...c/main/java/org/jboss/arquillian/container/test/impl/client/ContainerEventController.java b/...c/main/java/org/jboss/arquillian/container/test/impl/client/ContainerEventController.java
@@ -132,7 +132,7 @@ private void createContext(EventContext<? extends TestEvent> context) {
     }
 
    /*
-    * Internal Helpers needed to extract @OperatesOnDeployment from TestMethod.
+    * Internal Helpers needed to extract @OperateOnDeployment from TestMethod.
     *
     * TODO: This should not rely on direct Reflection, but rather access the metadata through some
     * common metadata layer.