Skip to content

Commit

Permalink
Update Data TCK to version 1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@KyleAure
KyleAure committed Jun 14, 2024
1 parent 45a3ca0 commit faff97b
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 35 deletions.
4 changes: 2 additions & 2 deletions ...jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataCoreTckLauncher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void launchDataTckCorePersistence() throws Exception {

//Comment out to use SNAPSHOT
additionalProps.put("jakarta.data.groupid", "jakarta.data");
additionalProps.put("jakarta.data.tck.version", "1.0.0-RC1");
additionalProps.put("jakarta.data.tck.version", "1.0.1");

String bucketName = "io.openliberty.jakarta.data.1.0_fat_tck";
String testName = this.getClass() + ":launchDataTckCorePersistence";
Expand Down Expand Up @@ -116,7 +116,7 @@ public void launchDataTckCoreNoSQL() throws Exception {

//Comment out to use SNAPSHOT
additionalProps.put("jakarta.data.groupid", "jakarta.data");
additionalProps.put("jakarta.data.tck.version", "1.0.0-RC1");
additionalProps.put("jakarta.data.tck.version", "1.0.1");

String bucketName = "io.openliberty.jakarta.data.1.0_fat_tck";
String testName = this.getClass() + ":launchDataTckCoreNoSQL";
Expand Down
4 changes: 2 additions & 2 deletions ...jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataFullTckLauncher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ public void launchDataTckFullPersistence() throws Exception {
additionalProps.put("jakarta.profile", "full");

//Always skip signature tests on full profile (already tested in core profile)
additionalProps.put("included.groups", "full & persistence & !signature");
additionalProps.put("included.groups", "platform & persistence & !signature");

additionalProps.put("excluded.tests", FATSuite.getExcludedTestByDatabase(DatabaseContainerType.valueOf(FATSuite.relationalDatabase)));

//Comment out to use SNAPSHOT
additionalProps.put("jakarta.data.groupid", "jakarta.data");
additionalProps.put("jakarta.data.tck.version", "1.0.0-RC1");
additionalProps.put("jakarta.data.tck.version", "1.0.1");

String bucketName = "io.openliberty.jakarta.data.1.0_fat_tck";
String testName = this.getClass() + ":launchDataTckFull";
Expand Down
2 changes: 1 addition & 1 deletion ...a.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataStandaloneTckLauncher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public void launchDataTckStandaloneNoSQL() throws Exception {

//Comment out to use SNAPSHOT
additionalProps.put("jakarta.data.groupid", "jakarta.data");
additionalProps.put("jakarta.data.tck.version", "1.0.0-RC1");
additionalProps.put("jakarta.data.tck.version", "1.0.1");

String bucketName = "io.openliberty.jakarta.data.1.0_fat_tck";
String testName = this.getClass() + ":launchDataTckStandaloneNoSQL";
Expand Down
2 changes: 1 addition & 1 deletion ....jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataWebTckLauncher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public void launchDataTckWebPersistence() throws Exception {

//Comment out to use SNAPSHOT
additionalProps.put("jakarta.data.groupid", "jakarta.data");
additionalProps.put("jakarta.data.tck.version", "1.0.0-RC1");
additionalProps.put("jakarta.data.tck.version", "1.0.1");

String bucketName = "io.openliberty.jakarta.data.1.0_fat_tck";
String testName = this.getClass() + ":launchDataTckWeb";
Expand Down
4 changes: 2 additions & 2 deletions ...ta.data.1.0_fat_tck/publish/servers/io.openliberty.jakarta.data.1.0.core.nosql/server.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

<featureManager>
<!-- Core profile features (no super feature that contains these) -->
<feature>cdi-4.0</feature> <!-- Includes Annotations 2.1, Dependency Injection 2.0, and Interceptors 2.1 -->
<feature>restfulWS-3.1</feature>
<feature>cdi-4.1</feature>
<feature>restfulWS-4.0</feature>

<!-- Features being tested -->
<feature>data-1.0</feature>
Expand Down
8 changes: 4 additions & 4 deletions ....jakarta.data.1.0_fat_tck/publish/servers/io.openliberty.jakarta.data.1.0.core/server.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2022 IBM Corporation and others.
Copyright (c) 2022, 2024 IBM Corporation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
which accompanies this distribution, and is available at
Expand All @@ -13,11 +13,11 @@
<server>
<featureManager>
<!-- Core profile features (no super feature that contains these) -->
<feature>cdi-4.0</feature> <!-- Includes Annotations 2.1, Dependency Injection 2.0, and Interceptors 2.1 -->
<feature>restfulWS-3.1</feature>
<feature>cdi-4.1</feature>
<feature>restfulWS-4.0</feature>
<!-- Features being tested -->
<feature>data-1.0</feature>
<feature>persistence-3.1</feature>
<feature>persistence-3.2</feature>
<!-- Features needed for arquillan support -->
<feature>localConnector-1.0</feature>
<!-- Required by test infrastructure -->
Expand Down
4 changes: 2 additions & 2 deletions ....jakarta.data.1.0_fat_tck/publish/servers/io.openliberty.jakarta.data.1.0.full/server.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2023 IBM Corporation and others.
Copyright (c) 2023, 2024 IBM Corporation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
which accompanies this distribution, and is available at
Expand All @@ -13,7 +13,7 @@
<server>
<featureManager>
<!-- Features being tested -->
<feature>jakartaee-10.0</feature>
<feature>jakartaee-11.0</feature>
<feature>data-1.0</feature>

<!-- Features needed for arquillan support -->
Expand Down
6 changes: 3 additions & 3 deletions ...y.jakarta.data.1.0_fat_tck/publish/servers/io.openliberty.jakarta.data.1.0.web/server.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2022, 2023 IBM Corporation and others.
Copyright (c) 2022, 2024 IBM Corporation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
which accompanies this distribution, and is available at
Expand All @@ -13,9 +13,9 @@
<server>
<featureManager>
<!-- Features being tested -->
<feature>webProfile-10.0</feature>
<feature>webProfile-11.0</feature>
<feature>data-1.0</feature>
<feature>persistence-3.1</feature>
<feature>persistence-3.2</feature>

<!-- Features needed for arquillan support -->
<feature>localConnector-1.0</feature>
Expand Down
12 changes: 6 additions & 6 deletions dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/platform/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2022, 2023 IBM Corporation and others. All rights reserved.
~ Copyright (c) 2022, 2024 IBM Corporation and others. All rights reserved.
~ This program and the accompanying materials are made available under the
~ terms of the Eclipse Public License 2.0 which accompanies this distribution,
~ and is available at
Expand Down Expand Up @@ -85,9 +85,9 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.0</version>
<version>6.1</version>
<scope>system</scope>
<systemPath>${io.openliberty.jakarta.servlet.6.0}</systemPath>
<systemPath>${io.openliberty.jakarta.servlet.6.1}</systemPath>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
Expand All @@ -99,9 +99,9 @@
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>4.0</version>
<version>4.1</version>
<scope>system</scope>
<systemPath>${io.openliberty.jakarta.cdi.4.0}</systemPath>
<systemPath>${io.openliberty.jakarta.cdi.4.1}</systemPath>
</dependency>
<dependency>
<groupId>org.jboss.weld5</groupId>
Expand All @@ -123,7 +123,7 @@

<!-- Test dependency for signature testing -->
<dependency>
<groupId>org.netbeans.tools</groupId>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${sigtest.version}</version>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/platform/verification.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.1.0-M2</version>
<version>6.1.0</version>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
Expand Down Expand Up @@ -84,7 +84,7 @@

<!-- Test dependency for signature testing -->
<dependency>
<groupId>org.netbeans.tools</groupId>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${sigtest.version}</version>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@

<!-- Jakarta EE API -->
<jakarta.data.groupid>jakarta.data</jakarta.data.groupid>
<jakarta.data.version>1.0.0-SNAPSHOT</jakarta.data.version>
<jakarta.data.tck.version>1.0.0-SNAPSHOT</jakarta.data.tck.version>
<jakarta.data.version>1.0.1-SNAPSHOT</jakarta.data.version>
<jakarta.data.tck.version>1.0.1-SNAPSHOT</jakarta.data.tck.version>
<jakarta.cdi.version>4.0.1</jakarta.cdi.version>

<!-- JNoSQL Implementation -->
Expand All @@ -43,7 +43,7 @@
<arquillian.version>1.7.0.Final</arquillian.version>
<arquillian.wlp.version>2.1.3</arquillian.wlp.version>
<junit.version>5.10.0</junit.version>
<sigtest.version>1.6</sigtest.version>
<sigtest.version>2.3</sigtest.version>
</properties>

<dependencyManagement>
Expand Down
12 changes: 5 additions & 7 deletions dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/standalone/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<artifactId>junit-jupiter</artifactId>
</dependency>
<dependency>
<groupId>org.netbeans.tools</groupId>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${sigtest.version}</version>
</dependency>
Expand All @@ -89,26 +89,24 @@
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-api</artifactId>
<version>1.2.6</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-core</artifactId>
<version>1.7.0.Alpha13</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.0</version>
<version>6.1</version>
<scope>system</scope>
<systemPath>${io.openliberty.jakarta.servlet.6.0}</systemPath>
<systemPath>${io.openliberty.jakarta.servlet.6.1}</systemPath>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>4.0</version>
<version>4.1</version>
<scope>system</scope>
<systemPath>${io.openliberty.jakarta.cdi.4.0}</systemPath>
<systemPath>${io.openliberty.jakarta.cdi.4.1}</systemPath>
</dependency>
</dependencies>

Expand Down

0 comments on commit faff97b

Please sign in to comment.