This is an automated email from the ASF dual-hosted git repository. vavrtom pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push: new 746eac874c QPID-8580: [Broker-J] Fixed maven-resolver version conflict (#160) 746eac874c is described below commit 746eac874cfcef2a31f95f61c6dc2096c356936f Author: vavrtom <vavricka.to...@gmail.com> AuthorDate: Thu Nov 10 06:52:15 2022 +0100 QPID-8580: [Broker-J] Fixed maven-resolver version conflict (#160) --- pom.xml | 14 ++++++++++---- systests/end-to-end-conversion-tests/pom.xml | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index e28b4c73d7..a9664506d2 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ <mockito-version>4.8.1</mockito-version> <netty-version>4.1.84.Final</netty-version> <hamcrest-version>2.2</hamcrest-version> - <maven-core-version>3.8.6</maven-core-version> + <maven-resolver-provider-version>3.8.6</maven-resolver-provider-version> <maven-resolver-version>1.8.2</maven-resolver-version> <httpclient-version>4.5.13</httpclient-version> <qpid-jms-client-version>0.61.0</qpid-jms-client-version> @@ -752,12 +752,18 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> - <version>${maven-core-version}</version> + <artifactId>maven-resolver-provider</artifactId> + <version>${maven-resolver-provider-version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.maven.resolver</groupId> - <artifactId>maven-resolver-api</artifactId> + <artifactId>maven-resolver-impl</artifactId> <version>${maven-resolver-version}</version> </dependency> <dependency> diff --git a/systests/end-to-end-conversion-tests/pom.xml b/systests/end-to-end-conversion-tests/pom.xml index 767e4a4257..b48b5f2fac 100644 --- a/systests/end-to-end-conversion-tests/pom.xml +++ b/systests/end-to-end-conversion-tests/pom.xml @@ -51,11 +51,11 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> + <artifactId>maven-resolver-provider</artifactId> </dependency> <dependency> <groupId>org.apache.maven.resolver</groupId> - <artifactId>maven-resolver-api</artifactId> + <artifactId>maven-resolver-impl</artifactId> </dependency> <dependency> <groupId>org.apache.maven.resolver</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org