Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[3.8.x] Backports #5880

Merged
merged 3 commits into from
Mar 15, 2024
Merged

[3.8.x] Backports #5880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
954af32
Remove obsolete vertx-grpc exclusions since they potentially cause is…
jamesnetherton Mar 13, 2024
8181701
Avoid potential NPE when handling Jasypt password prefixes
jamesnetherton Mar 14, 2024
626e1d8
Upgrade Camel to 4.4.1
jamesnetherton Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/antora.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ asciidoc:
requires: "'util=camel-website-util,quarkus=xref:js/quarkus.js'"

# Project versions
camel-version: 4.4.0 # replace ${camel.version}
camel-version: 4.4.1 # replace ${camel.version}
camel-docs-version: 4.4.x
camel-quarkus-version: 3.8.1 # replace ${camel-quarkus.version}
quarkus-version: 3.8.2 # replace ${quarkus.version}
Expand Down
4 changes: 2 additions & 2 deletions docs/modules/ROOT/examples/components/azure-storage-datalake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ cqDeprecated: false
cqJvmSince: 1.8.0
cqNativeSince: n/a
cqCamelPartName: azure-storage-datalake
cqCamelPartTitle: Azure Storage Datalake Service
cqCamelPartDescription: Sends and receives files to/from Azure DataLake Storage.
cqCamelPartTitle: Azure Storage Data Lake Service
cqCamelPartDescription: Sends and receives files to/from Azure Data Lake Storage.
cqExtensionPageTitle: Azure storage datalake service
2 changes: 1 addition & 1 deletion docs/modules/ROOT/examples/components/jslt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ cqJvmSince: 1.1.0
cqNativeSince: 1.4.0
cqCamelPartName: jslt
cqCamelPartTitle: JSLT
cqCamelPartDescription: Query or transform JSON payloads using an JSLT.
cqCamelPartDescription: Query or transform JSON payloads using JSLT.
cqExtensionPageTitle: JSLT
2 changes: 1 addition & 1 deletion docs/modules/ROOT/examples/components/splunk-hec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ cqJvmSince: 1.1.0
cqNativeSince: 3.8.0
cqCamelPartName: splunk-hec
cqCamelPartTitle: Splunk HEC
cqCamelPartDescription: The splunk component allows to publish events in Splunk using the HTTP Event Collector.
cqCamelPartDescription: The splunk component allows publishing events in Splunk using the HTTP Event Collector.
cqExtensionPageTitle: Splunk HEC
2 changes: 1 addition & 1 deletion docs/modules/ROOT/examples/components/spring-rabbitmq.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ cqJvmSince: 1.7.0
cqNativeSince: 1.7.0
cqCamelPartName: spring-rabbitmq
cqCamelPartTitle: Spring RabbitMQ
cqCamelPartDescription: Send and receive messages from RabbitMQ using Spring RabbitMQ client.
cqCamelPartDescription: Send and receive messages from RabbitMQ using the Spring RabbitMQ client.
cqExtensionPageTitle: Spring RabbitMQ
2 changes: 1 addition & 1 deletion docs/modules/ROOT/examples/components/stomp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ cqJvmSince: 1.1.0
cqNativeSince: n/a
cqCamelPartName: stomp
cqCamelPartTitle: Stomp
cqCamelPartDescription: Send and rececive messages to/from STOMP (Simple Text Oriented Messaging Protocol) compliant message brokers.
cqCamelPartDescription: Send and receive messages to/from STOMP (Simple Text Oriented Messaging Protocol) compliant message brokers.
cqExtensionPageTitle: Stomp
2 changes: 1 addition & 1 deletion docs/modules/ROOT/examples/components/telegram.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ cqJvmSince: 1.0.0
cqNativeSince: 1.0.0
cqCamelPartName: telegram
cqCamelPartTitle: Telegram
cqCamelPartDescription: Send and receive messages acting as a Telegram Bot Telegram Bot API.
cqCamelPartDescription: Send and receive messages using the Telegram Bot API.
cqExtensionPageTitle: Telegram
4 changes: 2 additions & 2 deletions docs/modules/ROOT/examples/components/wordpress.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ cqDeprecated: false
cqJvmSince: 1.1.0
cqNativeSince: n/a
cqCamelPartName: wordpress
cqCamelPartTitle: Wordpress
cqCamelPartDescription: Manage posts and users using Wordpress API.
cqCamelPartTitle: WordPress
cqCamelPartDescription: Manage posts and users using the WordPress API.
cqExtensionPageTitle: Wordpress
2 changes: 1 addition & 1 deletion docs/modules/ROOT/pages/reference/extensions/azure-storage-datalake.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Camel Azure Datalake Gen2 Component
[id="extensions-azure-storage-datalake-whats-inside"]
== What's inside

* xref:{cq-camel-components}::azure-storage-datalake-component.adoc[Azure Storage Datalake Service component], URI syntax: `azure-storage-datalake:accountName/fileSystemName`
* xref:{cq-camel-components}::azure-storage-datalake-component.adoc[Azure Storage Data Lake Service component], URI syntax: `azure-storage-datalake:accountName/fileSystemName`

Please refer to the above link for usage and configuration details.

Expand Down
4 changes: 2 additions & 2 deletions docs/modules/ROOT/pages/reference/extensions/telegram.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
:cq-description: Send and receive messages acting as a Telegram Bot Telegram Bot API.
:cq-description: Send and receive messages using the Telegram Bot API.
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0
Expand All @@ -18,7 +18,7 @@ ifeval::[{doc-show-badges} == true]
[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.0.0##
endif::[]

Send and receive messages acting as a Telegram Bot Telegram Bot API.
Send and receive messages using the Telegram Bot API.

[id="extensions-telegram-whats-inside"]
== What's inside
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/ROOT/pages/reference/extensions/wordpress.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Manage posts and users using Wordpress API.
[id="extensions-wordpress-whats-inside"]
== What's inside

* xref:{cq-camel-components}::wordpress-component.adoc[Wordpress component], URI syntax: `wordpress:operation`
* xref:{cq-camel-components}::wordpress-component.adoc[WordPress component], URI syntax: `wordpress:operation`

Please refer to the above link for usage and configuration details.

Expand Down
30 changes: 0 additions & 30 deletions extensions/google-bigquery/deployment/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,32 +30,6 @@
<name>Camel Quarkus :: Google BigQuery :: Deployment</name>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-grpc-common</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx</artifactId>
</exclusion>
<exclusion>
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc</artifactId>
</exclusion>
<exclusion>
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc-client</artifactId>
</exclusion>
<exclusion>
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc-server</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-grpc-common-deployment</artifactId>
Expand All @@ -64,10 +38,6 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-deployment</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
16 changes: 0 additions & 16 deletions extensions/google-bigquery/runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,6 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx</artifactId>
</exclusion>
<exclusion>
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc</artifactId>
</exclusion>
<exclusion>
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc-client</artifactId>
</exclusion>
<exclusion>
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc-server</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
30 changes: 0 additions & 30 deletions extensions/google-pubsub/deployment/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,32 +34,6 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jackson-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-grpc-common</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx</artifactId>
</exclusion>
<exclusion>
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc</artifactId>
</exclusion>
<exclusion>
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc-client</artifactId>
</exclusion>
<exclusion>
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc-server</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-grpc-common-deployment</artifactId>
Expand All @@ -68,10 +42,6 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-deployment</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
16 changes: 0 additions & 16 deletions extensions/google-pubsub/runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,22 +63,6 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx</artifactId>
</exclusion>
<exclusion>
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc</artifactId>
</exclusion>
<exclusion>
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc-client</artifactId>
</exclusion>
<exclusion>
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc-server</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
38 changes: 38 additions & 0 deletions .../java/org/apache/camel/quarkus/component/jasypt/JasyptPasswordSysEnvValueMissingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.camel.quarkus.component.jasypt;

import io.quarkus.test.QuarkusUnitTest;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

public class JasyptPasswordSysEnvValueMissingTest {
private static final String PASSWORD_VAR_NAME = "JASYPT_BAD_DECRYPT_SECRET";

@RegisterExtension
static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
.overrideConfigKey("quarkus.camel.jasypt.password", "sysenv:" + PASSWORD_VAR_NAME)
.setExpectedException(IllegalStateException.class)
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));

@Test
void nonExistentPasswordEnvironmentVariableHandledGracefully() {
// Nothing to test as we just verify the application fails to start
}
}
38 changes: 38 additions & 0 deletions ...est/java/org/apache/camel/quarkus/component/jasypt/JasyptPasswordSysValueMissingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.camel.quarkus.component.jasypt;

import io.quarkus.test.QuarkusUnitTest;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

public class JasyptPasswordSysValueMissingTest {
private static final String PASSWORD_PROPERTY_NAME = "jasyptBadDecryptSecret";

@RegisterExtension
static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
.overrideConfigKey("quarkus.camel.jasypt.password", "sys:" + PASSWORD_PROPERTY_NAME)
.setExpectedException(IllegalStateException.class)
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));

@Test
void nonExistentPasswordSystemPropertyHandledGracefully() {
// Nothing to test as we just verify the application fails to start
}
}
4 changes: 1 addition & 3 deletions ...n/java/org/apache/camel/quarkus/component/jasypt/CamelJasyptSecretKeysHandlerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,7 @@ private String getPassword(ConfigSourceContext context) {
// Preserve backwards compat with the Camel way of configuring the master password
if (password.startsWith(SYS_ENV_CONFIG_PREFIX)) {
password = System.getenv(StringHelper.after(password, SYS_ENV_CONFIG_PREFIX));
}

if (password.startsWith(SYS_CONFIG_PREFIX)) {
} else if (password.startsWith(SYS_CONFIG_PREFIX)) {
password = System.getProperty(StringHelper.after(password, SYS_CONFIG_PREFIX));
}
}
Expand Down
28 changes: 0 additions & 28 deletions extensions/salesforce/deployment/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,37 +37,9 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jaxb-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-grpc-common</artifactId>
<exclusions>
<exclusion>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx</artifactId>
</exclusion>
<exclusion>
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc</artifactId>
</exclusion>
<exclusion>
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc-client</artifactId>
</exclusion>
<exclusion>
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc-server</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-grpc-common-deployment</artifactId>
<exclusions>
<exclusion>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-deployment</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
18 changes: 0 additions & 18 deletions extensions/salesforce/runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,24 +45,6 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-grpc-common</artifactId>
<exclusions>
<exclusion>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx</artifactId>
</exclusion>
<exclusion>
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc</artifactId>
</exclusion>
<exclusion>
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc-client</artifactId>
</exclusion>
<exclusion>
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc-server</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
Loading
Loading