You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gg...@apache.org on 2023/01/16 13:45:41 UTC
[camel] branch camel-3.x updated: [CAMEL-18880] Upgrade to maven-resolver 1.9.4
This is an automated email from the ASF dual-hosted git repository.
ggrzybek pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.x by this push:
new dd33257ce49 [CAMEL-18880] Upgrade to maven-resolver 1.9.4
dd33257ce49 is described below
commit dd33257ce497863ae66fd4a52c7f325ad81f168a
Author: Grzegorz Grzybek <gr...@gmail.com>
AuthorDate: Mon Jan 16 13:38:47 2023 +0100
[CAMEL-18880] Upgrade to maven-resolver 1.9.4
---
.../camel/main/download/MavenDependencyDownloader.java | 15 ++++++---------
parent/pom.xml | 2 +-
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/MavenDependencyDownloader.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/MavenDependencyDownloader.java
index 64cb9f4a4bd..53bfd90865a 100644
--- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/MavenDependencyDownloader.java
+++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/MavenDependencyDownloader.java
@@ -145,9 +145,9 @@ import org.eclipse.aether.internal.impl.filter.DefaultRemoteRepositoryFilterMana
import org.eclipse.aether.internal.impl.slf4j.Slf4jLoggerFactory;
import org.eclipse.aether.internal.impl.synccontext.DefaultSyncContextFactory;
import org.eclipse.aether.internal.impl.synccontext.named.NameMapper;
+import org.eclipse.aether.internal.impl.synccontext.named.NameMappers;
import org.eclipse.aether.internal.impl.synccontext.named.NamedLockFactoryAdapterFactory;
import org.eclipse.aether.internal.impl.synccontext.named.NamedLockFactoryAdapterFactoryImpl;
-import org.eclipse.aether.internal.impl.synccontext.named.providers.GAVNameMapperProvider;
import org.eclipse.aether.named.NamedLockFactory;
import org.eclipse.aether.named.providers.FileLockNamedLockFactory;
import org.eclipse.aether.named.providers.LocalReadWriteLockNamedLockFactory;
@@ -672,14 +672,11 @@ public class MavenDependencyDownloader extends ServiceSupport implements Depende
registry.bind(NamedLockFactory.class, LocalReadWriteLockNamedLockFactory.class);
registry.bind(NamedLockFactory.class, NoopNamedLockFactory.class);
registry.bind(NamedLockFactory.class, LocalSemaphoreNamedLockFactory.class);
- // 1.9.2
- registry.bind(GAVNameMapperProvider.NAME, NameMapper.class, new GAVNameMapperProvider().get());
- // 1.9.4 (soon)
- // registry.bind(NameMappers.GAV_NAME, NameMapper.class, NameMappers.gavNameMapper());
- // registry.bind(NameMappers.STATIC_NAME, NameMapper.class, NameMappers.staticNameMapper());
- // registry.bind(NameMappers.DISCRIMINATING_NAME, NameMapper.class, NameMappers.discriminatingNameMapper());
- // registry.bind(NameMappers.FILE_GAV_NAME, NameMapper.class, NameMappers.fileGavNameMapper());
- // registry.bind(NameMappers.FILE_HGAV_NAME, NameMapper.class, NameMappers.fileHashingGavNameMapper());
+ registry.bind(NameMappers.GAV_NAME, NameMapper.class, NameMappers.gavNameMapper());
+ registry.bind(NameMappers.STATIC_NAME, NameMapper.class, NameMappers.staticNameMapper());
+ registry.bind(NameMappers.DISCRIMINATING_NAME, NameMapper.class, NameMappers.discriminatingNameMapper());
+ registry.bind(NameMappers.FILE_GAV_NAME, NameMapper.class, NameMappers.fileGavNameMapper());
+ registry.bind(NameMappers.FILE_HGAV_NAME, NameMapper.class, NameMappers.fileHashingGavNameMapper());
// requirements of org.apache.maven.repository.internal.DefaultVersionResolver (these are deprecated)
registry.bind(org.eclipse.aether.impl.SyncContextFactory.class,
diff --git a/parent/pom.xml b/parent/pom.xml
index 4ade07342df..335da04ab88 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -385,7 +385,7 @@
<maven-resources-plugin-version>3.2.0</maven-resources-plugin-version>
<maven-reporting-api-version>2.2.1</maven-reporting-api-version>
<maven-reporting-impl-version>2.0.5</maven-reporting-impl-version>
- <maven-resolver-version>1.9.2</maven-resolver-version>
+ <maven-resolver-version>1.9.4</maven-resolver-version>
<maven-shade-plugin-version>3.4.1</maven-shade-plugin-version>
<maven-shared-utils-plugin-version>3.3.4</maven-shared-utils-plugin-version>
<maven-surefire-report-plugin-version>3.0.0-M4</maven-surefire-report-plugin-version>