Skip to content

Commit

Permalink
Merge pull request #1339 from arjantijms/tckrefactor_concurrency_tck_310
Browse files Browse the repository at this point in the history 
Update Concurrency TCK to 3.1.0
  • Loading branch information
@arjantijms
arjantijms authored Jun 25, 2024
2 parents fe3f6b4 + 5398da2 commit 84ddf59
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 385 deletions.
196 changes: 65 additions & 131 deletions glassfish-runner/concurrency-tck/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* Copyright (c) 2022 Contributors to the Eclipse Foundation
* Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -30,103 +30,103 @@
<artifactId>glassfish.concurrency-tck</artifactId>
<name>Jakarta Concurrency TCK Runner for Glassfish</name>

<properties>
<description>Aggregates dependencies and runs the Concurrency TCK on GlassFish</description>

<concurrency.tck-3-0.version>3.0.2</concurrency.tck-3-0.version>
<glassfish.home>${glassfish.root}/glassfish7</glassfish.home>
<properties>
<glassfish.home>${glassfish.root}/glassfish8</glassfish.home>
<glassfish.root>${project.build.directory}</glassfish.root>

<glassfish.version>7.0.0-M10</glassfish.version>
<jakarta.concurrent.version>3.0.1</jakarta.concurrent.version>
<jakarta.servlet.version>6.0.0</jakarta.servlet.version>
<glassfish.version>8.0.0-M6</glassfish.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>1.8.0.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- Jakarta EE APIs -->
<dependency>
<groupId>jakarta.enterprise.concurrent</groupId>
<artifactId>jakarta.enterprise.concurrent-api</artifactId>
<version>${jakarta.concurrent.version}</version>
<version>3.1.0</version>
</dependency>

<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.servlet.version}</version>
<version>6.1.0</version>
</dependency>
<dependency>
<groupId>jakarta.ejb</groupId>
<artifactId>jakarta.ejb-api</artifactId>
<version>4.0.1</version>
</dependency>

<!-- The TCK -->
<dependency>
<groupId>jakarta.enterprise.concurrent</groupId>
<artifactId>jakarta.enterprise.concurrent-tck</artifactId>
<version>${concurrency.tck-3-0.version}</version>
<scope>test</scope>
</dependency>

<!-- Utility classes for TestNG and Arquillian, used in suite.xml -->
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>cdi-tck-core-impl</artifactId>
<version>4.0.5</version>
<version>3.1.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.jboss.test-audit</groupId>
<artifactId>jboss-test-audit-impl</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.test-audit</groupId>
<artifactId>jboss-test-audit-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.faces</groupId>
<artifactId>jakarta.faces-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>container-se-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<!--
The Arquillian connector that starts GlassFish and deploys archives to it.
-->
The Arquillian connector that starts GlassFish and deploys archives to it.
-->
<dependency>
<groupId>org.omnifaces.arquillian</groupId>
<artifactId>arquillian-glassfish-server-managed</artifactId>
<version>1.2</version>
<version>1.5</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>7.4.0</version>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-container</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>

<!-- Signature Test Plugin -->
<dependency>
<groupId>org.netbeans.tools</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>1.6</version>
<version>1.7</version>
</dependency>
</dependencies>

<build>
<defaultGoal>clean test</defaultGoal>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
<!-- Disable annotation processor for test sources -->
<testCompilerArgument>-proc:none</testCompilerArgument>
<release>17</release>
</configuration>
</plugin>

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
Expand All @@ -150,96 +150,37 @@
</artifactItems>
</configuration>
</execution>
<execution>
<id>copy</id>
<goals>
<goal>copy</goal>
</goals>
<phase>process-test-classes</phase>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>7.4.0</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${glassfish.root}/glassfish7/glassfish/lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
<version>1.78</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${glassfish.root}/glassfish7/glassfish/lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.netbeans.tools</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>1.6</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${glassfish.root}/glassfish7/glassfish/lib</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-surefire-plugin</artifactId>

<configuration>
<argLine>-Xmx768m</argLine>

<!-- Surefire / TestNG Properties -->
<!-- The suite and the test dependencies together determine which tests are being run -->
<suiteXmlFiles>
<suiteXmlFile>${suiteXmlFile}</suiteXmlFile>
</suiteXmlFiles>
<dependenciesToScan>
<dependency>jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-tck</dependency>
</dependenciesToScan>
<properties>
<property>
<name>surefire.testng.verbose</name>
<value>1</value>
</property>
</properties>
<forkMode>once</forkMode>

<!-- System Properties -->
<systemPropertyVariables>
<glassfish.home>${glassfish.root}/glassfish7</glassfish.home>
<glassfish.home>${glassfish.root}/glassfish8</glassfish.home>
<glassfish.enableDerby>true</glassfish.enableDerby>
<glassfish.maxHeapSize>2048m</glassfish.maxHeapSize>

<glassfish.systemProperties>jimage.dir=${project.build.directory}/jimage</glassfish.systemProperties>

<glassfish.postBootCommands>create-file-user --groups staff:mgr --passwordfile ${project.build.directory}/test-classes/j2ee.pass j2ee
create-file-user --groups Manager --passwordfile ${project.build.directory}/test-classes/javajoe.pass
javajoe</glassfish.postBootCommands>
create-file-user --groups Manager --passwordfile ${project.build.directory}/test-classes/javajoe.pass javajoe</glassfish.postBootCommands>

<jimage.dir>${project.build.directory}/jimage</jimage.dir>
</systemPropertyVariables>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>3.0.0-M6</version>
<configuration>
<outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
<outputName>test-report</outputName>
<!-- Groups to include i.e. web/platform -->
<groups>${jakarta.tck.platform}</groups>
<reportNameSuffix>${jakarta.tck.platform}</reportNameSuffix>
<testSourceDirectory>${basedir}/src/main/java/</testSourceDirectory>
</configuration>
<executions>
<execution>
<id>generate-test-report</id>
<goals>
<goal>report-only</goal>
</goals>
<phase>verify</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand All @@ -251,23 +192,16 @@
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<suiteXmlFile>suite.xml</suiteXmlFile>
<glassfish-artifact-id>glassfish</glassfish-artifact-id>
<jakarta.tck.platform>platform</jakarta.tck.platform>
</properties>
</profile>
<profile>
<id>web</id>
<properties>
<glassfish-artifact-id>web</glassfish-artifact-id>
<suiteXmlFile>suite-web.xml</suiteXmlFile>
</properties>
</profile>
<profile>
<id>webgroup2</id>
<properties>
<glassfish-artifact-id>web</glassfish-artifact-id>
<suiteXmlFile>suite-web-group2.xml</suiteXmlFile>
<jakarta.tck.platform.tck.platform>web</jakarta.tck.platform.tck.platform>
</properties>
</profile>
</profiles>

</project>
31 changes: 0 additions & 31 deletions glassfish-runner/concurrency-tck/src/test/resources/arquillian.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion glassfish-runner/concurrency-tck/src/test/resources/logging.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ java.util.logging.SimpleFormatter.time.format=[MM/dd/yyyy HH:mm:ss:SSS z]
java.util.logging.SimpleFormatter.format=[%1$tF %1$tT] %4$.1s %3$s %5$s %n

#File logging
java.util.logging.FileHandler.pattern=ConcurrentTCK%g%u.log
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
Expand Down
42 changes: 0 additions & 42 deletions glassfish-runner/concurrency-tck/suite-web-group2.xml
View file

This file was deleted.

Loading

0 comments on commit 84ddf59

Please sign in to comment.