This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new f66072fa59a camel-jbang - Fix version list command for known repos
f66072fa59a is described below
commit f66072fa59a5ff68898c78e8ba81405fb11ecfec
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Dec 6 07:15:33 2023 +0100
camel-jbang - Fix version list command for known repos
---
.../camel/dsl/jbang/core/commands/version/VersionList.java | 2 +-
.../org/apache/camel/main/download/DependencyDownloader.java | 6 ++++++
.../apache/camel/main/download/MavenDependencyDownloader.java | 10 ++++++++++
.../java/org/apache/camel/tooling/maven/MavenDownloader.java | 10 ++++++++++
.../org/apache/camel/tooling/maven/MavenDownloaderImpl.java | 10 ++++++++++
5 files changed, 37 insertions(+), 1 deletion(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionList.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionList.java
index 37ee89ca9b0..5b91b9fa2e5 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionList.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionList.java
@@ -110,7 +110,7 @@ public class VersionList extends CamelCommand {
a = "camel-quarkus-catalog";
}
- RepositoryResolver rr =
main.getCamelContext().hasService(RepositoryResolver.class);
+ RepositoryResolver rr = downloader.getRepositoryResolver();
if (rr != null) {
repo = rr.resolveRepository(repo);
}
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloader.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloader.java
index ad29b641e9c..d8917437293 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloader.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloader.java
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.camel.CamelContextAware;
import org.apache.camel.StaticService;
import org.apache.camel.tooling.maven.MavenArtifact;
+import org.apache.camel.tooling.maven.RepositoryResolver;
/**
* To download dependencies at runtime.
@@ -184,4 +185,9 @@ public interface DependencyDownloader extends
CamelContextAware, StaticService {
*/
Collection<DownloadRecord> downloadRecords();
+ /**
+ * Gets the {@link RepositoryResolver}
+ */
+ RepositoryResolver getRepositoryResolver();
+
}
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 3a7ee1a30f6..4e8f113fb09 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
@@ -50,6 +50,7 @@ import org.apache.camel.tooling.maven.MavenDownloaderImpl;
import org.apache.camel.tooling.maven.MavenGav;
import org.apache.camel.tooling.maven.MavenResolutionException;
import org.apache.camel.tooling.maven.RemoteArtifactDownloadListener;
+import org.apache.camel.tooling.maven.RepositoryResolver;
import org.apache.camel.util.FileUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -117,6 +118,15 @@ public class MavenDependencyDownloader extends
ServiceSupport implements Depende
this.knownReposResolver = knownReposResolver;
}
+ @Override
+ public RepositoryResolver getRepositoryResolver() {
+ if (mavenDownloader != null) {
+ return mavenDownloader.getRepositoryResolver();
+ } else {
+ return null;
+ }
+ }
+
@Override
public void addDownloadListener(DownloadListener downloadListener) {
CamelContextAware.trySetCamelContext(downloadListener,
getCamelContext());
diff --git
a/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenDownloader.java
b/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenDownloader.java
index 6e53ed3e6c2..edae817ebb9 100644
---
a/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenDownloader.java
+++
b/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenDownloader.java
@@ -91,4 +91,14 @@ public interface MavenDownloader {
*/
void setMavenSettingsLocation(String mavenSettings);
+ /**
+ * Gets the repository resolver.
+ */
+ RepositoryResolver getRepositoryResolver();
+
+ /**
+ * Sets a custom repository resolver.
+ */
+ void setRepositoryResolver(RepositoryResolver repositoryResolver);
+
}
diff --git
a/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenDownloaderImpl.java
b/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenDownloaderImpl.java
index dd2c4d6c322..04af434b7a2 100644
---
a/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenDownloaderImpl.java
+++
b/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenDownloaderImpl.java
@@ -1294,6 +1294,16 @@ public class MavenDownloaderImpl extends ServiceSupport
implements MavenDownload
this.mavenSettingsSecurity = mavenSettingsSecurity;
}
+ @Override
+ public RepositoryResolver getRepositoryResolver() {
+ return repositoryResolver;
+ }
+
+ @Override
+ public void setRepositoryResolver(RepositoryResolver repositoryResolver) {
+ this.repositoryResolver = repositoryResolver;
+ }
+
@Override
public void setRepos(String repos) {
this.repos = repos;
