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/01/11 18:21:11 UTC
[camel] branch main updated (f6e3d4f99ed -> 0e0523ccd39)
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 f6e3d4f99ed CAMEL-18882: camel-cdi - Remove Add docs for v4 migration/upgrade guides
new 2c1138053dd CAMEL-18884: Skip 4 components that are not yet migrated to jakarta
new b21dff617cf CAMEL-18884: Skip 4 components that are not yet migrated to jakarta
new 56510787aa5 CAMEL-18884: Skip 4 components that are not yet migrated to jakarta
new 0e0523ccd39 Regen
The 4 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:
.../org/apache/camel/catalog/components.properties | 3 ---
.../org/apache/camel/catalog/dataformats.properties | 1 -
.../org/apache/camel/catalog/main/sensitive-keys.json | 2 --
.../resources/org/apache/camel/catalog/others.properties | 2 --
.../org/apache/camel/catalog/others/componentdsl.json | 15 ---------------
.../org/apache/camel/catalog/others/endpointdsl.json | 15 ---------------
.../java/org/apache/camel/catalog/CamelCatalogTest.java | 2 +-
.../resources/org/apache/camel/main/components.properties | 3 ---
.../org/apache/camel/main/dataformats.properties | 1 -
.../main/java/org/apache/camel/util/SensitiveUtils.java | 4 ----
.../apache/camel/maven/packaging/PrepareCatalogMojo.java | 5 +++++
11 files changed, 6 insertions(+), 47 deletions(-)
delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json
delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json
[camel] 04/04: Regen
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 0e0523ccd397bc65e1ca9747bbb0a6a3ad8a5616
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jan 11 19:20:56 2023 +0100
Regen
---
.../resources/org/apache/camel/catalog/others.properties | 2 --
.../org/apache/camel/catalog/others/componentdsl.json | 15 ---------------
.../org/apache/camel/catalog/others/endpointdsl.json | 15 ---------------
3 files changed, 32 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
index 732ed3a10e2..804120d3278 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
@@ -5,14 +5,12 @@ cli-connector
cloud
cloudevents
cluster
-componentdsl
console
csimple-joor
debug
dsl-modeline
dsl-support
elytron
-endpointdsl
groovy-dsl
headersmap
health
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json
deleted file mode 100644
index 3799e772735..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "other": {
- "kind": "other",
- "name": "componentdsl",
- "title": "Java Component DSL",
- "description": "The Camel Component DSL",
- "deprecated": false,
- "firstVersion": "3.1.0",
- "label": "dsl",
- "supportLevel": "Stable",
- "groupId": "org.apache.camel",
- "artifactId": "camel-componentdsl",
- "version": "4.0.0-SNAPSHOT"
- }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json
deleted file mode 100644
index cea1951ad69..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "other": {
- "kind": "other",
- "name": "endpointdsl",
- "title": "Java Endpoint DSL",
- "description": "The Camel Endpoint DSL",
- "deprecated": false,
- "firstVersion": "3.0.0",
- "label": "dsl",
- "supportLevel": "Stable",
- "groupId": "org.apache.camel",
- "artifactId": "camel-endpointdsl",
- "version": "4.0.0-SNAPSHOT"
- }
-}
[camel] 03/04: CAMEL-18884: Skip 4 components that are not yet migrated to jakarta
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 56510787aa5d899d26bd74c048a004d808c685dc
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jan 11 19:02:52 2023 +0100
CAMEL-18884: Skip 4 components that are not yet migrated to jakarta
---
.../src/test/java/org/apache/camel/catalog/CamelCatalogTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index 407ec076ce2..400c14dd266 100644
--- a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -81,7 +81,7 @@ public class CamelCatalogTest {
assertTrue(names.contains("log"));
assertTrue(names.contains("docker"));
assertTrue(names.contains("jms"));
- assertTrue(names.contains("activemq"));
+ // TODO: camel4 assertTrue(names.contains("activemq"));
assertTrue(names.contains("zookeeper-master"));
}
[camel] 01/04: CAMEL-18884: Skip 4 components that are not yet migrated to jakarta
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 2c1138053dd87834d837482195d59c2be790cb16
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jan 11 19:01:44 2023 +0100
CAMEL-18884: Skip 4 components that are not yet migrated to jakarta
---
.../java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
index 62f4e283a2d..f65bd53e63b 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
@@ -227,6 +227,11 @@ public class PrepareCatalogMojo extends AbstractMojo {
Stream<Path> stream = Stream.concat(paths,
Stream.of(languagesDir.toPath(), springDir.toPath()))
.filter(dir -> !"target".equals(dir.getFileName().toString()))
+ .filter(dir -> {
+ String d = dir.getFileName().toString();
+ // TODO: camel4 these are not yet working
+ boolean bad = "camel-activemq".equals(d) || "camel-johnzon".equals(d) || "camel-stomp".equals(d) || "camel-websocket".equals(d);
+ return !bad;})
.flatMap(p -> getComponentPath(p).stream())
.filter(dir -> Files.isDirectory(dir.resolve("src")))
.map(p -> p.resolve("target/classes"))
[camel] 02/04: CAMEL-18884: Skip 4 components that are not yet migrated to jakarta
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 b21dff617cf36e66a4c897c7634e9c8b75399877
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jan 11 19:01:55 2023 +0100
CAMEL-18884: Skip 4 components that are not yet migrated to jakarta
---
.../resources/org/apache/camel/catalog/components.properties | 3 ---
.../resources/org/apache/camel/catalog/dataformats.properties | 1 -
.../resources/org/apache/camel/catalog/main/sensitive-keys.json | 2 --
.../generated/resources/org/apache/camel/main/components.properties | 3 ---
.../generated/resources/org/apache/camel/main/dataformats.properties | 1 -
.../src/main/java/org/apache/camel/util/SensitiveUtils.java | 4 ----
6 files changed, 14 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
index 9bbbbb6fae8..8410de1d395 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
@@ -1,4 +1,3 @@
-activemq
amqp
arangodb
as2
@@ -308,7 +307,6 @@ sql-stored
ssh
stax
stitch
-stomp
stream
string-template
stub
@@ -331,7 +329,6 @@ vm
weather
web3j
webhook
-websocket
websocket-jsr356
weka
whatsapp
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties
index 36b9ab17fd1..5b26131dfdb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties
@@ -22,7 +22,6 @@ ical
jackson
jacksonXml
jaxb
-johnzon
jsonApi
jsonb
lzf
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json
index 488be216784..b3f7bf2ba9a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json
@@ -26,7 +26,6 @@
"keypassword",
"keystore",
"keystorepassword",
- "login",
"oauthaccesstoken",
"oauthappid",
"oauthappsecret",
@@ -35,7 +34,6 @@
"oauthtoken",
"oauthtokenurl",
"p12filename",
- "passcode",
"passphrase",
"password",
"privatekey",
diff --git a/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties b/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties
index 9bbbbb6fae8..8410de1d395 100644
--- a/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties
+++ b/core/camel-main/src/generated/resources/org/apache/camel/main/components.properties
@@ -1,4 +1,3 @@
-activemq
amqp
arangodb
as2
@@ -308,7 +307,6 @@ sql-stored
ssh
stax
stitch
-stomp
stream
string-template
stub
@@ -331,7 +329,6 @@ vm
weather
web3j
webhook
-websocket
websocket-jsr356
weka
whatsapp
diff --git a/core/camel-main/src/generated/resources/org/apache/camel/main/dataformats.properties b/core/camel-main/src/generated/resources/org/apache/camel/main/dataformats.properties
index 36b9ab17fd1..5b26131dfdb 100644
--- a/core/camel-main/src/generated/resources/org/apache/camel/main/dataformats.properties
+++ b/core/camel-main/src/generated/resources/org/apache/camel/main/dataformats.properties
@@ -22,7 +22,6 @@ ical
jackson
jacksonXml
jaxb
-johnzon
jsonApi
jsonb
lzf
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
index 389b77c03f5..d3889ad8cac 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
@@ -55,7 +55,6 @@ public final class SensitiveUtils {
"keypassword",
"keystore",
"keystorepassword",
- "login",
"oauthaccesstoken",
"oauthappid",
"oauthappsecret",
@@ -64,7 +63,6 @@ public final class SensitiveUtils {
"oauthtoken",
"oauthtokenurl",
"p12filename",
- "passcode",
"passphrase",
"password",
"privatekey",
@@ -133,7 +131,6 @@ public final class SensitiveUtils {
+ "|\\Qkeypassword\\E"
+ "|\\Qkeystore\\E"
+ "|\\Qkeystorepassword\\E"
- + "|\\Qlogin\\E"
+ "|\\Qoauthaccesstoken\\E"
+ "|\\Qoauthappid\\E"
+ "|\\Qoauthappsecret\\E"
@@ -142,7 +139,6 @@ public final class SensitiveUtils {
+ "|\\Qoauthtoken\\E"
+ "|\\Qoauthtokenurl\\E"
+ "|\\Qp12filename\\E"
- + "|\\Qpasscode\\E"
+ "|\\Qpassphrase\\E"
+ "|\\Qpassword\\E"
+ "|\\Qprivatekey\\E"