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 <claus.ib...@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"
