Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,10 @@ private void createMavenPom(Path settings, Path profile, Path pom, Set<String> d

Properties prop = new CamelCaseOrderedProperties();
RuntimeUtil.loadProperties(prop, settings);
String repos = getMavenRepositories(settings, prop, camelSpringBootVersion);
String sbVersion = camelSpringBootVersion != null ? camelSpringBootVersion : camelVersion;
String repos = getMavenRepositories(settings, prop, sbVersion);

CamelCatalog catalog = CatalogLoader.loadSpringBootCatalog(repos, camelSpringBootVersion, download);
CamelCatalog catalog = CatalogLoader.loadSpringBootCatalog(repos, sbVersion, download);
if (ObjectHelper.isEmpty(camelVersion)) {
camelVersion = catalog.getLoadedVersion();
}
Expand Down Expand Up @@ -302,9 +303,10 @@ private void createBuildGradle(Path settings, Path gradleBuild, Set<String> deps

Properties prop = new CamelCaseOrderedProperties();
RuntimeUtil.loadProperties(prop, settings);
String repos = getMavenRepositories(settings, prop, camelSpringBootVersion);
String sbVersion = camelSpringBootVersion != null ? camelSpringBootVersion : camelVersion;
String repos = getMavenRepositories(settings, prop, sbVersion);

CamelCatalog catalog = CatalogLoader.loadSpringBootCatalog(repos, camelSpringBootVersion, download);
CamelCatalog catalog = CatalogLoader.loadSpringBootCatalog(repos, sbVersion, download);
String camelVersion = catalog.getLoadedVersion();

context = context.replaceFirst("\\{\\{ \\.GroupId }}", ids[0]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import io.fabric8.openshift.client.OpenShiftClient;
import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
import org.apache.camel.util.StringHelper;
import org.codehaus.plexus.util.ExceptionUtils;
import picocli.CommandLine;

import static org.apache.camel.dsl.jbang.core.commands.kubernetes.KubernetesHelper.getKubernetesClient;
Expand Down Expand Up @@ -100,7 +99,11 @@ public Integer doCall() throws Exception {
}
} catch (Exception ex) {
// there could be various chained exceptions, so we want to get the root cause
printer().println("Error trying to delete the app: " + ExceptionUtils.getRootCause(ex));
Throwable rootCause = ex;
while (rootCause.getCause() != null) {
rootCause = rootCause.getCause();
}
printer().println("Error trying to delete the app: " + rootCause);
return 1;
}
return 0;
Expand Down
69 changes: 12 additions & 57 deletions tooling/camel-tooling-maven/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,68 +47,23 @@
<artifactId>camel-support</artifactId>
</dependency>

<!-- MIMA - Minimal Maven -->
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>${jakarta-inject-version}</version>
</dependency>

<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>

<!-- maven / maven resolver -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-resolver-provider</artifactId>
<version>${maven-version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings-builder</artifactId>
<version>${maven-version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
<version>${maven-resolver-version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-spi</artifactId>
<version>${maven-resolver-version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-impl</artifactId>
<version>${maven-resolver-version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-connector-basic</artifactId>
<version>${maven-resolver-version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-file</artifactId>
<version>${maven-resolver-version}</version>
<groupId>eu.maveniverse.maven.mima</groupId>
<artifactId>context</artifactId>
<version>2.4.39</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-http</artifactId>
<version>${maven-resolver-version}</version>
<exclusions>
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
</exclusions>
<groupId>eu.maveniverse.maven.mima.runtime</groupId>
<artifactId>embedded-maven</artifactId>
<version>2.4.39</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-util</artifactId>
<version>${maven-resolver-version}</version>
<groupId>eu.maveniverse.maven.mima.runtime</groupId>
<artifactId>standalone-static</artifactId>
<version>2.4.39</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Expand Down
Loading