This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits 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 ab2dbbdd1 DELTASPIKE-1366 fix setup for Weld and Wildfly
ab2dbbdd1 is described below
commit ab2dbbdd1201362a49ce3f244d4db6acb8c88551
Author: Mark Struberg <[email protected]>
AuthorDate: Tue May 12 08:47:49 2026 +0200
DELTASPIKE-1366 fix setup for Weld and Wildfly
---
buildall.sh | 5 ++---
.../apache-deltaspike_test-container.properties | 24 ++++++++++++++++++++
.../impl/src/main/resources/META-INF/beans.xml | 26 ++++++++++++++++++++++
.../jakarta.enterprise.inject.spi.Extension | 20 +++++++++++++++++
...deltaspike.testcontrol.spi.TestControlValidator | 20 +++++++++++++++++
...ache.deltaspike.testcontrol.spi.mock.MockFilter | 20 +++++++++++++++++
deltaspike/parent/pom.xml | 6 ++---
7 files changed, 115 insertions(+), 6 deletions(-)
diff --git a/buildall.sh b/buildall.sh
index 06cdb1cad..54132724d 100755
--- a/buildall.sh
+++ b/buildall.sh
@@ -30,11 +30,10 @@ rm mvn-*log
# works fine with Java11
mvn clean install -POWB | tee mvn-owb4.0.3.log
-mvn clean install -Ptomee-build-managed -Dtomee.version=10.0.0-M1 | tee
mvn-tomee10.0.0-M1.log
-mvn clean install -PWeld -Dweld.version=5.1.2.Final | tee mvn-weld5.1.2.log
+mvn clean install -PWeld -Dweld.version=5.1.7.Final | tee mvn-weld5.1.7.log
# requires Java 17
-mvn clean install -Ptomee-build-managed -Dtomee.version=10.1.0 | tee
mvn-tomee10.1.0.log
+mvn clean install -Ptomee-build-managed -Dtomee.version=10.1.5 | tee
mvn-tomee10.1.5.log
mvn clean install -Pwildfly-build-managed -Pwildfly.version=31.0.0.Final | tee
mvn-wildfly-31.0.0.log
# and now for the result check
diff --git
a/deltaspike/modules/test-control5/impl/src/main/resources/META-INF/apache-deltaspike_test-container.properties
b/deltaspike/modules/test-control5/impl/src/main/resources/META-INF/apache-deltaspike_test-container.properties
new file mode 100644
index 000000000..2ffae6213
--- /dev/null
+++
b/deltaspike/modules/test-control5/impl/src/main/resources/META-INF/apache-deltaspike_test-container.properties
@@ -0,0 +1,24 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. 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, 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.
+#
+
+
+#can be used to configure the underlying test-container
+#(currently the only container supported by deltaspike
+#(out-of-the-box) which supports that config is openejb-embedded)
+
diff --git
a/deltaspike/modules/test-control5/impl/src/main/resources/META-INF/beans.xml
b/deltaspike/modules/test-control5/impl/src/main/resources/META-INF/beans.xml
new file mode 100644
index 000000000..906d19fdb
--- /dev/null
+++
b/deltaspike/modules/test-control5/impl/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. 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, 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.
+ -->
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd";
+ version="3.0" bean-discovery-mode="all">
+ <trim/>
+
+</beans>
diff --git
a/deltaspike/modules/test-control5/impl/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
b/deltaspike/modules/test-control5/impl/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
new file mode 100644
index 000000000..05cd352fa
--- /dev/null
+++
b/deltaspike/modules/test-control5/impl/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
@@ -0,0 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. 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, 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.
+#
+
+org.apache.deltaspike.testcontrol5.impl.mock.MockExtension
\ No newline at end of file
diff --git
a/deltaspike/modules/test-control5/impl/src/main/resources/META-INF/services/org.apache.deltaspike.testcontrol.spi.TestControlValidator
b/deltaspike/modules/test-control5/impl/src/main/resources/META-INF/services/org.apache.deltaspike.testcontrol.spi.TestControlValidator
new file mode 100644
index 000000000..715012f85
--- /dev/null
+++
b/deltaspike/modules/test-control5/impl/src/main/resources/META-INF/services/org.apache.deltaspike.testcontrol.spi.TestControlValidator
@@ -0,0 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. 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, 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.
+#
+
+org.apache.deltaspike.testcontrol5.impl.validation.StandardContextTestControlValidator
\ No newline at end of file
diff --git
a/deltaspike/modules/test-control5/impl/src/main/resources/META-INF/services/org.apache.deltaspike.testcontrol.spi.mock.MockFilter
b/deltaspike/modules/test-control5/impl/src/main/resources/META-INF/services/org.apache.deltaspike.testcontrol.spi.mock.MockFilter
new file mode 100644
index 000000000..be5bfb0fe
--- /dev/null
+++
b/deltaspike/modules/test-control5/impl/src/main/resources/META-INF/services/org.apache.deltaspike.testcontrol.spi.mock.MockFilter
@@ -0,0 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. 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, 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.
+#
+
+org.apache.deltaspike.testcontrol5.impl.mock.DefaultMockFilter
\ No newline at end of file
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index dacdfe688..48c2400d3 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -51,11 +51,11 @@
<owb.version>4.0.3</owb.version>
<!-- Weld profiles (in parent/code/pom.xml) override this version -->
- <weld.version>5.1.2.Final</weld.version>
+ <weld.version>5.1.7.Final</weld.version>
<!-- for cdictrl-openejb -->
- <tomee.version>10.0.0-M1</tomee.version>
- <tomee-api.version>10.0</tomee-api.version>
+ <tomee.version>10.1.5</tomee.version>
+ <tomee-api.version>10.0.1</tomee-api.version>
<openejb.owb.version>${owb.version}</openejb.owb.version>
<openejb.owb.version>${owb.version}</openejb.owb.version>
