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 2022/06/14 07:06:30 UTC
[camel] branch main updated (031571c3238 -> d06ad7daf25)
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 031571c3238 Sync deps
new bd419a40308 camel-jbang - package uber-jar is deprecated in favour of export.
new d06ad7daf25 camel-jbang - package uber-jar is deprecated in favour of export.
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:
.../modules/ROOT/pages/camel-jbang.adoc | 33 ----------------------
.../dsl/jbang/core/commands/CamelJBangMain.java | 4 +--
.../camel/dsl/jbang/core/commands/Package.java | 1 +
.../apache/camel/dsl/jbang/core/commands/Run.java | 6 ----
.../camel/dsl/jbang/core/commands/UberJar.java | 1 +
.../java/org/apache/camel/main/KameletMain.java | 22 ---------------
6 files changed, 4 insertions(+), 63 deletions(-)
[camel] 02/02: camel-jbang - package uber-jar is deprecated in favour of 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 d06ad7daf2594a8b1de20987ec7ef695030787f5
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jun 14 09:06:19 2022 +0200
camel-jbang - package uber-jar is deprecated in favour of export.
---
.../apache/camel/dsl/jbang/core/commands/Run.java | 6 ------
.../java/org/apache/camel/main/KameletMain.java | 22 ----------------------
2 files changed, 28 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 2d70614e72f..4f5e953bc85 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -108,9 +108,6 @@ class Run extends CamelCommand {
@Option(names = {"--download"}, defaultValue = "true", description = "Whether to allow automatic downloaded JAR dependencies, over the internet, that Camel requires.")
boolean download = true;
- @Option(names = {"--downloadVerbose"}, description = "Whether to include verbose details when downloading.")
- boolean downloadVerbose;
-
@Option(names = { "--name" }, defaultValue = "CamelJBang", description = "The name of the Camel application")
String name;
@@ -297,8 +294,6 @@ class Run extends CamelCommand {
}
repos = profileProperties.getProperty("camel.jbang.repos", repos);
download = "true".equals(profileProperties.getProperty("camel.jbang.download", download ? "true" : "false"));
- downloadVerbose = "true"
- .equals(profileProperties.getProperty("camel.jbang.downloadVerbose", downloadVerbose ? "true" : "false"));
}
// if no specific file to run then try to auto-detect
@@ -323,7 +318,6 @@ class Run extends CamelCommand {
final Set<String> downloaded = new HashSet<>();
main.setRepos(repos);
main.setDownload(download);
- main.setDownloadVerbose(downloadVerbose);
main.setDownloadListener(new DownloadListener() {
@Override
public void onDownloadDependency(String groupId, String artifactId, String version) {
diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
index 506f55a3835..918f1a24762 100644
--- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
+++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
@@ -38,7 +38,6 @@ public class KameletMain extends MainCommandLineSupport {
protected final MainRegistry registry = new MainRegistry();
private boolean download = true;
- private boolean downloadVerbose;
private String repos;
private boolean stub;
private DownloadListener downloadListener;
@@ -118,17 +117,6 @@ public class KameletMain extends MainCommandLineSupport {
this.download = download;
}
- public boolean isDownloadVerbose() {
- return downloadVerbose;
- }
-
- /**
- * Whether to include verbose details when downloading
- */
- public void setDownloadVerbose(boolean downloadVerbose) {
- this.downloadVerbose = downloadVerbose;
- }
-
public String getRepos() {
return repos;
}
@@ -190,16 +178,6 @@ public class KameletMain extends MainCommandLineSupport {
}
}
});
- addOption(new ParameterOption(
- "downloadVerbose", "downloadVerbose", "Whether to include verbose details when downloading",
- "downloadVerbose") {
- @Override
- protected void doProcess(String arg, String parameter, LinkedList<String> remainingArgs) {
- if (arg.equals("-downloadVerbose")) {
- setDownloadVerbose("true".equalsIgnoreCase(parameter));
- }
- }
- });
addOption(new ParameterOption(
"repos", "repositories", "Additional maven repositories for download on-demand.",
"repos") {
[camel] 01/02: camel-jbang - package uber-jar is deprecated in favour of 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 bd419a403086d7829809c61f0f81551394a796e5
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jun 14 09:04:13 2022 +0200
camel-jbang - package uber-jar is deprecated in favour of export.
---
.../modules/ROOT/pages/camel-jbang.adoc | 33 ----------------------
.../dsl/jbang/core/commands/CamelJBangMain.java | 4 +--
.../camel/dsl/jbang/core/commands/Package.java | 1 +
.../camel/dsl/jbang/core/commands/UberJar.java | 1 +
4 files changed, 4 insertions(+), 35 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
index 437d17205f3..cd73748b602 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
@@ -174,15 +174,6 @@ If you do not want Camel JBang to download over the internet, you can turn this
camel run foo.java --download=false
----
-When Camel JBang download dependencies it will only report the top level dependency being downloaded.
-You can enable verbose logging that will also log activity for each transitive dependency,
-using the `--downloadVerbose` option as shown:
-
-[source,bash]
-----
-camel run foo.java --downloadVerbose=true
-----
-
=== Using 3rd-party Maven repositories
Camel JBang will download from local repository first, and then online from Maven Central.
@@ -583,30 +574,6 @@ This make it quick to implement a Camel route for a given operation.
See the https://github.com/apache/camel-kamelets-examples/tree/main/jbang/open-api[open-api example] for more details.
-== Packaging as uber-jar
-
-The Camel JBang application can be packaged as a standalone _uber-jar_ without the need for JBang to run the application.
-
-You simply do this by
-
-[source,bash]
-----
-camel package uber-jar
-----
-
-Which will generate `camel-runner.jar` as the output file.
-You can then run this JAR with Java that comes with everything included inside the .jar file.
-
-You can run the JAR with Java as follows:
-
-[source,bash]
-----
-java -jar camel-runner.jar
-----
-
-NOTE: Packaging as uber-jar does not support using Camel K modeline style configurations.
-It is better practice specifying configurations in external files such as `application.properties`.
-
== Creating Projects
You can _export_ your Camel JBang application to a traditional Java based project such as Spring Boot or Quarkus.
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
index 96e47349fa9..cbd58a2562d 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
@@ -38,8 +38,6 @@ public class CamelJBangMain implements Callable<Integer> {
.addSubcommand("init", new CommandLine(new Init(main)))
.addSubcommand("bind", new CommandLine(new Bind(main)))
.addSubcommand("pipe", new CommandLine(new Pipe(main)))
- .addSubcommand("package", new CommandLine(new Package(main))
- .addSubcommand("uber-jar", new CommandLine(new UberJar(main))))
.addSubcommand("generate", new CommandLine(new CodeGenerator(main))
.addSubcommand("rest", new CommandLine(new CodeRestGenerator(main))))
.addSubcommand("export", new CommandLine(new Export(main))
@@ -47,6 +45,8 @@ public class CamelJBangMain implements Callable<Integer> {
.addSubcommand("spring-boot", new CommandLine(new ExportSpringBoot(main)))
.addSubcommand("quarkus", new CommandLine(new ExportQuarkus(main))));
/* // TODO: do not show commands that are deprecated and to be either removed or reworked
+ .addSubcommand("package", new CommandLine(new Package(main))
+ .addSubcommand("uber-jar", new CommandLine(new UberJar(main))))
.addSubcommand("build", new CommandLine(new Build(main))
.addSubcommand("manifests", new CommandLine(new Manifest(main)))
.addSubcommand("image", new CommandLine(new Image(main))))
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Package.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Package.java
index 27ed776d055..8d01405194c 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Package.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Package.java
@@ -20,6 +20,7 @@ import picocli.CommandLine;
import picocli.CommandLine.Command;
@Command(name = "package", description = "Package Camel application (use --help to see sub commands)")
+@Deprecated
class Package extends CamelCommand {
public Package(CamelJBangMain main) {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/UberJar.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/UberJar.java
index 4e8616bdf90..3e1ceda1589 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/UberJar.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/UberJar.java
@@ -47,6 +47,7 @@ import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
@Command(name = "uber-jar", description = "Package application as a single uber-jar")
+@Deprecated
class UberJar extends CamelCommand {
private static final String BUILD_DIR = ".camel-jbang/work";