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 TestNG to 7.5.1 #25122

Merged
merged 3 commits into from
May 2, 2023
Merged

Update TestNG to 7.5.1 #25122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4b3a99
Update TestNG to 7.5.1
abutch3r Mar 9, 2023
e51526f
Resolve testng package references
abutch3r Apr 27, 2023
f6bcc27
Add missing SLF4J dependencies
abutch3r Apr 28, 2023
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
20 changes: 15 additions & 5 deletions dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,16 @@
<artifactId>netty-transport</artifactId>
<version>4.1.86.Final</version>
</dependency>
<dependency>
<groupId>io.openliberty.arquillian</groupId>
<artifactId>arquillian-liberty-support-jakarta</artifactId>
<version>2.1.1</version>
</dependency>
<dependency>
<groupId>io.openliberty.arquillian</groupId>
<artifactId>arquillian-liberty-support</artifactId>
<version>1.0.8</version>
</dependency>
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
<artifactId>opentelemetry-instrumentation-annotations-support</artifactId>
Expand Down Expand Up @@ -3039,22 +3049,22 @@
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-spi</artifactId>
<version>1.3.0.Final</version>
<version>1.7.0.Alpha13</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-api</artifactId>
<version>1.3.0.Final</version>
<version>1.7.0.Alpha13</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-spi</artifactId>
<version>1.3.0.Final</version>
<version>1.7.0.Alpha13</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.test</groupId>
<artifactId>arquillian-test-spi</artifactId>
<version>1.3.0.Final</version>
<version>1.7.0.Alpha13</version>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
Expand Down Expand Up @@ -3974,7 +3984,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.14.3</version>
<version>7.5.1</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
Expand Down
12 changes: 7 additions & 5 deletions dev/cnf/oss_dependencies.maven
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ io.netty:netty-handler:4.1.86.Final
io.netty:netty-resolver:4.1.86.Final
io.netty:netty-transport-native-unix-common:4.1.86.Final
io.netty:netty-transport:4.1.86.Final
io.openliberty.arquillian:arquillian-liberty-support-jakarta:2.1.1
io.openliberty.arquillian:arquillian-liberty-support:1.0.8
io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support:1.19.0-alpha
io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:1.19.0-alpha
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:1.19.0-alpha
Expand Down Expand Up @@ -603,10 +605,10 @@ org.jacoco:org.jacoco.report:0.7.9
org.jasypt:jasypt:1.9.3
org.javassist:javassist:3.17.1-GA
org.javassist:javassist:3.21.0-GA
org.jboss.arquillian.container:arquillian-container-test-spi:1.3.0.Final
org.jboss.arquillian.core:arquillian-core-api:1.3.0.Final
org.jboss.arquillian.core:arquillian-core-spi:1.3.0.Final
org.jboss.arquillian.test:arquillian-test-spi:1.3.0.Final
org.jboss.arquillian.container:arquillian-container-test-spi:1.7.0.Alpha13
org.jboss.arquillian.core:arquillian-core-api:1.7.0.Alpha13
org.jboss.arquillian.core:arquillian-core-spi:1.7.0.Alpha13
org.jboss.arquillian.test:arquillian-test-spi:1.7.0.Alpha13
org.jboss.logging:jboss-logging-annotations:2.2.1.Final
org.jboss.logging:jboss-logging-processor:2.2.1.Final
org.jboss.logging:jboss-logging:3.4.3.Final
Expand Down Expand Up @@ -790,7 +792,7 @@ org.testcontainers:oracle-xe:1.17.4
org.testcontainers:postgresql:1.17.4
org.testcontainers:selenium:1.17.4
org.testcontainers:testcontainers:1.17.4
org.testng:testng:6.14.3
org.testng:testng:7.5.1
org.yaml:snakeyaml:1.32
wsdl4j:wsdl4j:1.6.2
xalan:xalan:2.7.2
Expand Down
4 changes: 2 additions & 2 deletions dev/com.ibm.ws.concurrent.mp.1.2_fat_tck/publish/tckRunner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018,2021 IBM Corporation and others. All rights reserved.
Copyright (c) 2018,2023 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 @@ -21,7 +21,7 @@
<name>MicroProfile Context Propagation TCK Runner</name>

<properties>
<arquillian.version>1.3.0.Final</arquillian.version>
<arquillian.version>1.7.0.Alpha13</arquillian.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down
33 changes: 28 additions & 5 deletions dev/com.ibm.ws.concurrent.mp.1.2_fat_tck/publish/tckRunner/tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2021 IBM Corporation and others. All rights reserved.
Copyright (c) 2017, 2023 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 @@ -26,7 +26,10 @@
<!-- The test case launch must be guarded with "if (FATRunner.FAT_TEST_LOCALRUN)" of this option is delivered. -->
<!-- <microprofile.context.propagation.version>1.2-SNAPSHOT</microprofile.context.propagation.version> -->

<arquillian.version>1.3.0.Final</arquillian.version>
<arquillian.version>1.7.0.Alpha13</arquillian.version>
<arquillian.liberty.managed.version>1.0.8</arquillian.liberty.managed.version>
<testng.version>7.5.1</testng.version>
<slf4j.version>2.0.6</slf4j.version>

<!-- the below is used in arquillian.xml -->
<wlp>${wlp}</wlp>
Expand Down Expand Up @@ -89,22 +92,42 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.9.9</version>
<version>${testng.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.testng</groupId>
<artifactId>arquillian-testng-container</artifactId>
<version>1.1.14.Final</version>
<version>${arquillian.version}</version>
</dependency>

<dependency>
<groupId>io.openliberty.arquillian</groupId>
<artifactId>arquillian-liberty-managed</artifactId>
<version>1.0.5</version>
<version>${arquillian.liberty.managed.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.ibm.ws</groupId>
<artifactId>fattest.simplicity</artifactId>
<version>1</version>
<scope>system</scope>
<systemPath>${project.basedir}/../../../lib/fattest.simplicity.jar</systemPath> <!-- This will point to build/libs/autoFVT/lib/fattest.simplicity.jar -->
</dependency>

</dependencies>

<build>
Expand Down
1 change: 1 addition & 0 deletions .../tck/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
com.ibm.ws.fat.util.tck.BasicArquillianLoadableExtension
32 changes: 26 additions & 6 deletions dev/com.ibm.ws.concurrent.mp.1.3_fat_tck/publish/tckRunner/tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2021 IBM Corporation and others. All rights reserved.
Copyright (c) 2017, 2023 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 @@ -27,6 +27,9 @@
<!-- <microprofile.context.propagation.version>1.3-SNAPSHOT</microprofile.context.propagation.version> -->

<arquillian.version>1.7.0.Alpha13</arquillian.version>
<arquillian.liberty.managed.jakarta.version>2.1.1</arquillian.liberty.managed.jakarta.version>
<testng.version>7.5.1</testng.version>
<slf4j.version>2.0.6</slf4j.version>

<!-- the below is used in arquillian.xml -->
<wlp>${wlp}</wlp>
Expand Down Expand Up @@ -100,22 +103,39 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.9.9</version>
<scope>test</scope>
<version>${testng.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>${slf4j.version}</version>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.testng</groupId>
<artifactId>arquillian-testng-container</artifactId>
<version>1.1.14.Final</version>
<version>${arquillian.version}</version>
</dependency>

<dependency>
<groupId>io.openliberty.arquillian</groupId>
<artifactId>arquillian-liberty-managed-jakarta</artifactId>
<version>2.1.1</version>
<version>${arquillian.liberty.managed.jakarta.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.ibm.ws</groupId>
<artifactId>fattest.simplicity</artifactId>
<version>1</version>
<scope>system</scope>
<systemPath>${project.basedir}/../../../lib/fattest.simplicity.jar</systemPath> <!-- This will point to build/libs/autoFVT/lib/fattest.simplicity.jar -->
</dependency>

</dependencies>

<build>
Expand Down
1 change: 1 addition & 0 deletions .../tck/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
com.ibm.ws.fat.util.tck.BasicArquillianLoadableExtension
4 changes: 2 additions & 2 deletions dev/com.ibm.ws.concurrent.mp_fat_tck/publish/tckRunner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018 IBM Corporation and others. All rights reserved.
Copyright (c) 2018, 2023 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 @@ -21,7 +21,7 @@
<name>MicroProfile Context Propagation TCK Runner</name>

<properties>
<arquillian.version>1.3.0.Final</arquillian.version>
<arquillian.version>1.7.0.Alpha13</arquillian.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down
37 changes: 30 additions & 7 deletions dev/com.ibm.ws.concurrent.mp_fat_tck/publish/tckRunner/tck/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2021 IBM Corporation and others. All rights reserved.
Copyright (c) 2017, 2023 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 @@ -22,8 +22,11 @@
<microprofile.context.propagation.version>1.0.2</microprofile.context.propagation.version>
<!-- Switch to the following to test a local SNAPSHOT instead of a release (1.0) or release candidate (1.0-RC3). -->
<!-- <microprofile.context.propagation.version>1.0-SNAPSHOT</microprofile.context.propagation.version> -->
<arquillian.version>1.3.0.Final</arquillian.version>

<arquillian.version>1.7.0.Alpha13</arquillian.version>
<arquillian.liberty.managed.version>1.0.8</arquillian.liberty.managed.version>
<testng.version>7.5.1</testng.version>
<slf4j.version>2.0.6</slf4j.version>

<!-- the below is used in arquillian.xml -->
<wlp>${wlp}</wlp>

Expand Down Expand Up @@ -78,22 +81,42 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.9.9</version>
<version>${testng.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.testng</groupId>
<artifactId>arquillian-testng-container</artifactId>
<version>1.1.14.Final</version>
<version>${arquillian.version}</version>
</dependency>

<dependency>
<groupId>io.openliberty.arquillian</groupId>
<artifactId>arquillian-liberty-managed</artifactId>
<version>1.0.5</version>
<version>${arquillian.liberty.managed.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.ibm.ws</groupId>
<artifactId>fattest.simplicity</artifactId>
<version>1</version>
<scope>system</scope>
<systemPath>${project.basedir}/../../../lib/fattest.simplicity.jar</systemPath> <!-- This will point to build/libs/autoFVT/lib/fattest.simplicity.jar -->
</dependency>

</dependencies>

<build>
Expand Down
1 change: 1 addition & 0 deletions .../tck/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
com.ibm.ws.fat.util.tck.BasicArquillianLoadableExtension
4 changes: 2 additions & 2 deletions dev/com.ibm.ws.microprofile.config.1.1_fat_tck/publish/tckRunner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017 IBM Corporation and others. All rights reserved.
Copyright (c) 2017, 2023 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 @@ -21,7 +21,7 @@
<name>MicroProfile Config TCK Runner</name>

<properties>
<arquillian.version>1.3.0.Final</arquillian.version>
<arquillian.version>1.7.0.Alpha13</arquillian.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down
Loading