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 487ba0214 fixed payara-build-managed and try to fix payara-embedded 487ba0214 is described below commit 487ba021469db2636421995cfd4f965d5640dd28 Author: Thomas Andraschko <tandrasc...@apache.org> AuthorDate: Tue Feb 20 14:42:31 2024 +0100 fixed payara-build-managed and try to fix payara-embedded --- deltaspike/parent/code/pom.xml | 53 ++++++++-------------- .../test-utils/src/main/resources/arquillian.xml | 8 ++++ 2 files changed, 28 insertions(+), 33 deletions(-) diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml index f4362ae5c..1aa4510f0 100644 --- a/deltaspike/parent/code/pom.xml +++ b/deltaspike/parent/code/pom.xml @@ -806,37 +806,30 @@ </profile> <profile> - <id>payara-embedded-4</id> + <id>payara-embedded</id> <properties> + <weld.version>5.0.1.Final</weld.version> <cdicontainer.version>payara-${payara.version}</cdicontainer.version> </properties> <dependencies> <dependency> - <groupId>jakarta.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <version>1.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jakarta.inject</groupId> - <artifactId>jakarta.inject</artifactId> - <version>1</version> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-impl</artifactId> + <version>${weld.version}</version> <scope>provided</scope> </dependency> - <dependency> <groupId>fish.payara.extras</groupId> <artifactId>payara-embedded-all</artifactId> <version>${payara.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.jboss.arquillian.container</groupId> - <artifactId>arquillian-glassfish-embedded-3.1</artifactId> - <version>1.0.0.CR4</version> + <groupId>fish.payara.arquillian</groupId> + <artifactId>arquillian-payara-server-embedded</artifactId> + <version>3.0.alpha8</version> <scope>test</scope> </dependency> </dependencies> @@ -875,27 +868,21 @@ <id>payara-build-managed</id> <properties> + <weld.version>5.0.1.Final</weld.version> <cdicontainer.version>payara-${payara.version}</cdicontainer.version> </properties> <dependencies> <dependency> - <groupId>jakarta.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <version>1.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>jakarta.inject</groupId> - <artifactId>jakarta.inject</artifactId> - <version>1</version> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-impl</artifactId> + <version>${weld.version}</version> <scope>provided</scope> </dependency> - <!-- Also works fine with Payara --> <dependency> <groupId>fish.payara.arquillian</groupId> - <artifactId>arquillian-payara-server-4-managed</artifactId> - <version>1.1</version> + <artifactId>arquillian-payara-server-managed</artifactId> + <version>3.0.alpha8</version> <scope>test</scope> </dependency> </dependencies> @@ -907,8 +894,8 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <systemPropertyVariables> - <arquillian.launch>glassfish-build-managed</arquillian.launch> - <arquillian.glassfish4_home>${container.unpack.directory}/payara41</arquillian.glassfish4_home> + <arquillian.launch>payara-build-managed</arquillian.launch> + <arquillian.payara_home>${container.unpack.directory}/payara6</arquillian.payara_home> <org.apache.deltaspike.ProjectStage>UnitTest</org.apache.deltaspike.ProjectStage> <cdicontainer.version>${cdicontainer.version}</cdicontainer.version> </systemPropertyVariables> @@ -963,12 +950,12 @@ <target> <!-- Change all TCP ports from "xxxx" to "2xxxx" --> - <replaceregexp file="${container.unpack.directory}/payara41/glassfish/domains/domain1/config/domain.xml" match="port="(\d{4})"" replace="port="2\1"" flags="g" /> - <replace file="${container.unpack.directory}/payara41/glassfish/domains/domain1/config/domain.xml" token="value="7676"" value="value="27676"" /> + <replaceregexp file="${container.unpack.directory}/payara6/glassfish/domains/domain1/config/domain.xml" match="port="(\d{4})"" replace="port="2\1"" flags="g" /> + <replace file="${container.unpack.directory}/payara6/glassfish/domains/domain1/config/domain.xml" token="value="7676"" value="value="27676"" /> <!-- Replace the default datasource with an in-memory one --> - <replace file="${container.unpack.directory}/payara41/glassfish/domains/domain1/config/domain.xml" token="datasource-classname="org.apache.derby.jdbc.ClientDataSource"" value="datasource-classname="org.apache.derby.jdbc.EmbeddedDataSource"" /> - <replace file="${container.unpack.directory}/payara41/glassfish/domains/domain1/config/domain.xml" token="value="sun-appserv-samples"" value="value="memory:deltaspike"" /> + <replace file="${container.unpack.directory}/payara6/glassfish/domains/domain1/config/domain.xml" token="datasource-classname="org.apache.derby.jdbc.ClientDataSource"" value="datasource-classname="org.apache.derby.jdbc.EmbeddedDataSource"" /> + <replace file="${container.unpack.directory}/payara6/glassfish/domains/domain1/config/domain.xml" token="value="sun-appserv-samples"" value="value="memory:deltaspike"" /> </target> </configuration> diff --git a/deltaspike/test-utils/src/main/resources/arquillian.xml b/deltaspike/test-utils/src/main/resources/arquillian.xml index 97651a4ad..85e409a57 100644 --- a/deltaspike/test-utils/src/main/resources/arquillian.xml +++ b/deltaspike/test-utils/src/main/resources/arquillian.xml @@ -87,4 +87,12 @@ </configuration> </container> + <container qualifier="payara-build-managed"> + <configuration> + <property name="payaraHome">${arquillian.payara_home}</property> + <property name="adminPort">24848</property> + </configuration> + </container> + + </arquillian>