This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git
The following commit(s) were added to refs/heads/master by this push:
new 55f3fe38d try to fix arquillian tests; tomee-build-managed works
55f3fe38d is described below
commit 55f3fe38d251e43b219273f3a095ee66cedcf97f
Author: Thomas Andraschko <[email protected]>
AuthorDate: Tue Feb 20 14:21:28 2024 +0100
try to fix arquillian tests; tomee-build-managed works
---
deltaspike/cdictrl/impl-openejb/pom.xml | 4 +-
deltaspike/cdictrl/pom.xml | 12 +-----
.../metadata/AnnotationInstanceProviderTest.java | 2 +-
deltaspike/modules/data/impl/pom.xml | 17 +--------
deltaspike/modules/jsf/impl/pom.xml | 2 +-
deltaspike/parent/code/pom.xml | 43 +++++++++-------------
deltaspike/parent/pom.xml | 13 +++----
deltaspike/test-utils/pom.xml | 2 +-
.../src/main/resources/arquillian-jboss.xml | 32 ----------------
.../test-utils/src/main/resources/arquillian.xml | 11 +-----
site/src/main/asciidoc/steps_for_a_release.adoc | 4 +-
11 files changed, 37 insertions(+), 105 deletions(-)
diff --git a/deltaspike/cdictrl/impl-openejb/pom.xml
b/deltaspike/cdictrl/impl-openejb/pom.xml
index 5ac270af8..31805efdd 100644
--- a/deltaspike/cdictrl/impl-openejb/pom.xml
+++ b/deltaspike/cdictrl/impl-openejb/pom.xml
@@ -98,7 +98,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>openejb-core</artifactId>
- <version>${openejb.version}</version>
+ <version>${tomee.version}</version>
<scope>provided</scope>
</dependency>
@@ -130,7 +130,7 @@
</profile>
<profile>
- <id>tomee10-build-managed</id>
+ <id>tomee-build-managed</id>
<dependencies>
<dependency>
<groupId>org.apache.tomee</groupId>
diff --git a/deltaspike/cdictrl/pom.xml b/deltaspike/cdictrl/pom.xml
index bb3a4625b..5ad0920f2 100644
--- a/deltaspike/cdictrl/pom.xml
+++ b/deltaspike/cdictrl/pom.xml
@@ -121,7 +121,7 @@
</profile>
<profile>
- <id>glassfish-build-managed-3</id>
+ <id>glassfish-build-managed</id>
<modules>
<module>api</module>
<module>impl-weld</module>
@@ -129,15 +129,7 @@
</profile>
<profile>
- <id>glassfish-build-managed-4</id>
- <modules>
- <module>api</module>
- <module>impl-weld</module>
- </modules>
- </profile>
-
- <profile>
- <id>payara-build-managed-4</id>
+ <id>payara-build-managed</id>
<modules>
<module>api</module>
<module>impl-weld</module>
diff --git
a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/util/metadata/AnnotationInstanceProviderTest.java
b/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/util/metadata/AnnotationInstanceProviderTest.java
index 10ff7ee8d..3933cdeee 100644
---
a/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/util/metadata/AnnotationInstanceProviderTest.java
+++
b/deltaspike/core/api/src/test/java/org/apache/deltaspike/test/api/util/metadata/AnnotationInstanceProviderTest.java
@@ -64,7 +64,7 @@ public class AnnotationInstanceProviderTest
@Test
public void assertCorrectAnnotationType()
{
- assertThat(AnnotationInstanceProvider.of(RequestScoped.class),
is(RequestScoped.class));
+
assertThat(AnnotationInstanceProvider.of(RequestScoped.class).annotationType(),
is(RequestScoped.class));
}
@Test
diff --git a/deltaspike/modules/data/impl/pom.xml
b/deltaspike/modules/data/impl/pom.xml
index e83ea9485..f08ff7c88 100755
--- a/deltaspike/modules/data/impl/pom.xml
+++ b/deltaspike/modules/data/impl/pom.xml
@@ -271,7 +271,7 @@
</build>
</profile>
<profile>
- <id>glassfish-build-managed-3</id>
+ <id>glassfish-build-managed</id>
<build>
<testResources>
<testResource>
@@ -284,20 +284,7 @@
</build>
</profile>
<profile>
- <id>glassfish-build-managed-4</id>
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- <testResource>
- <directory>src/test/resources-glassfish</directory>
- </testResource>
- </testResources>
- </build>
- </profile>
- <profile>
- <id>payara-build-managed-4</id>
+ <id>payara-build-managed</id>
<build>
<testResources>
<testResource>
diff --git a/deltaspike/modules/jsf/impl/pom.xml
b/deltaspike/modules/jsf/impl/pom.xml
index 37988c907..0f9e45c5f 100644
--- a/deltaspike/modules/jsf/impl/pom.xml
+++ b/deltaspike/modules/jsf/impl/pom.xml
@@ -176,7 +176,7 @@
<profiles>
<profile>
- <id>tomee10-build-managed</id>
+ <id>tomee-build-managed</id>
<build>
<plugins>
<!--
diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
index 36812ad3a..f4362ae5c 100644
--- a/deltaspike/parent/code/pom.xml
+++ b/deltaspike/parent/code/pom.xml
@@ -36,20 +36,12 @@
<properties>
<container.unpack.directory>${java.io.tmpdir}/deltaspike-arquillian-containers</container.unpack.directory>
- <version.activation>1.1.1</version.activation>
- <version.annotation>1.3.2</version.annotation>
- <bval.artifactId>bval-jsr303</bval.artifactId>
-
<validation.artifactId>geronimo-validation_1.0_spec</validation.artifactId>
- <jboss.as.version>7.1.1.Final</jboss.as.version>
- <wildfly.version>10.1.0.Final</wildfly.version>
- <wildfly.jakarta.version>29.0.1.Final</wildfly.jakarta.version>
+ <wildfly.version>31.0.0.Final</wildfly.version>
<weld.el.api>5.0.0</weld.el.api>
<weld.sfl4j>2.0.11</weld.sfl4j>
<wildfly.arquillian.version>5.0.1.Final</wildfly.arquillian.version>
- <glassfish3.version>3.1.2.2</glassfish3.version>
- <glassfish4.version>4.0</glassfish4.version>
- <payara.version>4.1.2.181</payara.version>
- <wls.version>12.1</wls.version>
+ <payara.version>6.2024.1</payara.version>
+ <tomee.version>10.0.0-M1-SNAPSHOT</tomee.version>
</properties>
@@ -378,7 +370,7 @@
<properties>
<!-- Actual Weld version used with this profile -->
- <weld.version>5.0.1.Final</weld.version>
+ <weld.version>5.1.2.Final</weld.version>
<cdicontainer.version>weld-${weld.version}</cdicontainer.version>
</properties>
@@ -511,13 +503,11 @@
* then use remote debuggig at port 5005
*
-->
- <id>tomee10-build-managed</id>
+ <id>tomee-build-managed</id>
<properties>
- <tomee.version>${tomee10.version}</tomee.version>
- <openejb.version>${tomee10.version}</openejb.version>
- <jakartaeeapi.version>10.0-SNAPSHOT</jakartaeeapi.version>
- <owb.version>4.0.1</owb.version>
+ <jakartaeeapi.version>10.0-M2</jakartaeeapi.version>
+ <owb.version>4.0.2</owb.version>
<cdicontainer.version>tomee-${tomee.version}</cdicontainer.version>
</properties>
@@ -596,7 +586,7 @@
<id>wildfly-managed</id>
<properties>
<!-- Actual default Weld version used with this profile -->
- <weld.version>5.0.1.Final</weld.version>
+ <weld.version>5.1.2.Final</weld.version>
<cdicontainer.version>wildfly-${wildfly.version}</cdicontainer.version>
</properties>
@@ -618,6 +608,7 @@
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet-jakarta</artifactId>
+ <version>${arquillian.version}</version>
<scope>test</scope>
</dependency>
@@ -665,7 +656,7 @@
<properties>
<!-- Actual default Weld version used with this profile -->
- <weld.version>2.3.5.Final</weld.version>
+ <weld.version>5.1.2.Final</weld.version>
<cdicontainer.version>wildfly-${wildfly.version}</cdicontainer.version>
</properties>
@@ -686,7 +677,8 @@
</dependency>
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
- <artifactId>arquillian-protocol-servlet</artifactId>
+
<artifactId>arquillian-protocol-servlet-jakarta</artifactId>
+ <version>${arquillian.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -779,7 +771,8 @@
</dependency>
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
- <artifactId>arquillian-protocol-servlet</artifactId>
+
<artifactId>arquillian-protocol-servlet-jakarta</artifactId>
+ <version>${arquillian.version}</version>
<scope>test</scope>
</dependency>
@@ -854,7 +847,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
-
<arquillian.launch>glassfish-build-managed-4</arquillian.launch>
+
<arquillian.launch>glassfish-build-managed</arquillian.launch>
<org.apache.deltaspike.ProjectStage>UnitTest</org.apache.deltaspike.ProjectStage>
<cdicontainer.version>${cdicontainer.version}</cdicontainer.version>
</systemPropertyVariables>
@@ -876,10 +869,10 @@
* Payara will be downloaded as maven dependency
*
* Start the build with:
- * $> mvn clean install -Ppayara-build-managed-4
+ * $> mvn clean install -Ppayara-build-managed
*
-->
- <id>payara-build-managed-4</id>
+ <id>payara-build-managed</id>
<properties>
<cdicontainer.version>payara-${payara.version}</cdicontainer.version>
@@ -914,7 +907,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
-
<arquillian.launch>glassfish-build-managed-4</arquillian.launch>
+
<arquillian.launch>glassfish-build-managed</arquillian.launch>
<arquillian.glassfish4_home>${container.unpack.directory}/payara41</arquillian.glassfish4_home>
<org.apache.deltaspike.ProjectStage>UnitTest</org.apache.deltaspike.ProjectStage>
<cdicontainer.version>${cdicontainer.version}</cdicontainer.version>
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index f94b0ca7e..1ab5877ef 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -51,22 +51,21 @@
<owb.version>4.0.2</owb.version>
<!-- Weld profiles (in parent/code/pom.xml) override this version -->
- <weld.version>5.0.1.Final</weld.version>
+ <weld.version>5.1.2.Final</weld.version>
<!-- for cdictrl-openejb -->
- <openejb.version>9.1.2</openejb.version>
- <tomee10.version>10.0.0-M1-SNAPSHOT</tomee10.version>
- <tomee.version>${tomee10.version}</tomee.version>
+ <tomee.version>10.0.0-M1-SNAPSHOT</tomee.version>
<tomee-api.version>10.0-M2</tomee-api.version>
+ <openejb.owb.version>${owb.version}</openejb.owb.version>
<openejb.owb.version>${owb.version}</openejb.owb.version>
<!-- testing stuff -->
<junit.version>4.13.2</junit.version>
- <arquillian.version>1.7.1.Final</arquillian.version>
+ <arquillian.version>1.8.0.Final</arquillian.version>
- <!-- JSF-2.0 implementations-->
- <myfaces.version>4.0.1</myfaces.version>
+ <!-- Faces implementations -->
+ <myfaces.version>4.0.2</myfaces.version>
<tomcat.version>10.1.13</tomcat.version>
diff --git a/deltaspike/test-utils/pom.xml b/deltaspike/test-utils/pom.xml
index dbdbc2063..0c3b2ebb6 100644
--- a/deltaspike/test-utils/pom.xml
+++ b/deltaspike/test-utils/pom.xml
@@ -56,7 +56,7 @@
</dependencies>
<properties>
- <shrinkwrap.version>1.0.1</shrinkwrap.version>
+ <shrinkwrap.version>1.2.6</shrinkwrap.version>
</properties>
</project>
diff --git a/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml
b/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml
index 9ae131ec4..e3efe8c39 100644
--- a/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml
+++ b/deltaspike/test-utils/src/main/resources/arquillian-jboss.xml
@@ -30,15 +30,6 @@
<!-- We need to specify this because the default protocol for AS7 and
Wildfly doesn't work very well -->
<defaultProtocol type="Servlet 6.0" />
- <container qualifier="jbossas-managed-7">
- <configuration>
- <property name="javaVmArguments">-client -noverify -Xms64m
-Xmx1024m -XX:MaxPermSize=512m -Dcdicontainer.version=${cdicontainer.version}
${jacoco.agent}</property>
- <property name="outputToConsole">false</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property
name="cdicontainer.version">${cdicontainer.version}</property>
- </configuration>
- </container>
-
<container qualifier="wildfly-managed">
<configuration>
<!-- for debugging add:
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y -->
@@ -49,16 +40,6 @@
</configuration>
</container>
- <container qualifier="jbossas-build-managed-7">
- <configuration>
- <property name="jbossHome">${arquillian.jboss_home}</property>
- <property name="javaVmArguments">-client -noverify -Xms64m
-Xmx1024m -XX:MaxPermSize=512m -Djboss.socket.binding.port-offset=40000
-Dcdicontainer.version=${cdicontainer.version}</property>
- <property name="outputToConsole">false</property>
- <property name="allowConnectingToRunningServer">true</property>
- <property name="managementPort">49999</property>
- </configuration>
- </container>
-
<container qualifier="wildfly-build-managed">
<configuration>
<property name="jbossHome">${arquillian.jboss_home}</property>
@@ -71,19 +52,6 @@
</configuration>
</container>
- <!--Remote profiles
-
- for remote debugging enable "remote socket debugging" - uncomment:
- set "JAVA_OPTS=%JAVA_OPTS%
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
- in
- standalone.conf (standalone.conf.bat)
- and connect to
- port 8787
- -->
- <container qualifier="jbossas-remote-7">
-
- </container>
-
<container qualifier="wildfly-remote">
</container>
diff --git a/deltaspike/test-utils/src/main/resources/arquillian.xml
b/deltaspike/test-utils/src/main/resources/arquillian.xml
index fbd2c10a9..97651a4ad 100644
--- a/deltaspike/test-utils/src/main/resources/arquillian.xml
+++ b/deltaspike/test-utils/src/main/resources/arquillian.xml
@@ -80,16 +80,9 @@
</configuration>
</container>
- <container qualifier="glassfish-build-managed-3">
+ <container qualifier="glassfish-build-managed">
<configuration>
- <property
name="glassFishHome">${arquillian.glassfish3_home}</property>
- <property name="adminPort">34848</property>
- </configuration>
- </container>
-
- <container qualifier="glassfish-build-managed-4">
- <configuration>
- <property
name="glassFishHome">${arquillian.glassfish4_home}</property>
+ <property
name="glassFishHome">${arquillian.glassfish_home}</property>
<property name="adminPort">24848</property>
</configuration>
</container>
diff --git a/site/src/main/asciidoc/steps_for_a_release.adoc
b/site/src/main/asciidoc/steps_for_a_release.adoc
index b5b5b1384..dc8a0e7e5 100644
--- a/site/src/main/asciidoc/steps_for_a_release.adoc
+++ b/site/src/main/asciidoc/steps_for_a_release.adoc
@@ -30,9 +30,9 @@ mvn clean install -POWB
mvn clean install -PWeld1
mvn clean install -Prat
mvn clean install -Ptomee-build-managed
-mvn clean install -Pjbossas-build-managed-7
+mvn clean install -Pjbossas-build-managed
mvn clean install -Pwildfly-build-managed
-mvn clean install -Pglassfish-build-managed-3
+mvn clean install -Pglassfish-build-managed
-----------------------------------------------------------------------------------------------------------------------
deploy a demo app especially with jsf-impl-ee6 to an ee6 server and check the
logs (if there are no optional ee7+ classes)
