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
commit 5c88bce340bade3267be93c173ecef7c7a7e99af Author: Grzegorz Grzybek <gr.grzy...@gmail.com> AuthorDate: Tue Mar 14 10:24:35 2023 +0100 Fixed CS + reformat --- .../apache/camel/main/download/MavenDependencyDownloader.java | 9 +++++---- .../java/org/apache/camel/tooling/maven/MavenDownloader.java | 6 +++--- .../java/org/apache/camel/tooling/maven/MavenDownloaderImpl.java | 5 +++-- 3 files changed, 11 insertions(+), 9 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 2c6bf859c92..60c999b809c 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 @@ -32,20 +32,20 @@ import java.util.Set; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import org.apache.camel.main.util.VersionHelper; -import org.apache.camel.main.util.XmlHelper; -import org.apache.camel.tooling.maven.MavenGav; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.main.util.VersionHelper; +import org.apache.camel.main.util.XmlHelper; import org.apache.camel.support.service.ServiceHelper; import org.apache.camel.support.service.ServiceSupport; import org.apache.camel.tooling.maven.MavenArtifact; import org.apache.camel.tooling.maven.MavenDownloader; 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.util.FileUtil; import org.slf4j.Logger; @@ -286,7 +286,8 @@ public class MavenDependencyDownloader extends ServiceSupport implements Depende } @Override - public List<String[]> resolveAvailableVersions(String groupId, String artifactId, + public List<String[]> resolveAvailableVersions( + String groupId, String artifactId, String minimumVersion, String repo) { String gav = groupId + ":" + artifactId; LOG.debug("DownloadAvailableVersions: {}", gav); 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 ca08ce3d755..b0a4f2eb704 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 @@ -44,9 +44,9 @@ public interface MavenDownloader { /** * Resolves available versions for groupId + artifactId from single remote repository. * - * @param groupId - * @param artifactId - * @param repository external repository to use (defaults to Maven Central if {@code null}) + * @param groupId + * @param artifactId + * @param repository external repository to use (defaults to Maven Central if {@code null}) * @return */ List<MavenGav> resolveAvailableVersions(String groupId, String artifactId, String repository) 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 8b83205f313..4d2682dc829 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 @@ -413,8 +413,9 @@ public class MavenDownloaderImpl extends ServiceSupport implements MavenDownload .build(); // simply configure them in addition to the default repositories - List<RemoteRepository> customResolutionRepository = repositorySystem.newResolutionRepositories(repositorySystemSession, - Collections.singletonList(custom)); + List<RemoteRepository> customResolutionRepository + = repositorySystem.newResolutionRepositories(repositorySystemSession, + Collections.singletonList(custom)); req.setRepository(customResolutionRepository.get(0)); }