Merge branch 'arquillian:master' into JUnit5LifecycleIntegrationTest

arquillian · Jul 2, 2024 · 4e62a49 · 4e62a49
2 parents e9268d0 + 36c0a77
commit 4e62a49
Show file tree

Hide file tree

Showing 410 changed files with 1,189 additions and 10,633 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,72 @@
+name: Java CI with Maven
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+
+  arquillian-build-jdk8:
+    name: Integration - JDK 8
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    outputs:
+      SNAPSHOT_VERSION: ${{ steps.arq-version.outputs.SNAPSHOT_VERSION }}
+    steps:
+      - name: Checkout arquillian-core
+        uses: actions/checkout@v4
+      - name: Setup JDK 8
+        uses: actions/setup-java@v4
+        with:
+          java-version: 8
+          distribution: temurin
+          cache: maven
+      - name: Build with Maven
+        run: mvn --batch-mode --no-transfer-progress clean verify
+      - name: Version save
+        id: arq-version
+        run: |
+          VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
+          echo "SNAPSHOT_VERSION=$VERSION" >> $GITHUB_OUTPUT        
+          echo "Arquillian version: $VERSION"
+      - name: Artifact upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: arquillian
+          path: ~/.m2/repository/org/jboss/
+
+  arquillian-build-jdk11:
+    name: Integration - JDK 11
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - name: Build with Maven
+        uses: actions/checkout@v4
+      - name: Setup JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: 11
+          distribution: temurin
+          cache: maven
+      - name: Build with Maven
+        run: mvn --batch-mode --no-transfer-progress clean verify
+
+  arquillian-build-jdk17:
+    name: Integration - JDK 17
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - name: Build with Maven
+        uses: actions/checkout@v4
+      - name: Setup JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: maven
+      - name: Build with Maven
+        run: mvn --batch-mode --no-transfer-progress clean verify
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -3,7 +3,7 @@
   <extension>
     <groupId>io.takari.maven</groupId>
     <artifactId>takari-smart-builder</artifactId>
-    <version>0.6.2</version>
+    <version>0.6.4</version>
   </extension>
   <extension>
     <groupId>io.takari.aether</groupId>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -7,7 +7,7 @@
   <!-- Artifact Information -->
   <groupId>org.jboss.arquillian</groupId>
   <artifactId>arquillian-bom</artifactId>
-  <version>1.7.1.Final-SNAPSHOT</version>
+  <version>1.8.2.Final-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Arquillian BOM</name>
   <url>http://arquillian.org</url>
@@ -45,7 +45,7 @@
 
     <version.shrinkwrap_core>1.2.6</version.shrinkwrap_core>
     <version.shrinkwrap_descriptors>2.0.0</version.shrinkwrap_descriptors>
-    <version.shrinkwrap_resolver>3.1.4</version.shrinkwrap_resolver>
+    <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/
@@ -190,21 +190,11 @@
         <artifactId>arquillian-protocol-servlet</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.jboss.arquillian.protocol</groupId>
-        <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.jboss.arquillian.protocol</groupId>
         <artifactId>arquillian-protocol-jmx</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.jboss.arquillian.protocol</groupId>
-        <artifactId>arquillian-protocol-rest-jakarta</artifactId>
-        <version>${project.version}</version>
-      </dependency>
 
       <!-- Enrichers -->
       <dependency>
@@ -227,21 +217,6 @@
         <artifactId>arquillian-testenricher-initialcontext</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.jboss.arquillian.testenricher</groupId>
-        <artifactId>arquillian-testenricher-cdi-jakarta</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jboss.arquillian.testenricher</groupId>
-        <artifactId>arquillian-testenricher-ejb-jakarta</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jboss.arquillian.testenricher</groupId>
-        <artifactId>arquillian-testenricher-resource-jakarta</artifactId>
-        <version>${project.version}</version>
-      </dependency>
 
       <!-- ShrinkWrap -->
       <dependency>

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.7.1.Final-SNAPSHOT</version>
+    <version>1.8.2.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.9.3</version.junit5.platform>
-    <version.junit5>5.9.3</version.junit5>
+    <version.junit5.platform>1.10.1</version.junit5.platform>
+    <version.junit5>5.10.2</version.junit5>
     <version.mockito>4.10.0</version.mockito>
     <version.testng>7.5</version.testng>
     <version.assertj>3.24.2</version.assertj>
@@ -67,6 +67,11 @@
         <artifactId>junit-jupiter-api</artifactId>
         <version>${version.junit5}</version>
       </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-params</artifactId>
+        <version>${version.junit5}</version>
+      </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-engine</artifactId>

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.7.1.Final-SNAPSHOT</version>
+    <version>1.8.2.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/config/api/src/main/java/org/jboss/arquillian/config/descriptor/api/EngineDef.java b/config/api/src/main/java/org/jboss/arquillian/config/descriptor/api/EngineDef.java
@@ -10,7 +10,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.

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.7.1.Final-SNAPSHOT</version>
+    <version>1.8.2.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
 

diff --git a/...ig/impl-base/src/main/java/org/jboss/arquillian/config/descriptor/impl/EngineDefImpl.java b/...ig/impl-base/src/main/java/org/jboss/arquillian/config/descriptor/impl/EngineDefImpl.java
@@ -10,7 +10,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.

diff --git a/...e/src/main/java/org/jboss/arquillian/config/impl/extension/ClasspathPropertyResolver.java b/...e/src/main/java/org/jboss/arquillian/config/impl/extension/ClasspathPropertyResolver.java
@@ -5,7 +5,7 @@
 
 class ClasspathPropertyResolver implements PropertyResolver {
 
-    private final static Logger logger = Logger.getLogger(ClasspathConfigurationPlaceholderResolver.class.getName());
+    private static final Logger logger = Logger.getLogger(ClasspathConfigurationPlaceholderResolver.class.getName());
 
     /**
      * Classpath base property

diff --git a/...g/impl-base/src/main/java/org/jboss/arquillian/config/impl/extension/ConfigExtension.java b/...g/impl-base/src/main/java/org/jboss/arquillian/config/impl/extension/ConfigExtension.java
@@ -10,7 +10,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.

diff --git a/...base/src/main/java/org/jboss/arquillian/config/impl/extension/ConfigurationRegistrar.java b/...base/src/main/java/org/jboss/arquillian/config/impl/extension/ConfigurationRegistrar.java
@@ -17,7 +17,6 @@
 package org.jboss.arquillian.config.impl.extension;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;

diff --git a/config/impl-base/src/main/java/org/jboss/arquillian/config/impl/extension/FileUtils.java b/config/impl-base/src/main/java/org/jboss/arquillian/config/impl/extension/FileUtils.java
@@ -95,7 +95,7 @@ static class FileName {
         private String name;
         private boolean isDefault;
 
-        public FileName(String name, boolean isDefault) {
+        FileName(String name, boolean isDefault) {
             this.name = name;
             this.isDefault = isDefault;
         }
@@ -108,4 +108,4 @@ public boolean isDefault() {
             return isDefault;
         }
     }
-}
+}
diff --git a/.../impl-base/src/main/java/org/jboss/arquillian/config/impl/extension/PropertiesParser.java b/.../impl-base/src/main/java/org/jboss/arquillian/config/impl/extension/PropertiesParser.java
@@ -229,7 +229,7 @@ protected void handle(Matcher matcher, String value, ArquillianDescriptor descri
     }
 
     private class Extension extends Handler {
-        public Extension(String expression) {
+        Extension(String expression) {
             super(expression);
         }
 
@@ -249,7 +249,7 @@ protected void handle(Matcher matcher, String value, ArquillianDescriptor descri
     }
 
     private class Container extends Handler {
-        public Container(String expression) {
+        Container(String expression) {
             super(expression);
         }
 

diff --git a/...base/src/main/java/org/jboss/arquillian/config/impl/extension/StringPropertyReplacer.java b/...base/src/main/java/org/jboss/arquillian/config/impl/extension/StringPropertyReplacer.java
@@ -153,8 +153,7 @@ else if (c == '}' && state == IN_BRACKET) {
                 // No content
                 if (start + 2 == i) {
                     buffer.append("${}"); // REVIEW: Correct?
-                } else // Collect the system property
-                {
+                } else { // Collect the system property
                     String value;
 
                     String key = string.substring(start + 2, i);

diff --git a/...c/test/java/org/jboss/arquillian/config/descriptor/impl/ArquillianDescriptorTestCase.java b/...c/test/java/org/jboss/arquillian/config/descriptor/impl/ArquillianDescriptorTestCase.java
@@ -506,7 +506,7 @@ private ArquillianDescriptor create() {
     private ArquillianDescriptor create(String xml) throws Exception {
         validateXML(desc);
 
-        return Descriptors.importAs(ArquillianDescriptor.class).from(xml);
+        return Descriptors.importAs(ArquillianDescriptor.class).fromString(xml);
     }
 
     private void validateXML(String xml) throws Exception {

diff --git a/...va/org/jboss/arquillian/config/impl/extension/ArquillianDescriptorPropertiesTestCase.java b/...va/org/jboss/arquillian/config/impl/extension/ArquillianDescriptorPropertiesTestCase.java
@@ -532,7 +532,7 @@ private ArquillianDescriptor create() {
     private ArquillianDescriptor create(String xml) throws Exception {
         validateXML(desc.exportAsString());
 
-        return Descriptors.importAs(ArquillianDescriptor.class).from(xml);
+        return Descriptors.importAs(ArquillianDescriptor.class).fromString(xml);
     }
 
     private void validateXML(String xml) throws Exception {

diff --git a/...se/src/test/java/org/jboss/arquillian/config/impl/extension/PropertiesParserTestCase.java b/...se/src/test/java/org/jboss/arquillian/config/impl/extension/PropertiesParserTestCase.java
@@ -468,6 +468,16 @@ public String get() {
         });
     }
 
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowExceptionIfDescriptorIsNull() {
+        new PropertiesParser().addProperties(null, System.getProperties());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void shouldThrowExceptionIfPropertiesIsNull() {
+        new PropertiesParser().addProperties(desc, null);
+    }
+
     private void validate(String property, String value, ValueCallback callback) {
         validate(property, value, value, callback);
     }

diff --git a/...t/java/org/jboss/arquillian/config/impl/extension/SyspropReplacementInArqXmlTestCase.java b/...t/java/org/jboss/arquillian/config/impl/extension/SyspropReplacementInArqXmlTestCase.java
@@ -16,29 +16,10 @@
  */
 package org.jboss.arquillian.config.impl.extension;
 
-import java.util.Arrays;
-import java.util.List;
-import org.jboss.arquillian.config.descriptor.api.ArquillianDescriptor;
 import org.jboss.arquillian.config.descriptor.impl.AssertXPath;
-import org.jboss.arquillian.config.spi.ConfigurationPlaceholderResolver;
-import org.jboss.arquillian.core.api.Instance;
-import org.jboss.arquillian.core.api.annotation.Inject;
-import org.jboss.arquillian.core.spi.Manager;
-import org.jboss.arquillian.core.spi.ServiceLoader;
-import org.jboss.arquillian.core.spi.context.Context;
-import org.jboss.arquillian.core.test.AbstractManagerTestBase;
-import org.jboss.arquillian.test.impl.context.SuiteContextImpl;
-import org.jboss.arquillian.test.spi.annotation.SuiteScoped;
-import org.jboss.arquillian.test.spi.context.ClassContext;
-import org.jboss.arquillian.test.spi.context.SuiteContext;
-import org.jboss.arquillian.test.spi.context.TestContext;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
 
 /**
  * Test Cases to ensure that the arquillian.xml loaded by

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.7.1.Final-SNAPSHOT</version>
+    <version>1.8.2.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.7.1.Final-SNAPSHOT</version>
+    <version>1.8.2.Final-SNAPSHOT</version>
     <relativePath>../../build/pom.xml</relativePath>
   </parent>