You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2023/03/14 14:36:28 UTC
[camel] branch main updated: Regen for commit ba7e9ae5dd7d415f9d1a1c5a5f2c3d5f7fbb607f
This is an automated email from the ASF dual-hosted git repository.
acosentino 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 b091b6d7b2f Regen for commit ba7e9ae5dd7d415f9d1a1c5a5f2c3d5f7fbb607f
b091b6d7b2f is described below
commit b091b6d7b2f0efbee55db1925f1875c5c596f9c4
Author: oscerd <os...@users.noreply.github.com>
AuthorDate: Tue Mar 14 14:33:20 2023 +0000
Regen for commit ba7e9ae5dd7d415f9d1a1c5a5f2c3d5f7fbb607f
Signed-off-by: GitHub <no...@github.com>
---
.../camel/main/download/MavenDependencyDownloader.java | 9 +++++----
.../org/apache/camel/tooling/maven/MavenDownloader.java | 6 +++---
.../org/apache/camel/tooling/maven/MavenDownloaderImpl.java | 13 +++++++------
3 files changed, 15 insertions(+), 13 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..164d1caeca3 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));
}
@@ -1186,7 +1187,7 @@ public class MavenDownloaderImpl extends ServiceSupport implements MavenDownload
/**
* Configure a location of {@code settings.xml} (when not set, defaults to {@code ~/.m2/settings.xml} unless it's
* explicitly set to {@code "false"}.
- *
+ *
* @param mavenSettings
*/
public void setMavenSettingsLocation(String mavenSettings) {
@@ -1197,7 +1198,7 @@ public class MavenDownloaderImpl extends ServiceSupport implements MavenDownload
* Configure a location of {@code settings-security.xml} (when not set, defaults to
* {@code ~/.m2/settings-security.xml} unless {@link #setMavenSettingsLocation(String)} is set explicitly set to
* {@code "false"}.
- *
+ *
* @param mavenSettingsSecurity
*/
public void setMavenSettingsSecurityLocation(String mavenSettingsSecurity) {
@@ -1206,7 +1207,7 @@ public class MavenDownloaderImpl extends ServiceSupport implements MavenDownload
/**
* Configure comma-separated list of repositories to use (in addition to the ones discovered from Maven settings).
- *
+ *
* @param repos
*/
public void setRepos(String repos) {
@@ -1217,7 +1218,7 @@ public class MavenDownloaderImpl extends ServiceSupport implements MavenDownload
* Set a flag determining Maven update behavior. See the description of {@code -U,--update-snapshots} Maven option.
* When set to {@code true}, Maven metadata (to determine newest SNAPSHOT or RELEASE or LATEST version) is always
* fetched.
- *
+ *
* @param fresh
*/
public void setFresh(boolean fresh) {