You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2021/09/30 05:35:33 UTC

[camel] branch main updated: camel-jbang: work-around not updating during release build

This is an automated email from the ASF dual-hosted git repository.

orpiske 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 ad53024  camel-jbang: work-around not updating during release build
ad53024 is described below

commit ad53024a5d7c30ec535e5d97c7ef81cc6f04f20b
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Wed Sep 29 18:06:31 2021 +0200

    camel-jbang: work-around not updating during release build
---
 dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java      | 14 +++++++-------
 dsl/camel-jbang/camel-jbang-main/pom.xml                   |  3 ---
 .../camel-jbang-main/src/main/jbang/main/CamelJBang.java   | 14 +++++++-------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java b/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
index 9bcbe0e..93b1061 100755
--- a/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
+++ b/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
@@ -18,15 +18,15 @@
  */
 
 //REPOS mavencentral,apache=https://repository.apache.org/snapshots
-//DEPS org.apache.camel:camel-bom:3.12.0-SNAPSHOT@pom
+//DEPS org.apache.camel:camel-bom:${camel.jbang.version:RELEASE}@pom
 //DEPS org.apache.camel:camel-core
-//DEPS org.apache.camel:camel-core-model
 //DEPS org.apache.camel:camel-api
+//DEPS org.apache.camel:camel-core-model
 //DEPS org.apache.camel:camel-main
 //DEPS org.apache.camel:camel-kamelet-main
 //DEPS org.apache.camel:camel-file-watch
 //DEPS org.apache.camel:camel-resourceresolver-github
-//DEPS org.apache.camel:camel-jbang-core:3.12.0-SNAPSHOT
+//DEPS org.apache.camel:camel-jbang-core:${camel.jbang.version:RELEASE}
 //DEPS org.apache.logging.log4j:log4j-api:2.13.3
 //DEPS org.apache.logging.log4j:log4j-core:2.13.3
 //DEPS org.apache.logging.log4j:log4j-slf4j-impl:2.13.3
@@ -287,7 +287,7 @@ class SearchComponents extends AbstractSearch implements Callable<Integer> {
             description = "Where to download the resources from")
     private String resourceLocation;
 
-    @Option(names = { "--branch" }, defaultValue = "camel-3.12.0-SNAPSHOT", hidden = true,
+    @Option(names = { "--branch" }, defaultValue = "main", hidden = true,
             description = "The branch to use when downloading or searching resources (mostly used for development/testing)")
     private String branch;
 
@@ -343,7 +343,7 @@ class SearchLanguages extends AbstractSearch implements Callable<Integer> {
             description = "Where to download the resources from")
     private String resourceLocation;
 
-    @Option(names = { "--branch" }, defaultValue = "camel-3.12.0-SNAPSHOT", hidden = true,
+    @Option(names = { "--branch" }, defaultValue = "main", hidden = true,
             description = "The branch to use when downloading or searching resources (mostly used for development/testing)")
     private String branch;
 
@@ -398,7 +398,7 @@ class SearchOthers extends AbstractSearch implements Callable<Integer> {
             description = "Where to download the resources from")
     private String resourceLocation;
 
-    @Option(names = { "--branch" }, defaultValue = "camel-3.12.0-SNAPSHOT", hidden = true,
+    @Option(names = { "--branch" }, defaultValue = "main", hidden = true,
             description = "The branch to use when downloading or searching resources (mostly used for development/testing)")
     private String branch;
 
@@ -582,7 +582,7 @@ class InitBinding extends AbstractInitKamelet implements Callable<Integer> {
     }
 }
 
-@Command(name = "CamelJBang", mixinStandardHelpOptions = true, version = "CamelJBang 3.12.0-SNAPSHOT",
+@Command(name = "CamelJBang", mixinStandardHelpOptions = true, version = "CamelJBang",
          description = "A JBang-based Camel app for running Kamelets")
 public class CamelJBang implements Callable<Integer> {
     private static CommandLine commandLine;
diff --git a/dsl/camel-jbang/camel-jbang-main/pom.xml b/dsl/camel-jbang/camel-jbang-main/pom.xml
index aadcaf6..7be3486 100644
--- a/dsl/camel-jbang/camel-jbang-main/pom.xml
+++ b/dsl/camel-jbang/camel-jbang-main/pom.xml
@@ -124,9 +124,6 @@
                         <phase>prepare-package</phase>
                         <configuration>
                             <tasks>
-                                <replace token="${camel.jbang.version}" value="${project.version}" dir="${dist.dir}">
-                                    <include name="**/*.java"/>
-                                </replace>
                                 <replace token="${camel.jbang.log4j2.version}" value="${log4j2-version}" dir="${dist.dir}">
                                     <include name="**/*.java"/>
                                 </replace>
diff --git a/dsl/camel-jbang/camel-jbang-main/src/main/jbang/main/CamelJBang.java b/dsl/camel-jbang/camel-jbang-main/src/main/jbang/main/CamelJBang.java
index 6e61124..358f871 100755
--- a/dsl/camel-jbang/camel-jbang-main/src/main/jbang/main/CamelJBang.java
+++ b/dsl/camel-jbang/camel-jbang-main/src/main/jbang/main/CamelJBang.java
@@ -18,15 +18,15 @@
  */
 
 //REPOS mavencentral,apache=https://repository.apache.org/snapshots
-//DEPS org.apache.camel:camel-bom:${camel.jbang.version}@pom
+//DEPS org.apache.camel:camel-bom:${camel.jbang.version:RELEASE}@pom
 //DEPS org.apache.camel:camel-core
-//DEPS org.apache.camel:camel-core-model
 //DEPS org.apache.camel:camel-api
+//DEPS org.apache.camel:camel-core-model
 //DEPS org.apache.camel:camel-main
 //DEPS org.apache.camel:camel-kamelet-main
 //DEPS org.apache.camel:camel-file-watch
 //DEPS org.apache.camel:camel-resourceresolver-github
-//DEPS org.apache.camel:camel-jbang-core:${camel.jbang.version}
+//DEPS org.apache.camel:camel-jbang-core:${camel.jbang.version:RELEASE}
 //DEPS org.apache.logging.log4j:log4j-api:${camel.jbang.log4j2.version}
 //DEPS org.apache.logging.log4j:log4j-core:${camel.jbang.log4j2.version}
 //DEPS org.apache.logging.log4j:log4j-slf4j-impl:${camel.jbang.log4j2.version}
@@ -287,7 +287,7 @@ class SearchComponents extends AbstractSearch implements Callable<Integer> {
             description = "Where to download the resources from")
     private String resourceLocation;
 
-    @Option(names = { "--branch" }, defaultValue = "camel-${camel.jbang.version}", hidden = true,
+    @Option(names = { "--branch" }, defaultValue = "main", hidden = true,
             description = "The branch to use when downloading or searching resources (mostly used for development/testing)")
     private String branch;
 
@@ -343,7 +343,7 @@ class SearchLanguages extends AbstractSearch implements Callable<Integer> {
             description = "Where to download the resources from")
     private String resourceLocation;
 
-    @Option(names = { "--branch" }, defaultValue = "camel-${camel.jbang.version}", hidden = true,
+    @Option(names = { "--branch" }, defaultValue = "main", hidden = true,
             description = "The branch to use when downloading or searching resources (mostly used for development/testing)")
     private String branch;
 
@@ -398,7 +398,7 @@ class SearchOthers extends AbstractSearch implements Callable<Integer> {
             description = "Where to download the resources from")
     private String resourceLocation;
 
-    @Option(names = { "--branch" }, defaultValue = "camel-${camel.jbang.version}", hidden = true,
+    @Option(names = { "--branch" }, defaultValue = "main", hidden = true,
             description = "The branch to use when downloading or searching resources (mostly used for development/testing)")
     private String branch;
 
@@ -582,7 +582,7 @@ class InitBinding extends AbstractInitKamelet implements Callable<Integer> {
     }
 }
 
-@Command(name = "CamelJBang", mixinStandardHelpOptions = true, version = "CamelJBang ${camel.jbang.version}",
+@Command(name = "CamelJBang", mixinStandardHelpOptions = true, version = "CamelJBang",
          description = "A JBang-based Camel app for running Kamelets")
 public class CamelJBang implements Callable<Integer> {
     private static CommandLine commandLine;