You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2023/05/19 14:59:44 UTC
[camel-quarkus] branch main updated: Upgrade Maven plugins, remove redundant plugin version properties and enable plugin upgrades via dependabot
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 3aef1c1f54 Upgrade Maven plugins, remove redundant plugin version properties and enable plugin upgrades via dependabot
3aef1c1f54 is described below
commit 3aef1c1f549c937de99fbdda648de48cfe32a4f9
Author: James Netherton <ja...@users.noreply.github.com>
AuthorDate: Fri May 19 15:59:37 2023 +0100
Upgrade Maven plugins, remove redundant plugin version properties and enable plugin upgrades via dependabot
* Upgarde build-helper-maven-plugin to 3.4.0
* Upgarde exec-maven-plugin to 3.1.0
* Upgrade formatter-maven-plugin to 2.22.0
* Remove redundant frontend-maven-plugin version property
* Upgrade impsort-maven-plugin to 1.9.0
* Upgrade jandex-maven-plugin to 1.2.3
* Upgrade license-maven-plugin to 4.2
* Upgrade maven-assembly-plugin to 3.6.0
* Upgrade maven-compiler-plugin to 3.11.0
* Upgrade maven-dependency-plugin to 3.5.0
* Upgrade maven-gpg-plugin to 3.1.0
* Upgrade maven-deploy-plugin to 3.1.1
* Upgrade maven-jar-plugin to 3.3.0
* Upgrade maven-javadoc-plugin to 3.5.0
* Upgrade maven-plugin-plugin to 3.9.0
* Upgrade maven-source-plugin to 3.2.1
* Upgrade maven-release-plugin to 3.0.0
* Upgrade maven-resources-plugin to 3.3.1
* Upgrade maven-scm-plugin to 2.0.0
* Remove redundant properties-maven-plugin version property
* Upgrade rpkgtests-maven-plugin to 1.0.0
* Upgrade hyperfoil-maven-plugin to 0.24.1
* Configure dependabot to upgrade Maven plugins
---
.github/dependabot.yml | 24 +++++---
.../deployment/catalog/BuildTimeCamelCatalog.java | 2 +-
.../core/deployment/main/CamelMainHelper.java | 2 +-
.../quarkus/core/CamelLifecycleEventBridge.java | 2 +-
.../apache/camel/quarkus/core/util/FileUtils.java | 4 +-
.../language/deployment/dm/DryModeInjector.java | 2 +-
.../component/aws2/ddb/it/Aws2DdbStreamRoutes.java | 32 +++++-----
.../azure/eventhubs/it/AzureEventhubsRoutes.java | 2 +-
.../storage/blob/it/AzureStorageBlobResource.java | 10 ++--
.../cxf/soap/server/it/CxfSoapRoutes.java | 6 +-
.../component/language/it/LanguageTest.java | 8 +--
.../quarkus/component/mongodb/it/MongoDbRoute.java | 38 ++++++------
.../camel/quarkus/component/avro/it/Value.java | 24 ++++----
.../cassandraql/it/CassandraqlRoutes.java | 4 +-
.../quarkus/component/file/it/FileRoutes.java | 10 ++--
.../google/storage/it/GoogleStorageRoute.java | 4 +-
.../camel/quarkus/component/grpc/it/GrpcRoute.java | 70 +++++++++++-----------
.../quarkus/component/http/it/HttpService.java | 2 +-
.../quarkus/component/kafka/CamelKafkaRoutes.java | 2 +-
.../quarkus/component/ldap/it/LdapResource.java | 4 +-
.../camel/quarkus/component/ldap/it/LdapTest.java | 6 +-
.../lumberjack/it/LumberjackClientUtil.java | 4 +-
.../camel/quarkus/component/mail/CamelRoute.java | 58 +++++++++---------
.../quarkus/component/mail/MailTestResource.java | 10 ++--
.../component/salesforce/SalesforceResource.java | 2 +-
.../component/salesforce/SalesforceRoutes.java | 4 +-
.../camel/quarkus/component/sql/it/SqlRoutes.java | 6 +-
.../camel/quarkus/component/sql/it/SqlTest.java | 26 ++++----
pom.xml | 44 +++++++-------
.../quarkus/test/CamelQuarkusTestSupport.java | 4 +-
.../cq-perf-regression-sample-base/pom.xml | 6 +-
31 files changed, 213 insertions(+), 209 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index c93cd34451..d80e6d67ea 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -17,20 +17,26 @@
version: 2
-registries:
- maven-central:
- type: maven-repository
- url: https://repo1.maven.org/maven2
- username: ""
- password: ""
-
updates:
- package-ecosystem: "maven"
directory: "/"
- registries:
- - maven-central
schedule:
interval: "daily"
allow:
+ # Quarkiverse extensions
- dependency-name: "io.quarkiverse.*:*"
- dependency-name: "org.amqphub.quarkus:quarkus-qpid-jms-bom"
+ # Maven plugins
+ - dependency-name: "*:*-maven-plugin"
+ - dependency-name: "org.apache.maven.plugins:*"
+ ignore:
+ # Maven plugins
+ # Quarkus is upgraded manually
+ - dependency-name: "io.quarkus:quarkus-*-maven-plugin"
+ # Camel is upgraded manually
+ - dependency-name: "org.apache.camel.maven:*"
+ # To be kept manually in alignment with the enforcer API version used in quarkus-enforcer-rules
+ - dependency-name: "org.apache.maven.plugins:maven-enforcer-plugin"
+ # https://github.com/apache/camel-quarkus/issues/723
+ - dependency-name: "org.apache.maven.plugins:maven-failsafe-plugin"
+ - dependency-name: "org.apache.maven.plugins:maven-surefire-plugin"
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/catalog/BuildTimeCamelCatalog.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/catalog/BuildTimeCamelCatalog.java
index 4d33e713fd..2c4e21fe54 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/catalog/BuildTimeCamelCatalog.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/catalog/BuildTimeCamelCatalog.java
@@ -38,7 +38,7 @@ public class BuildTimeCamelCatalog extends AbstractCamelCatalog {
/**
* Gets a list of all component, endpoint, dataformat & language options for the components that are on the classpath
- *
+ *
* @return List of {@link BaseOptionModel} instances
*/
public List<BaseOptionModel> getAllOptions() {
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/main/CamelMainHelper.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/main/CamelMainHelper.java
index c6a546e87e..35bea90571 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/main/CamelMainHelper.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/main/CamelMainHelper.java
@@ -56,7 +56,7 @@ public final class CamelMainHelper {
/**
* Execute a task for each resource that matches with the "include" and "exclude" patterns.
- *
+ *
* @param resourceConsumer the task to execute for each matching resource.
*/
public static void forEachMatchingResource(Consumer<Resource> resourceConsumer) throws Exception {
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelLifecycleEventBridge.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelLifecycleEventBridge.java
index df98b8279b..70248ac172 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelLifecycleEventBridge.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelLifecycleEventBridge.java
@@ -50,7 +50,7 @@ import org.apache.camel.util.function.Suppliers;
* Note that this class does not implement all the callback as some notifications them are already covered
* by management events {@link CamelManagementEventBridge}
* <p>
- *
+ *
* @see ComponentAddEvent
* @see ComponentRemoveEvent
* @see EndpointAddEvent
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/util/FileUtils.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/util/FileUtils.java
index 0b1133d544..f082fe2c26 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/util/FileUtils.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/util/FileUtils.java
@@ -29,7 +29,7 @@ public final class FileUtils {
/**
* Converts non-*nix path separator characters to the *nix alternative
- *
+ *
* @param path The {@link java.nio.file.Path} to convert
* @return String representation of the path with *nix separators
*/
@@ -39,7 +39,7 @@ public final class FileUtils {
/**
* Converts non-*nix path separator characters to the *nix alternative
- *
+ *
* @param path The path String to convert
* @return String representation of the path with *nix separators
*/
diff --git a/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/dm/DryModeInjector.java b/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/dm/DryModeInjector.java
index 7fc7e87251..8312bba247 100644
--- a/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/dm/DryModeInjector.java
+++ b/extensions-support/language/deployment/src/main/java/org/apache/camel/quarkus/support/language/deployment/dm/DryModeInjector.java
@@ -75,7 +75,7 @@ class DryModeInjector implements Injector {
/**
* Indicates whether the given type must be replaced by a mock component.
- *
+ *
* @param type the type to check.
* @return {@code true} if it should be replaced, {@code false} otherwise.
* @param <T> the type of the class to check.
diff --git a/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamRoutes.java b/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamRoutes.java
index eca2e765e8..85440fe8c6 100644
--- a/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamRoutes.java
+++ b/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamRoutes.java
@@ -44,22 +44,22 @@ public class Aws2DdbStreamRoutes extends RouteBuilder {
public void configure() throws Exception {
from("aws2-ddbstream://" + streamTableName
+ "?streamIteratorType=FROM_LATEST")
- .id("aws2DdbStreamRoute")
- .autoStartup(false)
- .process(e -> {
- Record record = e.getMessage().getBody(Record.class);
- StreamRecord item = record.dynamodb();
- Map<String, String> result = new LinkedHashMap<>();
- result.put("key", item.keys().get("key").s());
- if (item.hasOldImage()) {
- result.put("old", item.oldImage().get("value").s());
- }
- if (item.hasNewImage()) {
- result.put("new", item.newImage().get("value").s());
- }
- result.put("sequenceNumber", item.sequenceNumber());
- aws2DdbStreamReceivedEvents.add(result);
- });
+ .id("aws2DdbStreamRoute")
+ .autoStartup(false)
+ .process(e -> {
+ Record record = e.getMessage().getBody(Record.class);
+ StreamRecord item = record.dynamodb();
+ Map<String, String> result = new LinkedHashMap<>();
+ result.put("key", item.keys().get("key").s());
+ if (item.hasOldImage()) {
+ result.put("old", item.oldImage().get("value").s());
+ }
+ if (item.hasNewImage()) {
+ result.put("new", item.newImage().get("value").s());
+ }
+ result.put("sequenceNumber", item.sequenceNumber());
+ aws2DdbStreamReceivedEvents.add(result);
+ });
}
static class Producers {
diff --git a/integration-test-groups/azure/azure-eventhubs/src/main/java/org/apache/camel/quarkus/component/azure/eventhubs/it/AzureEventhubsRoutes.java b/integration-test-groups/azure/azure-eventhubs/src/main/java/org/apache/camel/quarkus/component/azure/eventhubs/it/AzureEventhubsRoutes.java
index dea02694ba..3a787c8478 100644
--- a/integration-test-groups/azure/azure-eventhubs/src/main/java/org/apache/camel/quarkus/component/azure/eventhubs/it/AzureEventhubsRoutes.java
+++ b/integration-test-groups/azure/azure-eventhubs/src/main/java/org/apache/camel/quarkus/component/azure/eventhubs/it/AzureEventhubsRoutes.java
@@ -49,7 +49,7 @@ public class AzureEventhubsRoutes extends RouteBuilder {
+ ")&blobAccessKey=RAW(" + azureStorageAccountKey
+ ")&blobContainerName=RAW(" + azureBlobContainerName.get() + ")&amqpTransportType="
+ AmqpTransportType.AMQP)
- .to("mock:azure-consumed");
+ .to("mock:azure-consumed");
} else if (!startMockBackend) {
throw new IllegalStateException(
"azure.event.hubs.connection.string and azure.event.hubs.blob.container.name must be set when camel.quarkus.start.mock.backend == false");
diff --git a/integration-test-groups/azure/azure-storage-blob/src/main/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobResource.java b/integration-test-groups/azure/azure-storage-blob/src/main/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobResource.java
index d5760998d0..11bd5153df 100644
--- a/integration-test-groups/azure/azure-storage-blob/src/main/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobResource.java
+++ b/integration-test-groups/azure/azure-storage-blob/src/main/java/org/apache/camel/quarkus/component/azure/storage/blob/it/AzureStorageBlobResource.java
@@ -327,11 +327,11 @@ public class AzureStorageBlobResource {
JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
((Stream<PageRangeItem>) pageIterable
.stream())
- .map(pr -> Json.createObjectBuilder()
- .add("offset", pr.getRange().getOffset())
- .add("length", pr.getRange().getLength())
- .build())
- .forEach(arrayBuilder::add);
+ .map(pr -> Json.createObjectBuilder()
+ .add("offset", pr.getRange().getOffset())
+ .add("length", pr.getRange().getLength())
+ .build())
+ .forEach(arrayBuilder::add);
objectBuilder.add("ranges", arrayBuilder.build());
return objectBuilder.build();
diff --git a/integration-test-groups/cxf-soap/cxf-soap-server/src/main/java/org/apache/camel/quarkus/component/cxf/soap/server/it/CxfSoapRoutes.java b/integration-test-groups/cxf-soap/cxf-soap-server/src/main/java/org/apache/camel/quarkus/component/cxf/soap/server/it/CxfSoapRoutes.java
index f2ff811907..d960ce446c 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-server/src/main/java/org/apache/camel/quarkus/component/cxf/soap/server/it/CxfSoapRoutes.java
+++ b/integration-test-groups/cxf-soap/cxf-soap-server/src/main/java/org/apache/camel/quarkus/component/cxf/soap/server/it/CxfSoapRoutes.java
@@ -63,7 +63,7 @@ public class CxfSoapRoutes extends RouteBuilder {
from(String.format("cxf:///hello-uri-address?wsdlURL=wsdl/HelloService.wsdl&serviceClass=%s",
HelloPortType.class.getName()))
- .setBody().simple("Hello ${body} from CXF service");
+ .setBody().simple("Hello ${body} from CXF service");
from("cxf:bean:codeFirstServiceEndpoint")
.choice()
@@ -103,11 +103,11 @@ public class CxfSoapRoutes extends RouteBuilder {
from(String.format("cxf:echoServiceResponseFromRoute?serviceClass=%s&address=/echo-route",
EchoServiceImpl.class.getName()))
- .setBody(exchange -> exchange.getMessage().getBody(String.class) + " from Camel route");
+ .setBody(exchange -> exchange.getMessage().getBody(String.class) + " from Camel route");
from(String.format("cxf:echoServiceResponseFromImpl?serviceClass=%s&address=/echo-impl",
EchoServiceImpl.class.getName()))// no body set here; the response comes from EchoServiceImpl
- .log("${body}");
+ .log("${body}");
}
diff --git a/integration-test-groups/foundation/language/src/test/java/org/apache/camel/quarkus/component/language/it/LanguageTest.java b/integration-test-groups/foundation/language/src/test/java/org/apache/camel/quarkus/component/language/it/LanguageTest.java
index 7614abd1fc..4b5e676a1b 100644
--- a/integration-test-groups/foundation/language/src/test/java/org/apache/camel/quarkus/component/language/it/LanguageTest.java
+++ b/integration-test-groups/foundation/language/src/test/java/org/apache/camel/quarkus/component/language/it/LanguageTest.java
@@ -116,7 +116,7 @@ class LanguageTest {
* This test is called for each entry in {@link languageResultsMap}.
* The body text is passed to the routeName endpoint, which is checked for successful completion
* and that the returned body matches the expected result from {@link TestResult}
- *
+ *
* @param routeName - The name of the endpoint exposed in {@link LanguageResource}
* @param result - The {@link TestResource} containing input body and expected result
*/
@@ -134,7 +134,7 @@ class LanguageTest {
/**
* Tests whether scripts can be loaded over HTTP.
- *
+ *
* @throws Exception
*/
@Test
@@ -144,7 +144,7 @@ class LanguageTest {
server.stubFor(request("GET", urlPathEqualTo("/simple"))
.willReturn(aResponse().withBody("Hello ${body} from simple language http")));
- // The heart of the test is very similar to the testLanguage method above, but pass in the
+ // The heart of the test is very similar to the testLanguage method above, but pass in the
// URL of the WireMock server as a query parameter.
RestAssured.given()
.queryParam("baseUrl", server.baseUrl())
@@ -209,7 +209,7 @@ class LanguageTest {
/**
* Creates a health record for a fictional patient.
- *
+ *
* @return
*/
private static String createHl7Message() {
diff --git a/integration-test-groups/mongodb/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbRoute.java b/integration-test-groups/mongodb/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbRoute.java
index d52af6f868..6601eef762 100644
--- a/integration-test-groups/mongodb/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbRoute.java
+++ b/integration-test-groups/mongodb/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbRoute.java
@@ -40,32 +40,32 @@ public class MongoDbRoute extends RouteBuilder {
public void configure() {
fromF("mongodb:%s?database=test&collection=%s&tailTrackIncreasingField=increasing",
MongoDbConstants.DEFAULT_MONGO_CLIENT_NAME, MongoDbConstants.COLLECTION_TAILING)
- .process(e -> {
- final List<Document> list = results.get(MongoDbConstants.COLLECTION_TAILING);
- synchronized (list) {
- list.add(e.getMessage().getBody(Document.class));
- }
- });
+ .process(e -> {
+ final List<Document> list = results.get(MongoDbConstants.COLLECTION_TAILING);
+ synchronized (list) {
+ list.add(e.getMessage().getBody(Document.class));
+ }
+ });
fromF("mongodb:%s?database=test&collection=%s&tailTrackIncreasingField=increasing&persistentTailTracking=true&persistentId=darwin",
MongoDbConstants.DEFAULT_MONGO_CLIENT_NAME, MongoDbConstants.COLLECTION_PERSISTENT_TAILING)
- .id(MongoDbConstants.COLLECTION_PERSISTENT_TAILING)
- .process(e -> {
- final List<Document> list = results.get(MongoDbConstants.COLLECTION_PERSISTENT_TAILING);
- synchronized (list) {
- list.add(e.getMessage().getBody(Document.class));
- }
- });
+ .id(MongoDbConstants.COLLECTION_PERSISTENT_TAILING)
+ .process(e -> {
+ final List<Document> list = results.get(MongoDbConstants.COLLECTION_PERSISTENT_TAILING);
+ synchronized (list) {
+ list.add(e.getMessage().getBody(Document.class));
+ }
+ });
fromF("mongodb:%s?database=test&collection=%s&consumerType=changeStreams&streamFilter=%s",
MongoDbConstants.DEFAULT_MONGO_CLIENT_NAME, MongoDbConstants.COLLECTION_STREAM_CHANGES,
"{'$match':{'$or':[{'fullDocument.string': 'value2'}]}}")
- .process(e -> {
- final List<Document> list = results.get(MongoDbConstants.COLLECTION_STREAM_CHANGES);
- synchronized (list) {
- list.add(e.getMessage().getBody(Document.class));
- }
- });
+ .process(e -> {
+ final List<Document> list = results.get(MongoDbConstants.COLLECTION_STREAM_CHANGES);
+ synchronized (list) {
+ list.add(e.getMessage().getBody(Document.class));
+ }
+ });
}
@Produces
diff --git a/integration-tests/avro/src/main/java/org/apache/camel/quarkus/component/avro/it/Value.java b/integration-tests/avro/src/main/java/org/apache/camel/quarkus/component/avro/it/Value.java
index 7b7c943a17..99a78bc06a 100644
--- a/integration-tests/avro/src/main/java/org/apache/camel/quarkus/component/avro/it/Value.java
+++ b/integration-tests/avro/src/main/java/org/apache/camel/quarkus/component/avro/it/Value.java
@@ -17,7 +17,7 @@
// CHECKSTYLE:OFF
/**
* Autogenerated by Avro
- *
+ *
* DO NOT EDIT DIRECTLY
*/
package org.apache.camel.quarkus.component.avro.it;
@@ -31,14 +31,14 @@ public class Value extends org.apache.avro.specific.SpecificRecordBase implement
public static final org.apache.avro.Schema SCHEMA$ = new Schema.Parser().parse("{\"type\":\"record\",\"name\":\"Value\",\"namespace\":\"org.apache.camel.quarkus.component.avro.it\",\"fields\":[{\"name\":\"value\",\"type\":\"string\"}]}");
@Deprecated public java.lang.CharSequence value;
public org.apache.avro.Schema getSchema() { return SCHEMA$; }
- // Used by DatumWriter. Applications should not call.
+ // Used by DatumWriter. Applications should not call.
public java.lang.Object get(int field$) {
switch (field$) {
case 0: return value;
default: throw new org.apache.avro.AvroRuntimeException("Bad index");
}
}
- // Used by DatumReader. Applications should not call.
+ // Used by DatumReader. Applications should not call.
@SuppressWarnings(value="unchecked")
public void put(int field$, java.lang.Object value$) {
switch (field$) {
@@ -66,17 +66,17 @@ public class Value extends org.apache.avro.specific.SpecificRecordBase implement
public static Value.Builder newBuilder() {
return new Value.Builder();
}
-
+
/** Creates a new Value RecordBuilder by copying an existing Builder */
public static Value.Builder newBuilder(Value.Builder other) {
return new Value.Builder(other);
}
-
+
/** Creates a new Value RecordBuilder by copying an existing Value instance */
public static Value.Builder newBuilder(Value other) {
return new Value.Builder(other);
}
-
+
/**
* RecordBuilder for Value instances.
*/
@@ -89,12 +89,12 @@ public class Value extends org.apache.avro.specific.SpecificRecordBase implement
private Builder() {
super(Value.SCHEMA$);
}
-
+
/** Creates a Builder by copying an existing Builder */
private Builder(Value.Builder other) {
super(other);
}
-
+
/** Creates a Builder by copying an existing Value instance */
private Builder(Value other) {
super(Value.SCHEMA$);
@@ -108,20 +108,20 @@ public class Value extends org.apache.avro.specific.SpecificRecordBase implement
public java.lang.CharSequence getValue() {
return value;
}
-
+
/** Sets the value of the 'value' field */
public Value.Builder setValue(java.lang.CharSequence value) {
validate(fields()[0], value);
this.value = value;
fieldSetFlags()[0] = true;
- return this;
+ return this;
}
-
+
/** Checks whether the 'value' field has been set */
public boolean hasValue() {
return fieldSetFlags()[0];
}
-
+
/** Clears the value of the 'value' field */
public Value.Builder clearValue() {
value = null;
diff --git a/integration-tests/cassandraql/src/main/java/org/apache/camel/quarkus/component/cassandraql/it/CassandraqlRoutes.java b/integration-tests/cassandraql/src/main/java/org/apache/camel/quarkus/component/cassandraql/it/CassandraqlRoutes.java
index c1ca952bfe..d801562b37 100644
--- a/integration-tests/cassandraql/src/main/java/org/apache/camel/quarkus/component/cassandraql/it/CassandraqlRoutes.java
+++ b/integration-tests/cassandraql/src/main/java/org/apache/camel/quarkus/component/cassandraql/it/CassandraqlRoutes.java
@@ -80,8 +80,8 @@ public class CassandraqlRoutes extends RouteBuilder {
fromF("cql://%s/%s?username=%s&password=%s&repeatCount=1&cql=SELECT * FROM employee", dbUrl, KEYSPACE, userName,
password).id("employee-consumer")
- .autoStartup(false)
- .to("seda:employees");
+ .autoStartup(false)
+ .to("seda:employees");
from("direct:aggregate")
.aggregate(simple("${body.id}"), createAggregationStrategy())
diff --git a/integration-tests/file/src/main/java/org/apache/camel/quarkus/component/file/it/FileRoutes.java b/integration-tests/file/src/main/java/org/apache/camel/quarkus/component/file/it/FileRoutes.java
index 1e1b065520..6bae9b9b68 100644
--- a/integration-tests/file/src/main/java/org/apache/camel/quarkus/component/file/it/FileRoutes.java
+++ b/integration-tests/file/src/main/java/org/apache/camel/quarkus/component/file/it/FileRoutes.java
@@ -42,17 +42,17 @@ public class FileRoutes extends RouteBuilder {
+ "readLockCheckInterval=2000&"
+ "readLockLoggingLevel=TRACE&"
+ "readLockTimeout=5000")
- .to("file://target/" + READ_LOCK_OUT);
+ .to("file://target/" + READ_LOCK_OUT);
from("file://target/quartz?scheduler=quartz&scheduler.cron=0/1+*+*+*+*+?&repeatCount=0")
.to("file://target/quartz/out");
from("file://target/" + CONSUME_BATCH + "?"
+ "initialDelay=0&delay=100")
- .id(CONSUME_BATCH)
- .noAutoStartup()
- .convertBodyTo(String.class)
- .to("mock:" + CONSUME_BATCH);
+ .id(CONSUME_BATCH)
+ .noAutoStartup()
+ .convertBodyTo(String.class)
+ .to("mock:" + CONSUME_BATCH);
from("file://target/charsetIsoRead?initialDelay=0&delay=10&delete=true&charset=ISO-8859-1")
.routeId("charsetIsoRead")
diff --git a/integration-tests/google-storage/src/main/java/org/apache/camel/quarkus/component/google/storage/it/GoogleStorageRoute.java b/integration-tests/google-storage/src/main/java/org/apache/camel/quarkus/component/google/storage/it/GoogleStorageRoute.java
index 3627ce05d8..cd8295b0dc 100644
--- a/integration-tests/google-storage/src/main/java/org/apache/camel/quarkus/component/google/storage/it/GoogleStorageRoute.java
+++ b/integration-tests/google-storage/src/main/java/org/apache/camel/quarkus/component/google/storage/it/GoogleStorageRoute.java
@@ -27,8 +27,8 @@ public class GoogleStorageRoute extends RouteBuilder {
"&destinationBucket=" + GoogleStorageResource.DEST_BUCKET +
"&moveAfterRead=true" +
"&includeBody=true")
- .id(GoogleStorageResource.POLLING_ROUTE_NAME)
- .to(GoogleStorageResource.DIRECT_POLLING);
+ .id(GoogleStorageResource.POLLING_ROUTE_NAME)
+ .to(GoogleStorageResource.DIRECT_POLLING);
}
}
diff --git a/integration-tests/grpc/src/main/java/org/apache/camel/quarkus/component/grpc/it/GrpcRoute.java b/integration-tests/grpc/src/main/java/org/apache/camel/quarkus/component/grpc/it/GrpcRoute.java
index ace3285a62..4bd2b00174 100644
--- a/integration-tests/grpc/src/main/java/org/apache/camel/quarkus/component/grpc/it/GrpcRoute.java
+++ b/integration-tests/grpc/src/main/java/org/apache/camel/quarkus/component/grpc/it/GrpcRoute.java
@@ -45,12 +45,12 @@ public class GrpcRoute extends RouteBuilder {
fromF("grpc://localhost:{{camel.grpc.test.forward.completed.server.port}}/%s?consumerStrategy=PROPAGATION&forwardOnCompleted=true",
PING_PONG_SERVICE)
- .to("mock:forwardOnCompleted");
+ .to("mock:forwardOnCompleted");
fromF("grpc://localhost:{{camel.grpc.test.forward.error.server.port}}/%s?consumerStrategy=PROPAGATION&forwardOnError=true",
PING_PONG_SERVICE)
- .filter().body(Throwable.class)
- .to("mock:forwardOnError");
+ .filter().body(Throwable.class)
+ .to("mock:forwardOnError");
from("direct:grpcStream")
.toF("grpc://localhost:{{camel.grpc.test.server.port}}/%s?producerStrategy=STREAMING&streamRepliesTo=direct:grpcStreamReplies&method=pingAsyncAsync",
@@ -58,35 +58,35 @@ public class GrpcRoute extends RouteBuilder {
fromF("grpc://localhost:{{camel.grpc.test.route.controlled.server.port}}/%s?synchronous=true&consumerStrategy=PROPAGATION&routeControlledStreamObserver=true",
PING_PONG_SERVICE)
- .process(exchange -> {
- Message message = exchange.getMessage();
- PingRequest pingRequest = message.getBody(PingRequest.class);
-
- StreamObserver<Object> responseObserver = (StreamObserver<Object>) exchange
- .getProperty(GrpcConstants.GRPC_RESPONSE_OBSERVER);
- PongResponse pongResponse = PongResponse.newBuilder()
- .setPongName(pingRequest.getPingName() + " PONG")
- .setPongId(pingRequest.getPingId())
- .build();
-
- message.setBody(pongResponse, PongResponse.class);
- exchange.setMessage(message);
- responseObserver.onNext(pongResponse);
- responseObserver.onCompleted();
- });
+ .process(exchange -> {
+ Message message = exchange.getMessage();
+ PingRequest pingRequest = message.getBody(PingRequest.class);
+
+ StreamObserver<Object> responseObserver = (StreamObserver<Object>) exchange
+ .getProperty(GrpcConstants.GRPC_RESPONSE_OBSERVER);
+ PongResponse pongResponse = PongResponse.newBuilder()
+ .setPongName(pingRequest.getPingName() + " PONG")
+ .setPongId(pingRequest.getPingId())
+ .build();
+
+ message.setBody(pongResponse, PongResponse.class);
+ exchange.setMessage(message);
+ responseObserver.onNext(pongResponse);
+ responseObserver.onCompleted();
+ });
fromF("grpc://localhost:{{camel.grpc.test.tls.server.port}}"
+ "/%s?consumerStrategy=PROPAGATION&"
+ "negotiationType=TLS&keyCertChainResource=certs/server.pem&"
+ "keyResource=certs/server.key&trustCertCollectionResource=certs/ca.pem", PING_PONG_SERVICE)
- .process("messageOriginProcessor")
- .choice()
- .when(simple("${header.origin} == 'producer'"))
- .bean(new GrpcMessageBuilder(), "buildAsyncPongResponse")
- .endChoice()
- .otherwise()
- .to("mock:tls")
- .bean(new GrpcMessageBuilder(), "buildAsyncPongResponse").endChoice();
+ .process("messageOriginProcessor")
+ .choice()
+ .when(simple("${header.origin} == 'producer'"))
+ .bean(new GrpcMessageBuilder(), "buildAsyncPongResponse")
+ .endChoice()
+ .otherwise()
+ .to("mock:tls")
+ .bean(new GrpcMessageBuilder(), "buildAsyncPongResponse").endChoice();
from("direct:sendTls")
.toF("grpc://localhost:{{camel.grpc.test.tls.server.port}}"
@@ -97,14 +97,14 @@ public class GrpcRoute extends RouteBuilder {
fromF("grpc://localhost:{{camel.grpc.test.jwt.server.port}}"
+ "/%s?consumerStrategy=PROPAGATION&"
+ "authenticationType=JWT&jwtSecret=%s", PING_PONG_SERVICE, GRPC_JWT_SECRET)
- .process("messageOriginProcessor")
- .choice()
- .when(simple("${header.origin} == 'producer'"))
- .bean(new GrpcMessageBuilder(), "buildAsyncPongResponse")
- .endChoice()
- .otherwise()
- .to("mock:jwt")
- .bean(new GrpcMessageBuilder(), "buildAsyncPongResponse").endChoice();
+ .process("messageOriginProcessor")
+ .choice()
+ .when(simple("${header.origin} == 'producer'"))
+ .bean(new GrpcMessageBuilder(), "buildAsyncPongResponse")
+ .endChoice()
+ .otherwise()
+ .to("mock:jwt")
+ .bean(new GrpcMessageBuilder(), "buildAsyncPongResponse").endChoice();
from("direct:sendJwt")
.toF("grpc://localhost:{{camel.grpc.test.jwt.server.port}}"
diff --git a/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpService.java b/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpService.java
index ead9323b87..c341b4768e 100644
--- a/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpService.java
+++ b/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpService.java
@@ -73,7 +73,7 @@ public class HttpService {
@GET
@Path("/custom-vertx-options")
public void customVertxOptions() {
- // We are not expected to pass here as the Vert.x HTTP client should throw IllegalArgumentException
+ // We are not expected to pass here as the Vert.x HTTP client should throw IllegalArgumentException
}
@GET
diff --git a/integration-tests/kafka/src/main/java/org/apache/camel/quarkus/component/kafka/CamelKafkaRoutes.java b/integration-tests/kafka/src/main/java/org/apache/camel/quarkus/component/kafka/CamelKafkaRoutes.java
index b6e052f728..cdbc5874d0 100644
--- a/integration-tests/kafka/src/main/java/org/apache/camel/quarkus/component/kafka/CamelKafkaRoutes.java
+++ b/integration-tests/kafka/src/main/java/org/apache/camel/quarkus/component/kafka/CamelKafkaRoutes.java
@@ -87,7 +87,7 @@ public class CamelKafkaRoutes extends RouteBuilder {
from("kafka:test-serializer?autoOffsetReset=earliest" +
"&keyDeserializer=org.apache.kafka.common.serialization.IntegerDeserializer" +
"&valueDeserializer=org.apache.kafka.common.serialization.DoubleDeserializer")
- .to(SEDA_SERIALIZER);
+ .to(SEDA_SERIALIZER);
// Header Propagation using CustomHeaderDeserialize
from("kafka:test-propagation?headerDeserializer=#customHeaderDeserializer")
diff --git a/integration-tests/ldap/src/main/java/org/apache/camel/quarkus/component/ldap/it/LdapResource.java b/integration-tests/ldap/src/main/java/org/apache/camel/quarkus/component/ldap/it/LdapResource.java
index f15a3b47af..746524857b 100644
--- a/integration-tests/ldap/src/main/java/org/apache/camel/quarkus/component/ldap/it/LdapResource.java
+++ b/integration-tests/ldap/src/main/java/org/apache/camel/quarkus/component/ldap/it/LdapResource.java
@@ -54,7 +54,7 @@ public class LdapResource {
* Extracts the LDAP connection parameters passed from the test and creates a
* {@link javax.naming.directory.DirContext} from them.
* The DirContext is then bound into the CamelContext for use in the LDAP route.
- *
+ *
* @param options
* @throws Exception
*/
@@ -114,7 +114,7 @@ public class LdapResource {
* Converts the list of {@link javax.naming.directory.SearchResult} objects into
* a structure that Jackson can
* serialize into JSON.
- *
+ *
* @param searchResults
* @return
* @throws Exception
diff --git a/integration-tests/ldap/src/test/java/org/apache/camel/quarkus/component/ldap/it/LdapTest.java b/integration-tests/ldap/src/test/java/org/apache/camel/quarkus/component/ldap/it/LdapTest.java
index 03c97de128..6cbeb72091 100644
--- a/integration-tests/ldap/src/test/java/org/apache/camel/quarkus/component/ldap/it/LdapTest.java
+++ b/integration-tests/ldap/src/test/java/org/apache/camel/quarkus/component/ldap/it/LdapTest.java
@@ -78,7 +78,7 @@ class LdapTest {
/**
* Calls a Camel route to search for LDAP entries where the uid is "tcruise".
* The test is run in both SSL and non-SSL modes.
- *
+ *
* @param useSSL
* @throws Exception
*/
@@ -103,7 +103,7 @@ class LdapTest {
/**
* Tests the escaping of search values using the
* {@link org.apache.camel.component.ldap.LdapHelper} class.
- *
+ *
* @throws Exception
*/
@Test
@@ -126,7 +126,7 @@ class LdapTest {
* Configures the
* {@link org.apache.camel.quarkus.component.ldap.it.LdapResource} by sending it
* a Map of connection properties.
- *
+ *
* @param useSSL
* @throws Exception
*/
diff --git a/integration-tests/lumberjack/src/test/java/org/apache/camel/quarkus/component/lumberjack/it/LumberjackClientUtil.java b/integration-tests/lumberjack/src/test/java/org/apache/camel/quarkus/component/lumberjack/it/LumberjackClientUtil.java
index e6548cae1f..21c79c415d 100644
--- a/integration-tests/lumberjack/src/test/java/org/apache/camel/quarkus/component/lumberjack/it/LumberjackClientUtil.java
+++ b/integration-tests/lumberjack/src/test/java/org/apache/camel/quarkus/component/lumberjack/it/LumberjackClientUtil.java
@@ -47,7 +47,7 @@ public class LumberjackClientUtil {
/**
* Send payload to Lumberjack server
- *
+ *
* @param port
* @param withSslContextParameters
* @return
@@ -117,7 +117,7 @@ public class LumberjackClientUtil {
/**
* read window frame and writes in ByteBuf
- *
+ *
* @param resource
* @return
*/
diff --git a/integration-tests/mail/src/main/java/org/apache/camel/quarkus/component/mail/CamelRoute.java b/integration-tests/mail/src/main/java/org/apache/camel/quarkus/component/mail/CamelRoute.java
index 8946f319e0..05c323a60d 100644
--- a/integration-tests/mail/src/main/java/org/apache/camel/quarkus/component/mail/CamelRoute.java
+++ b/integration-tests/mail/src/main/java/org/apache/camel/quarkus/component/mail/CamelRoute.java
@@ -102,52 +102,52 @@ public class CamelRoute extends RouteBuilder {
fromF("pop3://localhost:%d?initialDelay=100&delay=500&username=%s&password=%s&delete=true", pop3Port, USERNAME,
PASSWORD)
- .id(Routes.pop3ReceiveRoute.name())
- .autoStartup(false)
- .process(exchange -> handleMail(exchange));
+ .id(Routes.pop3ReceiveRoute.name())
+ .autoStartup(false)
+ .process(exchange -> handleMail(exchange));
fromF("pop3s://localhost:%d?initialDelay=100&delay=500&username=%s&password=%s&delete=true&sslContextParameters=#sslContextParameters&additionalJavaMailProperties=#additionalProperties",
pop3sPort, USERNAME,
PASSWORD)
- .id(Routes.pop3sReceiveRoute.name())
- .autoStartup(false)
- .process(exchange -> handleMail(exchange));
+ .id(Routes.pop3sReceiveRoute.name())
+ .autoStartup(false)
+ .process(exchange -> handleMail(exchange));
fromF("imap://localhost:%d?initialDelay=100&delay=500&username=%s&password=%s&delete=true", imapPort, USERNAME,
PASSWORD)
- .id(Routes.imapReceiveRoute.name())
- .autoStartup(false)
- .process(exchange -> handleMail(exchange));
+ .id(Routes.imapReceiveRoute.name())
+ .autoStartup(false)
+ .process(exchange -> handleMail(exchange));
fromF("imaps://localhost:%d?initialDelay=100&delay=500&username=%s&password=%s&delete=true&sslContextParameters=#sslContextParameters&additionalJavaMailProperties=#additionalProperties",
imapsPort, USERNAME,
PASSWORD)
- .id(Routes.imapsReceiveRoute.name())
- .autoStartup(false)
- .process(exchange -> handleMail(exchange));
+ .id(Routes.imapsReceiveRoute.name())
+ .autoStartup(false)
+ .process(exchange -> handleMail(exchange));
fromF("pop3://localhost:%d?initialDelay=100&delay=500&username=%s&password=%s"
+ "&delete=true&maxMessagesPerPoll=3", pop3Port, USERNAME, PASSWORD)
- .id(Routes.batchReceiveRoute.name())
- .autoStartup(false)
- .process(e -> {
- Map<String, Object> map = handleMail(e);
- map.put(ExchangePropertyKey.BATCH_INDEX.getName(), e.getProperty(ExchangePropertyKey.BATCH_INDEX));
- map.put(ExchangePropertyKey.BATCH_COMPLETE.getName(),
- e.getProperty(ExchangePropertyKey.BATCH_COMPLETE));
- map.put(ExchangePropertyKey.BATCH_SIZE.getName(), e.getProperty(ExchangePropertyKey.BATCH_SIZE));
- });
+ .id(Routes.batchReceiveRoute.name())
+ .autoStartup(false)
+ .process(e -> {
+ Map<String, Object> map = handleMail(e);
+ map.put(ExchangePropertyKey.BATCH_INDEX.getName(), e.getProperty(ExchangePropertyKey.BATCH_INDEX));
+ map.put(ExchangePropertyKey.BATCH_COMPLETE.getName(),
+ e.getProperty(ExchangePropertyKey.BATCH_COMPLETE));
+ map.put(ExchangePropertyKey.BATCH_SIZE.getName(), e.getProperty(ExchangePropertyKey.BATCH_SIZE));
+ });
fromF("pop3://localhost:%d?initialDelay=100&delay=500&username=%s&password=%s&delete=true", pop3Port, USERNAME,
PASSWORD)
- .id(Routes.convertersRoute.name())
- .autoStartup(false)
- .process(e -> {
- MailConverters.toInputStream(e.getIn().getBody(MailMessage.class).getMessage());
- InputStream is = MailConverters.toInputStream(e.getIn().getBody(MailMessage.class).getMessage());
- Map<String, Object> map = handleMail(e);
- map.put("convertedStream", is);
- });
+ .id(Routes.convertersRoute.name())
+ .autoStartup(false)
+ .process(e -> {
+ MailConverters.toInputStream(e.getIn().getBody(MailMessage.class).getMessage());
+ InputStream is = MailConverters.toInputStream(e.getIn().getBody(MailMessage.class).getMessage());
+ Map<String, Object> map = handleMail(e);
+ map.put("convertedStream", is);
+ });
}
diff --git a/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTestResource.java b/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTestResource.java
index bf857427ca..2892dfaca9 100644
--- a/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTestResource.java
+++ b/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTestResource.java
@@ -34,11 +34,11 @@ public class MailTestResource implements QuarkusTestResourceLifecycleManager {
container = new GenericContainer<>(new ImageFromDockerfile()
.withFileFromClasspath("Dockerfile", "Dockerfile")
.withFileFromClasspath("greenmail.p12", "greenmail.p12"))
- .withExposedPorts(MailProtocol.allPorts())
- .waitingFor(new HttpWaitStrategy()
- .forPort(MailProtocol.API.getPort())
- .forPath("/api/service/readiness")
- .forStatusCode(200));
+ .withExposedPorts(MailProtocol.allPorts())
+ .waitingFor(new HttpWaitStrategy()
+ .forPort(MailProtocol.API.getPort())
+ .forPath("/api/service/readiness")
+ .forStatusCode(200));
container.start();
diff --git a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/SalesforceResource.java b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/SalesforceResource.java
index 25c3534c87..43696b2c1a 100644
--- a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/SalesforceResource.java
+++ b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/SalesforceResource.java
@@ -193,7 +193,7 @@ public class SalesforceResource {
.withHeader("Sforce-Limit-Info", Collections.singletonList("api-usage")).send();
GlobalObjectsAndHeaders objectsAndHeaders = new GlobalObjectsAndHeaders(
exchange.getMessage().getBody(GlobalObjects.class))
- .withHeader("Sforce-Limit-Info", exchange.getMessage().getHeader("Sforce-Limit-Info", String.class));
+ .withHeader("Sforce-Limit-Info", exchange.getMessage().getHeader("Sforce-Limit-Info", String.class));
return objectsAndHeaders.getHeader("Sforce-Limit-Info");
}
diff --git a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/SalesforceRoutes.java b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/SalesforceRoutes.java
index 8c60839b44..a4d7490441 100644
--- a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/SalesforceRoutes.java
+++ b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/SalesforceRoutes.java
@@ -79,13 +79,13 @@ public class SalesforceRoutes extends RouteBuilder {
from("salesforce:subscribe:CamelTestTopic?notifyForFields=ALL&"
+ "notifyForOperationCreate=true¬ifyForOperationDelete=true¬ifyForOperationUpdate=true&"
+ "sObjectClass=" + Account.class.getName() + "&updateTopic=true&sObjectQuery=SELECT Id, Name FROM Account")
- .to("seda:CamelTestTopic");
+ .to("seda:CamelTestTopic");
// Streaming API : topic consumer with RAW Payload - getting json as String
from("salesforce:subscribe:CamelTestTopic?rawPayload=true¬ifyForFields=ALL&"
+ "notifyForOperationCreate=true¬ifyForOperationDelete=true¬ifyForOperationUpdate=true&"
+ "updateTopic=true&sObjectQuery=SELECT Id, Name FROM Account")
- .to("seda:RawPayloadCamelTestTopic");
+ .to("seda:RawPayloadCamelTestTopic");
// it takes some time for the subscriber to subscribe, so we'll try to
// send repeated platform events and wait until the first one is
diff --git a/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/SqlRoutes.java b/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/SqlRoutes.java
index 7c20b2996f..c6f23a7294 100644
--- a/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/SqlRoutes.java
+++ b/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/SqlRoutes.java
@@ -76,19 +76,19 @@ public class SqlRoutes extends RouteBuilder {
from(String.format("sql:select * from projectsViaSql where processed = %s"
+ " order by id?initialDelay=0&delay=50&consumer.onConsume=update projectsViaSql set processed = %s"
+ " where id = :#id", representationOfFalse, representationOfTrue))
- .process(e -> results.get("consumerRoute").add(e.getMessage().getBody(Map.class)));
+ .process(e -> results.get("consumerRoute").add(e.getMessage().getBody(Map.class)));
from(String.format("sql:classpath:sql/common/%s?initialDelay=0&delay=50&" +
"consumer.onConsume=update projectsViaClasspath set processed = %s", selectProjectsScriptName,
representationOfTrue))
- .process(e -> results.get("consumerClasspathRoute").add(e.getMessage().getBody(Map.class)));
+ .process(e -> results.get("consumerClasspathRoute").add(e.getMessage().getBody(Map.class)));
//File `sql/common/selectProjectsAs*.sql` is copied and modified to create tmp file for another test case
// (to have different file for the sql request from file and from classpath)
Path tmpFile = createTmpFileFrom("sql/common/" + selectProjectsScriptName);
from(String.format("sql:file:%s?initialDelay=0&delay=50&" +
"consumer.onConsume=update projectsViaFile set processed = %s", tmpFile, representationOfTrue))
- .process(e -> results.get("consumerFileRoute").add(e.getMessage().getBody(Map.class)));
+ .process(e -> results.get("consumerFileRoute").add(e.getMessage().getBody(Map.class)));
from("direct:transacted")
.transacted("PROPAGATION_REQUIRED")
diff --git a/integration-tests/sql/src/test/java/org/apache/camel/quarkus/component/sql/it/SqlTest.java b/integration-tests/sql/src/test/java/org/apache/camel/quarkus/component/sql/it/SqlTest.java
index e7ddf3f11b..80c442645f 100644
--- a/integration-tests/sql/src/test/java/org/apache/camel/quarkus/component/sql/it/SqlTest.java
+++ b/integration-tests/sql/src/test/java/org/apache/camel/quarkus/component/sql/it/SqlTest.java
@@ -107,7 +107,7 @@ class SqlTest {
postMapWithParam("/sql/insert",
"table", "projects" + via,
project)
- .statusCode(201);
+ .statusCode(201);
//wait for the record to be caught
await().atMost(30, TimeUnit.SECONDS).until(() -> (Iterable<Object>) RestAssured
@@ -118,7 +118,7 @@ class SqlTest {
postMapWithParam("/sql/update",
"table", "projects" + via,
updatedProject)
- .statusCode(201);
+ .statusCode(201);
//wait for the record to be caught
await().atMost(30, TimeUnit.SECONDS).until(() -> (Iterable<Object>) RestAssured
@@ -132,23 +132,23 @@ class SqlTest {
postMap("/sql/toDirect/transacted", CollectionHelper.mapOf(SqlConstants.SQL_QUERY,
"insert into projectsViaSql values (5, 'Transacted', 'ASF', BOOLEAN_FALSE)",
"rollback", false))
- .statusCode(204);
+ .statusCode(204);
postMap("/sql/toDirect/transacted", CollectionHelper.mapOf(SqlConstants.SQL_QUERY,
"select * from projectsViaSql where project = 'Transacted'"))
- .statusCode(200)
- .body("size()", is(1));
+ .statusCode(200)
+ .body("size()", is(1));
postMap("/sql/toDirect/transacted", CollectionHelper.mapOf(SqlConstants.SQL_QUERY,
"insert into projectsViaSql values (6, 'Transacted', 'ASF', BOOLEAN_FALSE)",
"rollback", true))
- .statusCode(200)
- .body(is("java.lang.Exception:forced Exception"));
+ .statusCode(200)
+ .body(is("java.lang.Exception:forced Exception"));
postMap("/sql/toDirect/transacted",
CollectionHelper.mapOf(SqlConstants.SQL_QUERY, "select * from projectsViaSql where project = 'Transacted'"))
- .statusCode(200)
- .body("size()", is(1));
+ .statusCode(200)
+ .body("size()", is(1));
}
@Test
@@ -165,25 +165,25 @@ class SqlTest {
postMapWithParam("/sql/toDirect/idempotent",
"body", "one",
CollectionHelper.mapOf("messageId", "1"))
- .statusCode(200);
+ .statusCode(200);
// add value with key 2
postMapWithParam("/sql/toDirect/idempotent",
"body", "two",
CollectionHelper.mapOf("messageId", "2"))
- .statusCode(200);
+ .statusCode(200);
// add same value with key 3
postMapWithParam("/sql/toDirect/idempotent",
"body", "three",
CollectionHelper.mapOf("messageId", "3"))
- .statusCode(200);
+ .statusCode(200);
// add another value with key 1 -- this one is supposed to be skipped
postMapWithParam("/sql/toDirect/idempotent",
"body", "four",
CollectionHelper.mapOf("messageId", "1"))
- .statusCode(200);
+ .statusCode(200);
// get all values from the result map
await().atMost(5, TimeUnit.SECONDS).until(() -> (Iterable<? extends String>) RestAssured
diff --git a/pom.xml b/pom.xml
index 8903f8dcf6..5ee3126808 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,36 +170,34 @@
<!-- Maven plugin versions (keep sorted alphabetically) -->
<cq-plugin.version>4.1.3</cq-plugin.version>
<cyclonedx-maven-plugin-version>2.7.9</cyclonedx-maven-plugin-version>
- <build-helper-maven-plugin.version>3.1.0</build-helper-maven-plugin.version>
- <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
- <formatter-maven-plugin.version>2.17.1</formatter-maven-plugin.version>
- <frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
+ <build-helper-maven-plugin.version>3.4.0</build-helper-maven-plugin.version>
+ <exec-maven-plugin.version>3.1.0</exec-maven-plugin.version>
+ <formatter-maven-plugin.version>2.22.0</formatter-maven-plugin.version>
<groovy-maven-plugin.version>2.1.1</groovy-maven-plugin.version>
<groovy.version>3.0.14</groovy.version>
- <impsort-maven-plugin.version>1.8.0</impsort-maven-plugin.version>
- <jandex-maven-plugin.version>1.0.8</jandex-maven-plugin.version>
+ <impsort-maven-plugin.version>1.9.0</impsort-maven-plugin.version>
+ <jandex-maven-plugin.version>1.2.3</jandex-maven-plugin.version>
<keytool-maven-plugin.version>1.7</keytool-maven-plugin.version>
- <mycila-license.version>3.0</mycila-license.version>
- <maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
- <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
- <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
+ <license-maven-plugin.version>4.2</license-maven-plugin.version>
+ <maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>
+ <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+ <maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
- <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
- <maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
- <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
- <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
- <maven-plugin-plugin.version>3.6.4</maven-plugin-plugin.version>
- <maven-source-plugin.version>3.1.0</maven-source-plugin.version>
- <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
- <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
- <maven-scm-plugin.version>1.11.3</maven-scm-plugin.version>
+ <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
+ <maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
+ <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+ <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
+ <maven-plugin-plugin.version>3.9.0</maven-plugin-plugin.version>
+ <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
+ <maven-release-plugin.version>3.0.0</maven-release-plugin.version>
+ <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
+ <maven-scm-plugin.version>2.0.0</maven-scm-plugin.version>
<maven-shade-plugin.version>3.4.1</maven-shade-plugin.version>
<!-- NOTE: We pin to this version due to https://github.com/apache/camel-quarkus/issues/723 -->
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<os-maven-plugin.version>${os-maven-plugin-version}</os-maven-plugin.version>
- <properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
<protobuf-maven-plugin.version>${protobuf-maven-plugin-version}</protobuf-maven-plugin.version>
- <rpkgtests-maven-plugin.version>0.10.0</rpkgtests-maven-plugin.version>
+ <rpkgtests-maven-plugin.version>1.0.0</rpkgtests-maven-plugin.version>
<!-- Plugin configuration through properties -->
@@ -474,7 +472,7 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
- <version>${mycila-license.version}</version>
+ <version>${license-maven-plugin.version}</version>
<configuration>
<failIfUnknown>true</failIfUnknown>
<header>header.txt</header>
@@ -502,6 +500,8 @@
<exclude>**/*.kts</exclude>
<exclude>**/*.ldif</exclude>
<exclude>**/*.lock</exclude>
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.log.*</exclude>
<exclude>**/*.mp3</exclude>
<exclude>**/*.mp4</exclude>
<exclude>**/*.mvel</exclude>
diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java
index a0aac00eb0..70910d51d8 100644
--- a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java
+++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java
@@ -163,7 +163,7 @@ public class CamelQuarkusTestSupport extends CamelTestSupport
* This method is not called on Camel Quarkus because the `CamelRegistry` is created and owned by Quarkus CDI container.
* If you need to customize the registry upon creation, you may want to override {@link #createCamelContext()}
* in the following way:
- *
+ *
* <pre>
* @Override
* protected CamelContext createCamelContext() throws Exception {
@@ -173,7 +173,7 @@ public class CamelQuarkusTestSupport extends CamelTestSupport
* return ctx;
* }
* </pre>
- *
+ *
* @return Never returns any result. UnsupportedOperationException is thrown instead.
*/
@Override
diff --git a/tooling/perf-regression/cq-perf-regression-sample-base/pom.xml b/tooling/perf-regression/cq-perf-regression-sample-base/pom.xml
index 917d8a2abe..1707978d71 100644
--- a/tooling/perf-regression/cq-perf-regression-sample-base/pom.xml
+++ b/tooling/perf-regression/cq-perf-regression-sample-base/pom.xml
@@ -30,13 +30,12 @@
</parent>
<artifactId>cq-perf-regression-sample</artifactId>
<properties>
- <compiler-plugin.version>3.8.1</compiler-plugin.version>
+ <hyperfoil-maven-plugin.version>0.24.1</hyperfoil-maven-plugin.version>
<maven.compiler.parameters>true</maven.compiler.parameters>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
</properties>
<!-- The repositories will be set programmatically, if needed -->
<pluginRepositories />
@@ -187,7 +186,7 @@
<plugin>
<groupId>io.hyperfoil</groupId>
<artifactId>hyperfoil-maven-plugin</artifactId>
- <version>0.22</version>
+ <version>${hyperfoil-maven-plugin.version}</version>
<!-- Bound to integration-test phase by default -->
<configuration>
<yaml>cq-perf-regression-scenario.hf.yaml</yaml>
@@ -215,7 +214,6 @@
<plugins>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>${surefire-plugin.version}</version>
<executions>
<execution>
<goals>