Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update jakarta.tck:common to 11.0.0-RC1, the new merged common, libut… #1822

Merged
merged 2 commits into from
Jan 28, 2025
Merged

Update jakarta.tck:common to 11.0.0-RC1, the new merged common, libut… #1822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29781b3
Update jakarta.tck:common to 11.0.0-RC2, the new merged common, libut…
starksm64 Jan 28, 2025
bfadcdd
Add the standard src/main/resources location to pickup resources merg…
starksm64 Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arquillian/javatest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>${ee.tck.version}</version>
<version>${jakarta.tck.tools.version}</version>
</dependency>
<dependency>
<groupId>jakarta.tck.arquillian</groupId>
Expand Down
14 changes: 13 additions & 1 deletion arquillian/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<properties>
<maven.compiler.release>17</maven.compiler.release>
<ee.tck.version>11.0.0-SNAPSHOT</ee.tck.version>
<jakarta.tck.tools.version>11.0.0-RC1</jakarta.tck.tools.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -85,4 +85,16 @@
<version>5.11.3</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
4 changes: 2 additions & 2 deletions arquillian/protocol-lib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>${ee.tck.version}</version>
<version>${jakarta.tck.tools.version}</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -59,7 +59,7 @@
<artifactItem>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>${ee.tck.version}</version>
<version>${jakarta.tck.tools.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
Expand Down
1 change: 0 additions & 1 deletion glassfish-runner/connector-platform-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
Expand Down
2 changes: 1 addition & 1 deletion glassfish-runner/jsonb-platform-extra-tck/jsonb-platform-extra-tck-run/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<glassfish.version>8.0.0-JDK17-M9</glassfish.version>

<jakarta.tck.arquillian.version>11.0.0-M1</jakarta.tck.arquillian.version>
<jakarta.tck.tools.version>11.0.0-M2</jakarta.tck.tools.version>
<jakarta.tck.tools.version>11.0.0-RC1</jakarta.tck.tools.version>
<tck.version>3.0.0-M1</tck.version>
<ts.home>/jakartaeetck</ts.home>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion glassfish-runner/jsonp-platform-extra-tck/jsonp-platform-extra-tck-run/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<glassfish.version>8.0.0-JDK17-M9</glassfish.version>

<jakarta.tck.arquillian.version>11.0.0-M1</jakarta.tck.arquillian.version>
<jakarta.tck.tools.version>11.0.0-M2</jakarta.tck.tools.version>
<jakarta.tck.tools.version>11.0.0-RC1</jakarta.tck.tools.version>
<tck.version>2.1.0-M1</tck.version>
<ts.home>/jakartaeetck</ts.home>
</properties>
Expand Down
1 change: 0 additions & 1 deletion glassfish-runner/mail-platform-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
Expand Down
1 change: 0 additions & 1 deletion glassfish-runner/messaging-platform-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,6 @@
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
Expand Down
3 changes: 1 addition & 2 deletions glassfish-runner/messaging-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,8 @@
<version>${junit.jupiter.version}</version>
</dependency>
<dependency>
<groupId>jakartatck</groupId>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
Expand Down
4 changes: 2 additions & 2 deletions glassfish-runner/persistence-platform-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<ts.home>./jakartaeetck</ts.home>
<version.jakarta.inject>2.0.1.MR</version.jakarta.inject>
<version.jakarta.persistence>3.2.0</version.jakarta.persistence>
<version.jakarta.tck>11.0.0-M2</version.jakarta.tck>
<jakarta.tck.tools.version>11.0.0-RC1</jakarta.tck.tools.version>
<version.persistence.tck>11.0.0-SNAPSHOT</version.persistence.tck>
</properties>

Expand Down Expand Up @@ -120,7 +120,7 @@
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>${version.jakarta.tck}</version>
<version>${jakarta.tck.tools.version}</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion glassfish-runner/persistence-tck/persistence-tck-run-se/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>${jakarta.ee.version}</version>
<version>${jakarta.tck.tools.version}</version>
<scope>test</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion glassfish-runner/platform/appclient-platform-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
<version>${jakarta.tck.tools.version}</version>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
Expand Down
3 changes: 1 addition & 2 deletions glassfish-runner/platform/assembly-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<tck.artifactId>assembly-tck</tck.artifactId>
<tck.version>11.0.0-SNAPSHOT</tck.version>
<ts.home>./jakartaeetck</ts.home>
<version.jakarta.tck>11.0.0-SNAPSHOT</version.jakarta.tck>
<version.jakarta.tck.arquillian>${project.version}</version.jakarta.tck.arquillian>
</properties>

Expand Down Expand Up @@ -110,7 +109,7 @@
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
<version>${jakarta.tck.tools.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.main.common</groupId>
Expand Down
2 changes: 1 addition & 1 deletion glassfish-runner/platform/integration-platform-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
<version>${jakarta.tck.tools.version}</version>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
Expand Down
2 changes: 1 addition & 1 deletion glassfish-runner/platform/jdbc-platform-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
<version>${jakarta.tck.tools.version}</version>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
Expand Down
2 changes: 1 addition & 1 deletion glassfish-runner/platform/xa-platform-tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
<version>${jakarta.tck.tools.version}</version>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
Expand Down
2 changes: 1 addition & 1 deletion glassfish-runner/transactions-tck/transactions-tck-run/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<junit.jupiter.version>5.10.2</junit.jupiter.version>
<ts.home>${basedir}/jakartaeetck</ts.home>

<jakarta.tck.tools.version>11.0.0-M2</jakarta.tck.tools.version>
<jakarta.tck.tools.version>11.0.0-RC1</jakarta.tck.tools.version>
<jakarta.tck.arquillian.version>11.0.0-M1</jakarta.tck.arquillian.version>
<jakarta.tck.transactions.version>2.0.0-M1</jakarta.tck.transactions.version>
</properties>
Expand Down
12 changes: 10 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<version>11.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>project</name>
<description>project</description>
<description>platform-tcks-parent</description>

<modules>
<module>arquillian</module>
Expand Down Expand Up @@ -71,14 +71,18 @@
</modules>

<properties>
<!-- Arquillian -->
<ant.version>1.10.15</ant.version>
<arquillian.container.se.api.version>1.0.2.Final</arquillian.container.se.api.version>
<arquillian.jakarta.tck.version>${project.version}</arquillian.jakarta.tck.version>
<arquillian.version>1.9.1.Final</arquillian.version>

<!-- CDI -->
<cdi-api.version>4.1.0</cdi-api.version>

<!-- Jakarta Concurrency -->
<concurrent-api.version>3.1.1</concurrent-api.version>

<!-- Jakarta Persistence -->
<jakarta-persistence-api.version>3.2.0</jakarta-persistence-api.version>
<jakarta.activation-api.version>2.1.3</jakarta.activation-api.version>
Expand All @@ -101,6 +105,10 @@
<!-- Jakarta EE Security + Authentication/Authorization -->
<jakarta.security.enterprise-api.version>4.0.0</jakarta.security.enterprise-api.version>
<jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>

<!-- Jakarta TCK Tools version from the independently released tools submodule -->
<jakarta.tck.tools.version>11.0.0-RC1</jakarta.tck.tools.version>

<!-- Jakarta Transactions -->
<jakarta.transaction-api.version>2.0.1</jakarta.transaction-api.version>
<jakarta.validation-api.version>3.1.0</jakarta.validation-api.version>
Expand Down Expand Up @@ -146,7 +154,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
<version>${jakarta.tck.tools.version}</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion release/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
<version>${jakarta.tck.tools.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
17 changes: 1 addition & 16 deletions tcks/apis/connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<jakarta.tck.tools.version>11.0.0-M2</jakarta.tck.tools.version>
<jakarta.tck.tools.version>11.0.0-RC1</jakarta.tck.tools.version>
<jakarta.tck.arquillian.version>11.0.0-M1</jakarta.tck.arquillian.version>
</properties>

Expand All @@ -62,11 +62,6 @@

<dependencies>
<!-- Jakarta EE dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>common</artifactId>
<version>11.0.0-M2</version>
</dependency>
<dependency>
<groupId>jakarta.resource</groupId>
<artifactId>jakarta.resource-api</artifactId>
Expand Down Expand Up @@ -95,21 +90,11 @@
</dependency>

<!-- Jakarta TCK tools dependencies -->
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>libutil</artifactId>
<version>${jakarta.tck.tools.version}</version>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>${jakarta.tck.tools.version}</version>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>runtime</artifactId>
<version>${jakarta.tck.tools.version}</version>
</dependency>

<dependency>
<groupId>jakarta.tck.arquillian</groupId>
Expand Down
3 changes: 2 additions & 1 deletion tcks/apis/enterprise-beans/ejb30/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,14 @@
<properties>
<maven.compiler.release>17</maven.compiler.release>
<jaxwsStaleDirectory>${project.build.directory}/jaxws/stale</jaxwsStaleDirectory>
<jakarta.tck.tools.version>11.0.0-RC1</jakarta.tck.tools.version>
</properties>

<dependencies>
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>11.0.0-M2</version>
<version>${jakarta.tck.tools.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
1 change: 0 additions & 1 deletion tcks/apis/javamail/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>common</artifactId>
<version>11.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>jakarta.mail</groupId>
Expand Down
2 changes: 1 addition & 1 deletion tcks/apis/jsonb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<jakarta.tck.tools.version>11.0.0-M2</jakarta.tck.tools.version>
<jakarta.tck.tools.version>11.0.0-RC1</jakarta.tck.tools.version>
<jakarta.tck.arquillian.version>11.0.0-M1</jakarta.tck.arquillian.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion tcks/apis/jsonp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<jakarta.tck.tools.version>11.0.0-M2</jakarta.tck.tools.version>
<jakarta.tck.tools.version>11.0.0-RC1</jakarta.tck.tools.version>
<jakarta.tck.arquillian.version>11.0.0-M1</jakarta.tck.arquillian.version>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion tcks/apis/pages/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<jakarta.tck.tools.version>11.0.0-M2</jakarta.tck.tools.version>
<jakarta.tck.tools.version>11.0.0-RC1</jakarta.tck.tools.version>

<junit.jupiter.version>5.11.3</junit.jupiter.version>
</properties>
Expand Down
8 changes: 1 addition & 7 deletions tcks/apis/persistence/persistence-inside-container/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,7 @@
</parent>
<artifactId>persistence-platform-tck-common</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<resources>
<resource>
Expand Down
5 changes: 0 additions & 5 deletions tcks/apis/persistence/persistence-inside-container/platform-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,6 @@
<artifactId>jakarta.servlet-api</artifactId>
<version>6.1.0</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>persistence-platform-tck-common</artifactId>
Expand Down
1 change: 0 additions & 1 deletion tcks/apis/persistence/persistence-inside-container/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
<dependency>
<groupId>jakarta.tck</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>jakarta.tck</groupId>
Expand Down
5 changes: 0 additions & 5 deletions tcks/apis/persistence/persistence-inside-container/spec-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@
<artifactId>persistence-platform-tck-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>common</artifactId>
<version>${project.version}</version>
</dependency>

</dependencies>
<build>
Expand Down
Loading