This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push:
new ab4d42ed48 Applies some fixes after latest dependency updates:
ab4d42ed48 is described below
commit ab4d42ed48166e3e47908931a573fd6b3d576287
Author: Richard Zowalla <[email protected]>
AuthorDate: Tue Aug 13 10:12:56 2024 +0200
Applies some fixes after latest dependency updates:
- Downgrade JSON Mini Dev for Examples
- Downgrade TestNG as 7.5.x is required by the MP TCK Tests (atm, did not
dig into it)
- Declare commons-lang3 in some examples explicitly to avoid classpath
confusion
---
.../openejb/arquillian/tests/slf4j/BasicSlf4jWebappTest.java | 2 +-
examples/mp-rest-jwt-jwk/pom.xml | 2 +-
examples/mp-rest-jwt-principal/pom.xml | 2 +-
examples/mp-rest-jwt-public-key/pom.xml | 2 +-
examples/resources-jmx-example/resources-jmx-ejb/pom.xml | 6 ++++++
tck/microprofile-tck/pom.xml | 7 +++++++
6 files changed, 17 insertions(+), 4 deletions(-)
diff --git
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/BasicSlf4jWebappTest.java
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/BasicSlf4jWebappTest.java
index 881dadcba2..be6951eeb0 100644
---
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/BasicSlf4jWebappTest.java
+++
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/slf4j/BasicSlf4jWebappTest.java
@@ -71,6 +71,6 @@ public class BasicSlf4jWebappTest {
assertNotNull("Response shouldn't be null", output);
assertTrue("Output should contain: " + "It works!" + "\n" + output,
output.contains("It works!"));
assertTrue("Output should contain: " + "Logger Factory:
org.slf4j.jul.JDK14LoggerFactory" + "\n" + output, output.contains("Logger
Factory: org.slf4j.jul.JDK14LoggerFactory"));
- assertTrue("Output should contain: " + "slf4j-jdk14-2.0.12.jar" + "\n"
+ output, output.contains("slf4j-jdk14-2.0.12.jar"));
+ assertTrue("Output should contain: " + "slf4j-jdk14-2.0.16.jar" + "\n"
+ output, output.contains("slf4j-jdk14-2.0.16.jar"));
}
}
diff --git a/examples/mp-rest-jwt-jwk/pom.xml b/examples/mp-rest-jwt-jwk/pom.xml
index a4c18ba8ce..b74dfa92e2 100644
--- a/examples/mp-rest-jwt-jwk/pom.xml
+++ b/examples/mp-rest-jwt-jwk/pom.xml
@@ -107,7 +107,7 @@
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
- <version>2.5.1</version>
+ <version>1.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/examples/mp-rest-jwt-principal/pom.xml
b/examples/mp-rest-jwt-principal/pom.xml
index 80b1f05609..22588f30fd 100644
--- a/examples/mp-rest-jwt-principal/pom.xml
+++ b/examples/mp-rest-jwt-principal/pom.xml
@@ -98,7 +98,7 @@
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
- <version>2.5.1</version>
+ <version>1.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/examples/mp-rest-jwt-public-key/pom.xml
b/examples/mp-rest-jwt-public-key/pom.xml
index 416c5c9ea0..86073d8c4c 100644
--- a/examples/mp-rest-jwt-public-key/pom.xml
+++ b/examples/mp-rest-jwt-public-key/pom.xml
@@ -124,7 +124,7 @@
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
- <version>2.5.1</version>
+ <version>1.3.1</version>
<scope>test</scope>
</dependency>
diff --git a/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
b/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
index 135ea74dbb..99446d7099 100644
--- a/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
+++ b/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
@@ -76,6 +76,12 @@
<version>1.9.1.Final</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.15.0</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>ziplock</artifactId>
diff --git a/tck/microprofile-tck/pom.xml b/tck/microprofile-tck/pom.xml
index e6107f4974..a09e28e85c 100644
--- a/tck/microprofile-tck/pom.xml
+++ b/tck/microprofile-tck/pom.xml
@@ -42,6 +42,13 @@
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <!-- This version is needed for MP TCK to work -->
+ <version>7.5.1</version>
+ <scope>test</scope>
+ </dependency>
<!-- Micro Profile TCK -->
<dependency>
<groupId>org.eclipse.microprofile.config</groupId>
