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 2021/08/21 11:17:23 UTC
[camel] branch main updated: Revert "camel-jbang: align features to
ensure they match the same version of CamelJBang by default (#5971)"
(#5974)
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
The following commit(s) were added to refs/heads/main by this push:
new 1189f27 Revert "camel-jbang: align features to ensure they match the same version of CamelJBang by default (#5971)" (#5974)
1189f27 is described below
commit 1189f27e0d6f7228ea671d93a13f5773669b3b79
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Aug 21 13:16:08 2021 +0200
Revert "camel-jbang: align features to ensure they match the same version of CamelJBang by default (#5971)" (#5974)
This reverts commit 8fc78df4ba22a5f0f4ffdf7778d6b6db25fff351.
---
.../camel-jbang-main/dist/CamelJBang.java | 20 --------------------
.../src/main/jbang/main/CamelJBang.java | 20 --------------------
2 files changed, 40 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java b/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
index ff013fa..4119b5a 100755
--- a/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
+++ b/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
@@ -235,10 +235,6 @@ class SearchKamelets extends AbstractSearch implements Callable<Integer> {
description = "Where to download the resources from")
private String resourceLocation;
- @Option(names = { "--branch" }, defaultValue = "main", hidden = true,
- description = "The branch to use when downloading resources from (used for development/testing)")
- private String branch;
-
@Override
public void printHeader() {
System.out.printf("%-35s %-45s %s%n", "KAMELET", "DESCRIPTION", "LINK");
@@ -248,7 +244,6 @@ class SearchKamelets extends AbstractSearch implements Callable<Integer> {
@Override
public Integer call() throws Exception {
setResourceLocation(resourceLocation, "camel-kamelets:docs/modules/ROOT/nav.adoc");
- setBranch(branch);
MatchExtractor<Kamelet> matchExtractor;
@@ -287,10 +282,6 @@ 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,
- description = "The branch to use when downloading or searching resources (mostly used for development/testing)")
- private String branch;
-
@Override
public void printHeader() {
System.out.printf("%-35s %-45s %s%n", "COMPONENT", "DESCRIPTION", "LINK");
@@ -300,7 +291,6 @@ class SearchComponents extends AbstractSearch implements Callable<Integer> {
@Override
public Integer call() throws Exception {
setResourceLocation(resourceLocation, "camel:docs/components/modules/ROOT/nav.adoc");
- setBranch(branch);
MatchExtractor<Component> matchExtractor;
if (searchTerm.isEmpty()) {
@@ -343,10 +333,6 @@ 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,
- description = "The branch to use when downloading or searching resources (mostly used for development/testing)")
- private String branch;
-
@Override
public void printHeader() {
System.out.printf("%-35s %-45s %s%n", "LANGUAGE", "DESCRIPTION", "LINK");
@@ -356,7 +342,6 @@ class SearchLanguages extends AbstractSearch implements Callable<Integer> {
@Override
public Integer call() throws Exception {
setResourceLocation(resourceLocation, "camel:docs/components/modules/languages/nav.adoc");
- setBranch(branch);
MatchExtractor<Language> matchExtractor;
if (searchTerm.isEmpty()) {
@@ -398,10 +383,6 @@ 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,
- description = "The branch to use when downloading or searching resources (mostly used for development/testing)")
- private String branch;
-
@Override
public void printHeader() {
System.out.printf("%-35s %-45s %s%n", "COMPONENT", "DESCRIPTION", "LINK");
@@ -411,7 +392,6 @@ class SearchOthers extends AbstractSearch implements Callable<Integer> {
@Override
public Integer call() throws Exception {
setResourceLocation(resourceLocation, "camel:docs/components/modules/others/nav.adoc");
- setBranch(branch);
MatchExtractor<Other> matchExtractor;
if (searchTerm.isEmpty()) {
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 f1d2989..11ffa9a 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
@@ -235,10 +235,6 @@ class SearchKamelets extends AbstractSearch implements Callable<Integer> {
description = "Where to download the resources from")
private String resourceLocation;
- @Option(names = { "--branch" }, defaultValue = "main", hidden = true,
- description = "The branch to use when downloading resources from (used for development/testing)")
- private String branch;
-
@Override
public void printHeader() {
System.out.printf("%-35s %-45s %s%n", "KAMELET", "DESCRIPTION", "LINK");
@@ -248,7 +244,6 @@ class SearchKamelets extends AbstractSearch implements Callable<Integer> {
@Override
public Integer call() throws Exception {
setResourceLocation(resourceLocation, "camel-kamelets:docs/modules/ROOT/nav.adoc");
- setBranch(branch);
MatchExtractor<Kamelet> matchExtractor;
@@ -287,10 +282,6 @@ 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,
- description = "The branch to use when downloading or searching resources (mostly used for development/testing)")
- private String branch;
-
@Override
public void printHeader() {
System.out.printf("%-35s %-45s %s%n", "COMPONENT", "DESCRIPTION", "LINK");
@@ -300,7 +291,6 @@ class SearchComponents extends AbstractSearch implements Callable<Integer> {
@Override
public Integer call() throws Exception {
setResourceLocation(resourceLocation, "camel:docs/components/modules/ROOT/nav.adoc");
- setBranch(branch);
MatchExtractor<Component> matchExtractor;
if (searchTerm.isEmpty()) {
@@ -343,10 +333,6 @@ 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,
- description = "The branch to use when downloading or searching resources (mostly used for development/testing)")
- private String branch;
-
@Override
public void printHeader() {
System.out.printf("%-35s %-45s %s%n", "LANGUAGE", "DESCRIPTION", "LINK");
@@ -356,7 +342,6 @@ class SearchLanguages extends AbstractSearch implements Callable<Integer> {
@Override
public Integer call() throws Exception {
setResourceLocation(resourceLocation, "camel:docs/components/modules/languages/nav.adoc");
- setBranch(branch);
MatchExtractor<Language> matchExtractor;
if (searchTerm.isEmpty()) {
@@ -398,10 +383,6 @@ 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,
- description = "The branch to use when downloading or searching resources (mostly used for development/testing)")
- private String branch;
-
@Override
public void printHeader() {
System.out.printf("%-35s %-45s %s%n", "COMPONENT", "DESCRIPTION", "LINK");
@@ -411,7 +392,6 @@ class SearchOthers extends AbstractSearch implements Callable<Integer> {
@Override
public Integer call() throws Exception {
setResourceLocation(resourceLocation, "camel:docs/components/modules/others/nav.adoc");
- setBranch(branch);
MatchExtractor<Other> matchExtractor;
if (searchTerm.isEmpty()) {