This is an automated email from the ASF dual-hosted git repository.
jungm 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 9b86f1e956 Bump version.shrinkwrap.resolver from 2.0.0 to 3.3.2 (#1586)
9b86f1e956 is described below
commit 9b86f1e95651b382a8014c1c1eec6511674366a7
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Sun Nov 3 08:43:05 2024 +0100
Bump version.shrinkwrap.resolver from 2.0.0 to 3.3.2 (#1586)
* Bump version.shrinkwrap.resolver from 2.0.0 to 3.3.2
Bumps `version.shrinkwrap.resolver` from 2.0.0 to 3.3.2.
Updates `org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-bom` from 2.0.0
to 3.3.2
- [Release notes](https://github.com/shrinkwrap/resolver/releases)
- [Commits](https://github.com/shrinkwrap/resolver/compare/2.0.0...3.3.2)
Updates `org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven` from
2.0.0 to 3.3.2
- [Release notes](https://github.com/shrinkwrap/resolver/releases)
- [Commits](https://github.com/shrinkwrap/resolver/compare/2.0.0...3.3.2)
---
updated-dependencies:
- dependency-name: org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-bom
dependency-type: direct:production
update-type: version-update:semver-major
- dependency-name:
org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <[email protected]>
* fix build
* fix build
* downgrade junit-jupiter version
* exclude logback
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Markus Jung <[email protected]>
---
.../functional-tests/spring-cxf-tomee-4332/pom.xml | 28 ++++++++++++++++++----
.../java/org/example/spring/SpringWebappTest.java | 14 +++++------
examples/activemq-multiple-brokers/pom.xml | 2 +-
.../connector-sample-functional-tests/pom.xml | 2 +-
examples/connector-war/pom.xml | 2 +-
examples/datasource-versioning/pom.xml | 2 +-
examples/jpa-hibernate-arquillian/pom.xml | 2 +-
examples/moviefun-rest/pom.xml | 2 +-
examples/moviefun/pom.xml | 2 +-
examples/mp-config-source-database/pom.xml | 2 +-
.../mp-jwt-bean-validation-strongly-typed/pom.xml | 2 +-
examples/mp-jwt-bean-validation/pom.xml | 2 +-
examples/mp-rest-jwt-jwk/pom.xml | 2 +-
examples/mp-rest-jwt-public-key/pom.xml | 2 +-
examples/multi-jpa-provider-testing/pom.xml | 2 +-
.../org/superbiz/enricher/maven/Enrichers.java | 4 ++--
.../resources-jmx-ejb/pom.xml | 2 +-
.../simple-ear/moviefun-functional-tests/pom.xml | 2 +-
examples/simple-jms-context/pom.xml | 2 +-
examples/simple-jms/pom.xml | 2 +-
examples/websocket-jms/pom.xml | 2 +-
21 files changed, 51 insertions(+), 31 deletions(-)
diff --git a/arquillian/functional-tests/spring-cxf-tomee-4332/pom.xml
b/arquillian/functional-tests/spring-cxf-tomee-4332/pom.xml
index 087fd2a8a5..6508cc4f92 100644
--- a/arquillian/functional-tests/spring-cxf-tomee-4332/pom.xml
+++ b/arquillian/functional-tests/spring-cxf-tomee-4332/pom.xml
@@ -31,7 +31,8 @@
<name>TomEE :: Arquillian :: Functional Tests :: Spring CXF Test</name>
<properties>
- <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>3.3.2</version.shrinkwrap.resolver>
+ <junit.jupiter.version>5.10.5</junit.jupiter.version>
</properties>
<dependencies>
@@ -39,6 +40,13 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>3.1.11</version>
+
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -69,9 +77,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
- <version>1.9.1.Final</version>
+ <groupId>org.jboss.arquillian.junit5</groupId>
+ <artifactId>arquillian-junit5-container</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -85,6 +92,19 @@
<artifactId>arquillian-tomee-remote</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit.jupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit.jupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<dependencyManagement>
<dependencies>
diff --git
a/arquillian/functional-tests/spring-cxf-tomee-4332/src/test/java/org/example/spring/SpringWebappTest.java
b/arquillian/functional-tests/spring-cxf-tomee-4332/src/test/java/org/example/spring/SpringWebappTest.java
index aa4775c15e..1ddcc7009d 100644
---
a/arquillian/functional-tests/spring-cxf-tomee-4332/src/test/java/org/example/spring/SpringWebappTest.java
+++
b/arquillian/functional-tests/spring-cxf-tomee-4332/src/test/java/org/example/spring/SpringWebappTest.java
@@ -17,21 +17,21 @@
package org.example.spring;
import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.junit5.ArquillianExtension;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.resolver.api.maven.archive.importer.MavenImporter;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-@RunWith(Arquillian.class)
+@ExtendWith(ArquillianExtension.class)
public class SpringWebappTest {
@ArquillianResource
@@ -63,7 +63,7 @@ public class SpringWebappTest {
os.close();
final String output = new String(os.toByteArray(), "UTF-8");
- Assert.assertNotNull("Response shouldn't be null", output);
- Assert.assertTrue("Output should contain: " + expectedOutput + "\n" +
output, output.contains(expectedOutput));
+ Assertions.assertNotNull("Response shouldn't be null", output);
+ Assertions.assertTrue(output.contains(expectedOutput), "Output should
contain: " + expectedOutput + "\n" + output);
}
}
diff --git a/examples/activemq-multiple-brokers/pom.xml
b/examples/activemq-multiple-brokers/pom.xml
index e1b5bd454d..34c443a67f 100644
--- a/examples/activemq-multiple-brokers/pom.xml
+++ b/examples/activemq-multiple-brokers/pom.xml
@@ -26,7 +26,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tomee.version>10.0.0-M4-SNAPSHOT</tomee.version>
- <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>3.3.2</version.shrinkwrap.resolver>
</properties>
<build>
<finalName>${project.artifactId}</finalName>
diff --git a/examples/connector-ear/connector-sample-functional-tests/pom.xml
b/examples/connector-ear/connector-sample-functional-tests/pom.xml
index 67c9ad86dc..d2ab97588f 100644
--- a/examples/connector-ear/connector-sample-functional-tests/pom.xml
+++ b/examples/connector-ear/connector-sample-functional-tests/pom.xml
@@ -28,7 +28,7 @@
<packaging>jar</packaging>
<name>TomEE :: Connector Examples :: Connector in EAR :: Functional
Tests</name>
<properties>
- <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>3.3.2</version.shrinkwrap.resolver>
</properties>
<dependencyManagement>
<dependencies>
diff --git a/examples/connector-war/pom.xml b/examples/connector-war/pom.xml
index bbfa59d56e..39ab9f7dc1 100644
--- a/examples/connector-war/pom.xml
+++ b/examples/connector-war/pom.xml
@@ -20,7 +20,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tomee.version>10.0.0-M4-SNAPSHOT</tomee.version>
- <version.shrinkwrap.resolver>3.1.4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>3.3.2</version.shrinkwrap.resolver>
</properties>
<repositories>
<repository>
diff --git a/examples/datasource-versioning/pom.xml
b/examples/datasource-versioning/pom.xml
index 075ca5c4b9..ee2293c9fc 100644
--- a/examples/datasource-versioning/pom.xml
+++ b/examples/datasource-versioning/pom.xml
@@ -105,7 +105,7 @@
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-bom</artifactId>
- <version>2.1.0</version>
+ <version>3.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
diff --git a/examples/jpa-hibernate-arquillian/pom.xml
b/examples/jpa-hibernate-arquillian/pom.xml
index 94f7d5d3d0..11d3674fe9 100644
--- a/examples/jpa-hibernate-arquillian/pom.xml
+++ b/examples/jpa-hibernate-arquillian/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-bom</artifactId>
- <version>3.1.4</version>
+ <version>3.3.2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
diff --git a/examples/moviefun-rest/pom.xml b/examples/moviefun-rest/pom.xml
index 0f318b2aa8..db386ca73d 100644
--- a/examples/moviefun-rest/pom.xml
+++ b/examples/moviefun-rest/pom.xml
@@ -20,7 +20,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tomee.version>10.0.0-M4-SNAPSHOT</tomee.version>
- <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>3.3.2</version.shrinkwrap.resolver>
</properties>
<repositories>
<repository>
diff --git a/examples/moviefun/pom.xml b/examples/moviefun/pom.xml
index d205ac0cd2..a42914eee6 100644
--- a/examples/moviefun/pom.xml
+++ b/examples/moviefun/pom.xml
@@ -20,7 +20,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tomee.version>10.0.0-M4-SNAPSHOT</tomee.version>
- <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>3.3.2</version.shrinkwrap.resolver>
</properties>
<repositories>
<repository>
diff --git a/examples/mp-config-source-database/pom.xml
b/examples/mp-config-source-database/pom.xml
index 3c50baaf43..d5828b53e6 100644
--- a/examples/mp-config-source-database/pom.xml
+++ b/examples/mp-config-source-database/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <version>2.1.0</version>
+ <version>3.3.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/examples/mp-jwt-bean-validation-strongly-typed/pom.xml
b/examples/mp-jwt-bean-validation-strongly-typed/pom.xml
index 274abbf1d3..bcdd34f98d 100644
--- a/examples/mp-jwt-bean-validation-strongly-typed/pom.xml
+++ b/examples/mp-jwt-bean-validation-strongly-typed/pom.xml
@@ -27,7 +27,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.jakartaee-api>10.0</version.jakartaee-api>
<tomee.version>10.0.0-M4-SNAPSHOT</tomee.version>
- <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>3.3.2</version.shrinkwrap.resolver>
<mp-jwt.version>1.1</mp-jwt.version>
</properties>
<build>
diff --git a/examples/mp-jwt-bean-validation/pom.xml
b/examples/mp-jwt-bean-validation/pom.xml
index c2c33fdad8..184490bd5e 100644
--- a/examples/mp-jwt-bean-validation/pom.xml
+++ b/examples/mp-jwt-bean-validation/pom.xml
@@ -27,7 +27,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.jakartaee-api>10.0</version.jakartaee-api>
<tomee.version>10.0.0-M4-SNAPSHOT</tomee.version>
- <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>3.3.2</version.shrinkwrap.resolver>
<mp-jwt.version>1.1</mp-jwt.version>
</properties>
<build>
diff --git a/examples/mp-rest-jwt-jwk/pom.xml b/examples/mp-rest-jwt-jwk/pom.xml
index e364d84662..44e1a48082 100644
--- a/examples/mp-rest-jwt-jwk/pom.xml
+++ b/examples/mp-rest-jwt-jwk/pom.xml
@@ -26,7 +26,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tomee.version>10.0.0-M4-SNAPSHOT</tomee.version>
- <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>3.3.2</version.shrinkwrap.resolver>
</properties>
<build>
<defaultGoal>install</defaultGoal>
diff --git a/examples/mp-rest-jwt-public-key/pom.xml
b/examples/mp-rest-jwt-public-key/pom.xml
index 9698db5e97..7830d9f43c 100644
--- a/examples/mp-rest-jwt-public-key/pom.xml
+++ b/examples/mp-rest-jwt-public-key/pom.xml
@@ -29,7 +29,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tomee.version>10.0.0-M4-SNAPSHOT</tomee.version>
<version.jakartaee-api>10.0</version.jakartaee-api>
- <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>3.3.2</version.shrinkwrap.resolver>
<mp-jwt.version>1.1</mp-jwt.version>
</properties>
diff --git a/examples/multi-jpa-provider-testing/pom.xml
b/examples/multi-jpa-provider-testing/pom.xml
index 6a119294c3..11b72f178d 100644
--- a/examples/multi-jpa-provider-testing/pom.xml
+++ b/examples/multi-jpa-provider-testing/pom.xml
@@ -111,7 +111,7 @@
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <version>2.0.0</version>
+ <version>3.3.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/maven/Enrichers.java
b/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/maven/Enrichers.java
index 8fbaa94d38..9db7b3533e 100644
---
a/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/maven/Enrichers.java
+++
b/examples/multi-jpa-provider-testing/src/test/java/org/superbiz/enricher/maven/Enrichers.java
@@ -37,8 +37,8 @@ public final class Enrichers {
try {
// try offline first since it is generally faster
- CACHE.put(pom, Maven.resolver()
- .offline(true)
+ CACHE.put(pom, Maven.configureResolver()
+ .workOffline()
.loadPomFromFile(pom)
.importCompileAndRuntimeDependencies().resolve().withTransitivity()
.asFile());
diff --git a/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
b/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
index 2140bb1496..685df02c13 100644
--- a/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
+++ b/examples/resources-jmx-example/resources-jmx-ejb/pom.xml
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <version>2.2.0-beta-2</version>
+ <version>3.3.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git a/examples/simple-ear/moviefun-functional-tests/pom.xml
b/examples/simple-ear/moviefun-functional-tests/pom.xml
index 38e12d5288..e2273c428c 100644
--- a/examples/simple-ear/moviefun-functional-tests/pom.xml
+++ b/examples/simple-ear/moviefun-functional-tests/pom.xml
@@ -31,7 +31,7 @@
<name>TomEE :: Examples :: Simple EAR :: Functional Tests</name>
<properties>
- <version.shrinkwrap.resolver>3.1.4</version.shrinkwrap.resolver>
+ <version.shrinkwrap.resolver>3.3.2</version.shrinkwrap.resolver>
</properties>
<dependencyManagement>
diff --git a/examples/simple-jms-context/pom.xml
b/examples/simple-jms-context/pom.xml
index 067a216261..90ec322502 100644
--- a/examples/simple-jms-context/pom.xml
+++ b/examples/simple-jms-context/pom.xml
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <version>2.1.0</version>
+ <version>3.3.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/examples/simple-jms/pom.xml b/examples/simple-jms/pom.xml
index 91af8cfcb1..d3e5c14687 100644
--- a/examples/simple-jms/pom.xml
+++ b/examples/simple-jms/pom.xml
@@ -136,7 +136,7 @@
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <version>2.1.0</version>
+ <version>3.3.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/examples/websocket-jms/pom.xml b/examples/websocket-jms/pom.xml
index 19fd106ed1..5ec0140c59 100644
--- a/examples/websocket-jms/pom.xml
+++ b/examples/websocket-jms/pom.xml
@@ -113,7 +113,7 @@
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <version>2.1.0</version>
+ <version>3.3.2</version>
<scope>test</scope>
</dependency>
<dependency>
