You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/04/11 11:29:02 UTC
[camel] branch main updated (d23bb2f3b47 -> a363c16f7e3)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from d23bb2f3b47 Replaced string concatenation in loop with StringJoiner. PR for components (#9842)
new fc1c238bfe3 camel-jbang - Upgrade maven plugins in export
new a363c16f7e3 CAMEL-19259: camel-maven-plugin - Use configured main-class instead of KameletMain
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel-jbang-core/src/main/resources/templates/main-pom.tmpl | 4 ++--
.../camel-jbang-core/src/main/resources/templates/quarkus-pom.tmpl | 4 ++--
.../src/main/java/org/apache/camel/maven/RunMojo.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
[camel] 01/02: camel-jbang - Upgrade maven plugins in export
Posted by da...@apache.org.
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
commit fc1c238bfe3215fff497d29411b98d17dae3a516
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Apr 11 13:17:06 2023 +0200
camel-jbang - Upgrade maven plugins in export
---
.../camel-jbang-core/src/main/resources/templates/main-pom.tmpl | 4 ++--
.../camel-jbang-core/src/main/resources/templates/quarkus-pom.tmpl | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/main-pom.tmpl b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/main-pom.tmpl
index 7fb3b256936..36f82169413 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/main-pom.tmpl
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/main-pom.tmpl
@@ -72,7 +72,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.10.1</version>
+ <version>3.11.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
@@ -98,7 +98,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.5.0</version>
<configuration>
<descriptors>
<descriptor>src/main/resources/assembly/runner.xml</descriptor>
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/quarkus-pom.tmpl b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/quarkus-pom.tmpl
index 46728c8107a..8d2cc9fd645 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/quarkus-pom.tmpl
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/quarkus-pom.tmpl
@@ -9,7 +9,7 @@
<version>{{ .Version }}</version>
<properties>
- <compiler-plugin.version>3.10.1</compiler-plugin.version>
+ <compiler-plugin.version>3.11.0</compiler-plugin.version>
<failsafe.useModulePath>false</failsafe.useModulePath>
<maven.compiler.release>{{ .JavaVersion }}</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -17,7 +17,7 @@
<quarkus.platform.group-id>{{ .QuarkusGroupId }}</quarkus.platform.group-id>
<quarkus.platform.artifact-id>{{ .QuarkusArtifactId }}</quarkus.platform.artifact-id>
<quarkus.platform.version>{{ .QuarkusVersion }}</quarkus.platform.version>
- <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+ <surefire-plugin.version>3.0.0</surefire-plugin.version>
</properties>
<dependencyManagement>
[camel] 02/02: CAMEL-19259: camel-maven-plugin - Use configured main-class instead of KameletMain
Posted by da...@apache.org.
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
commit a363c16f7e34214c1854b145c7405bf993e0cf73
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Apr 11 13:28:21 2023 +0200
CAMEL-19259: camel-maven-plugin - Use configured main-class instead of KameletMain
---
.../src/main/java/org/apache/camel/maven/RunMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
index c2283c25e0f..5556991f853 100644
--- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
+++ b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
@@ -342,7 +342,7 @@ public class RunMojo extends AbstractExecMojo {
args.addAll(Arrays.asList(arguments));
}
- if (usingKameletMain) {
+ if (mainClass == null && usingKameletMain) {
mainClass = "org.apache.camel.main.KameletMain";
// must include plugin dependencies for kamelet
extraPluginDependencyArtifactId = "camel-kamelet-main";