This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch concurency in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 6b87dd2f369ae730743ae3156f5bc89be3719f75 Author: Richard Zowalla <[email protected]> AuthorDate: Wed Apr 1 21:01:44 2026 +0200 Setup Concurrency TCK --- tck/concurrency-signature-test/pom.xml | 20 +++--- .../src/test/resources/arquillian.xml | 1 - tck/concurrency-standalone/dev.xml | 28 -------- tck/concurrency-standalone/pom.xml | 78 ++++++++++++---------- .../src/test/resources/arquillian.xml | 32 ++------- .../src/test/resources/logging.properties | 21 ++++++ tck/concurrency-standalone/suite-web.xml | 36 ---------- tck/concurrency-standalone/suite.xml | 36 ---------- 8 files changed, 78 insertions(+), 174 deletions(-) diff --git a/tck/concurrency-signature-test/pom.xml b/tck/concurrency-signature-test/pom.xml index bd686f7806..e86f99982b 100644 --- a/tck/concurrency-signature-test/pom.xml +++ b/tck/concurrency-signature-test/pom.xml @@ -27,7 +27,8 @@ <name>TomEE :: TCK :: Concurrency Signature Tests</name> <properties> - <jakarta.concurrent.version>3.0.4</jakarta.concurrent.version> + <jakarta.concurrent.tck.version>3.1.1</jakarta.concurrent.tck.version> + <jakarta.concurrent.api.version>3.1.0</jakarta.concurrent.api.version> <sigtest.version>2.3</sigtest.version> </properties> @@ -35,7 +36,7 @@ <dependency> <groupId>jakarta.enterprise.concurrent</groupId> <artifactId>jakarta.enterprise.concurrent-tck</artifactId> - <version>${jakarta.concurrent.version}</version> + <version>${jakarta.concurrent.tck.version}</version> <scope>test</scope> </dependency> <dependency> @@ -44,9 +45,12 @@ <version>${sigtest.version}</version> <scope>provided</scope> </dependency> + <!-- JUnit 5 --> <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -58,10 +62,10 @@ <artifactId>slf4j-jdk14</artifactId> <scope>test</scope> </dependency> - <!-- Arquillian Implementation for TestNG --> + <!-- Arquillian JUnit 5 integration --> <dependency> - <groupId>org.jboss.arquillian.testng</groupId> - <artifactId>arquillian-testng-container</artifactId> + <groupId>org.jboss.arquillian.junit5</groupId> + <artifactId>arquillian-junit5-container</artifactId> <version>${version.arquillian}</version> <scope>test</scope> </dependency> @@ -164,4 +168,4 @@ </build> </profile> </profiles> -</project> \ No newline at end of file +</project> diff --git a/tck/concurrency-signature-test/src/test/resources/arquillian.xml b/tck/concurrency-signature-test/src/test/resources/arquillian.xml index 7d1d366f87..4014613c74 100644 --- a/tck/concurrency-signature-test/src/test/resources/arquillian.xml +++ b/tck/concurrency-signature-test/src/test/resources/arquillian.xml @@ -31,7 +31,6 @@ jimage.dir=${project.build.directory}/jimage </property> <property name="additionalLibs"> - mvn:org.testng:testng:7.5:jar mvn:jakarta.tck:sigtest-maven-plugin:2.3:jar </property> <property name="catalina_opts">--add-exports java.base/jdk.internal.vm.annotation=ALL-UNNAMED --add-opens java.base/jdk.internal.vm.annotation=ALL-UNNAMED</property> diff --git a/tck/concurrency-standalone/dev.xml b/tck/concurrency-standalone/dev.xml deleted file mode 100644 index 606eb1d9fd..0000000000 --- a/tck/concurrency-standalone/dev.xml +++ /dev/null @@ -1,28 +0,0 @@ -<!-- - 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. - --> -<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; > - -<!-- - This suite file is for testing Jakarta Concurrency against the Jakarta Full Profile. - --> -<suite name="jakarta-concurrency" verbose="2" configfailurepolicy="continue"> - <test name="jakarta-concurrency.tck"> - <classes> - <class name="ee.jakarta.tck.concurrent.spec.ContextService.contextPropagate.ContextPropagationTests" /> - </classes> - </test> -</suite> diff --git a/tck/concurrency-standalone/pom.xml b/tck/concurrency-standalone/pom.xml index d8dd31dd29..09b5afb907 100644 --- a/tck/concurrency-standalone/pom.xml +++ b/tck/concurrency-standalone/pom.xml @@ -33,20 +33,13 @@ <maven.compiler.target>17</maven.compiler.target> <!-- Dependency and Plugin Versions --> - <jakarta.concurrent.version>3.0.4</jakarta.concurrent.version> - <jakarta.servlet.version>6.0.0</jakarta.servlet.version> - <testng.version>7.5.1</testng.version> - <sigtest.version>1.6</sigtest.version> - <maven.dep.plugin.version>3.10.0</maven.dep.plugin.version> - <maven.comp.plugin.version>3.15.0</maven.comp.plugin.version> - <maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version> - - <suiteXmlFile>suite-web.xml</suiteXmlFile> + <jakarta.concurrent.tck.version>3.1.1</jakarta.concurrent.tck.version> + <jakarta.concurrent.api.version>3.1.0</jakarta.concurrent.api.version> + <jakarta.servlet.version>6.1.0</jakarta.servlet.version> <targetDirectory>${project.basedir}/target</targetDirectory> </properties> - <!-- tag::testClientDep[] --> <!-- The Arquillian test framework --> <dependencyManagement> <dependencies> @@ -66,22 +59,28 @@ <dependency> <groupId>jakarta.enterprise.concurrent</groupId> <artifactId>jakarta.enterprise.concurrent-tck</artifactId> - <version>${jakarta.concurrent.version}</version> + <version>${jakarta.concurrent.tck.version}</version> </dependency> <!-- The API --> <dependency> <groupId>jakarta.enterprise.concurrent</groupId> <artifactId>jakarta.enterprise.concurrent-api</artifactId> - <version>${jakarta.concurrent.version}</version> + <version>${jakarta.concurrent.api.version}</version> </dependency> - <!-- Arquillian Implementation for TestNG --> + <!-- JUnit 5 --> <dependency> - <groupId>org.jboss.arquillian.testng</groupId> - <artifactId>arquillian-testng-container</artifactId> - <version>${version.arquillian}</version> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <version>${junit.jupiter.version}</version> + <scope>test</scope> + </dependency> + <!-- Arquillian JUnit 5 integration --> + <dependency> + <groupId>org.jboss.arquillian.junit5</groupId> + <artifactId>arquillian-junit5-container</artifactId> + <scope>test</scope> </dependency> <!-- Arquillian Deps for Apache TomEE --> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>apache-tomee</artifactId> @@ -96,19 +95,18 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - <!-- End of deps for Apache TomEE --> - <!-- Arquillian transitive dependency on Servlet --> <dependency> <groupId>jakarta.servlet</groupId> <artifactId>jakarta.servlet-api</artifactId> <version>${jakarta.servlet.version}</version> </dependency> - <!-- TestNG --> + <!-- Sigtest --> <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>${testng.version}</version> + <groupId>jakarta.tck</groupId> + <artifactId>sigtest-maven-plugin</artifactId> + <version>2.3</version> + <scope>test</scope> </dependency> <!-- To ensure its available for the TomEE lib directory --> <dependency> @@ -131,7 +129,6 @@ </dependency> </dependencies> - <!-- end::testClientDep[] --> <profiles> <profile> @@ -143,14 +140,8 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>${maven.dep.plugin.version}</version> <configuration> <artifactItems> - <artifactItem> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>${testng.version}</version> - </artifactItem> <artifactItem> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> @@ -162,7 +153,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>${maven.comp.plugin.version}</version> <configuration> <source>${maven.compiler.source}</source> <target>${maven.compiler.target}</target> @@ -171,15 +161,29 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>${maven.surefire.plugin.version}</version> + <version>${surefire.version}</version> <configuration> + <reuseForks>true</reuseForks> + <forkCount>1</forkCount> + <useFile>false</useFile> + <trimStackTrace>false</trimStackTrace> + <dependenciesToScan> + <dependency>jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-tck</dependency> + </dependenciesToScan> + <includes> + <include>ee/jakarta/tck/concurrent/api/**</include> + <include>ee/jakarta/tck/concurrent/spec/**</include> + </includes> + <excludes> + <exclude>ee/jakarta/tck/concurrent/spec/signature/**</exclude> + </excludes> + <groups>!eefull</groups> <systemPropertyVariables> + <java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file> + <jimage.dir>${project.build.directory}/jimage</jimage.dir> </systemPropertyVariables> - <suiteXmlFiles> - <suiteXmlFile>${suiteXmlFile}</suiteXmlFile> - </suiteXmlFiles> <testSourceDirectory> - ${basedir}${file.separarator}src${file.separarator}main${file.separarator}java${file.separarator} + ${basedir}${file.separator}src${file.separator}main${file.separator}java${file.separator} </testSourceDirectory> </configuration> </plugin> @@ -187,4 +191,4 @@ </build> </profile> </profiles> -</project> \ No newline at end of file +</project> diff --git a/tck/concurrency-standalone/src/test/resources/arquillian.xml b/tck/concurrency-standalone/src/test/resources/arquillian.xml index 06ee1dea08..398d3e6aac 100644 --- a/tck/concurrency-standalone/src/test/resources/arquillian.xml +++ b/tck/concurrency-standalone/src/test/resources/arquillian.xml @@ -21,28 +21,7 @@ xsi:schemaLocation=" http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd";> - <container qualifier="tomee-microprofile" default="true"> - <configuration> - <property name="httpPort">-1</property> - <property name="ajpPort">-1</property> - <property name="stopPort">-1</property> - <property name="classifier">microprofile</property> - <property name="debug">false</property> - <property name="conf">src/test/conf</property> - <property name="cleanOnStartUp">false</property> - <property name="additionalLibs"> - mvn:org.apache.derby:derby:10.15.2.0 - mvn:org.apache.derby:derbytools:10.15.2.0 - mvn:org.apache.derby:derbyshared:10.15.2.0 - mvn:org.testng:testng:7.5 - </property> - <property name="dir">target/tomee</property> - <property name="properties"> - openejb.environment.default=true - </property> - </configuration> - </container> - <container qualifier="tomee-plus"> + <container qualifier="tomee-plus" default="true"> <configuration> <property name="httpPort">-1</property> <property name="ajpPort">-1</property> @@ -50,12 +29,11 @@ <property name="classifier">plus</property> <property name="debug">false</property> <property name="conf">src/test/conf</property> - <property name="cleanOnStartUp">false</property> + <property name="cleanOnStartUp">true</property> <property name="additionalLibs"> mvn:org.apache.derby:derby:10.15.2.0 mvn:org.apache.derby:derbytools:10.15.2.0 mvn:org.apache.derby:derbyshared:10.15.2.0 - mvn:org.testng:testng:7.5 </property> <property name="dir">target/tomee</property> <property name="properties"> @@ -71,12 +49,11 @@ <property name="classifier">plume</property> <property name="debug">false</property> <property name="conf">src/test/conf</property> - <property name="cleanOnStartUp">false</property> + <property name="cleanOnStartUp">true</property> <property name="additionalLibs"> mvn:org.apache.derby:derby:10.15.2.0 mvn:org.apache.derby:derbytools:10.15.2.0 mvn:org.apache.derby:derbyshared:10.15.2.0 - mvn:org.testng:testng:7.5 </property> <property name="dir">target/tomee</property> <property name="properties"> @@ -92,12 +69,11 @@ <property name="classifier">webprofile</property> <property name="debug">false</property> <property name="conf">src/test/conf</property> - <property name="cleanOnStartUp">false</property> + <property name="cleanOnStartUp">true</property> <property name="additionalLibs"> mvn:org.apache.derby:derby:10.15.2.0 mvn:org.apache.derby:derbytools:10.15.2.0 mvn:org.apache.derby:derbyshared:10.15.2.0 - mvn:org.testng:testng:7.5 </property> <property name="dir">target/tomee</property> <property name="properties"> diff --git a/tck/concurrency-standalone/src/test/resources/logging.properties b/tck/concurrency-standalone/src/test/resources/logging.properties new file mode 100644 index 0000000000..4969cd0964 --- /dev/null +++ b/tck/concurrency-standalone/src/test/resources/logging.properties @@ -0,0 +1,21 @@ +## Logging configuration for Concurrency TCK + +handlers = java.util.logging.FileHandler, java.util.logging.ConsoleHandler + +.level = WARNING + +## Concurrency TCK logger +ee.jakarta.tck.concurrent.level = ALL + +## File handler +java.util.logging.FileHandler.level = CONFIG +java.util.logging.FileHandler.pattern = target/ConcurrentTCK%g%u.log +java.util.logging.FileHandler.limit = 500000 +java.util.logging.FileHandler.count = 5 +java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter + +## Console handler +java.util.logging.ConsoleHandler.level = WARNING +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter + +java.util.logging.SimpleFormatter.format = [%1$tF %1$tT] %4$.1s %3$s %5$s %n diff --git a/tck/concurrency-standalone/suite-web.xml b/tck/concurrency-standalone/suite-web.xml deleted file mode 100644 index fea9a5434e..0000000000 --- a/tck/concurrency-standalone/suite-web.xml +++ /dev/null @@ -1,36 +0,0 @@ -<!-- - 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. - --> -<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; > - -<!-- - This suite file is for testing Jakarta Concurrency against the Jakarta Web Profile. - --> -<suite name="jakarta-concurrency" verbose="2" configfailurepolicy="continue"> - <test name="jakarta-concurrency.tck"> - <groups> - <run> - <exclude name="eefull" /> - </run> - </groups> - <packages> - <package name="ee.jakarta.tck.concurrent.api.*"/> - <package name="ee.jakarta.tck.concurrent.spec.*"> - <exclude name="ee.jakarta.tck.concurrent.spec.signature"/> - </package> - </packages> - </test> -</suite> \ No newline at end of file diff --git a/tck/concurrency-standalone/suite.xml b/tck/concurrency-standalone/suite.xml deleted file mode 100644 index 6a76c97712..0000000000 --- a/tck/concurrency-standalone/suite.xml +++ /dev/null @@ -1,36 +0,0 @@ -<!-- - 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. - --> -<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; > - -<!-- - This suite file is for testing Jakarta Concurrency against the Jakarta Full Profile. - --> -<suite name="jakarta-concurrency" verbose="2" configfailurepolicy="continue"> - <test name="jakarta-concurrency.tck"> - <groups> - <run> - <exclude name="eeweb"/> - </run> - </groups> - <packages> - <package name="ee.jakarta.tck.concurrent.api.*"/> - <package name="ee.jakarta.tck.concurrent.spec.*"> - <exclude name="ee.jakarta.tck.concurrent.spec.signature"/> - </package> - </packages> - </test> -</suite> \ No newline at end of file
