From d62bc8b60112c313b2a68a0a24cb7a2570a3e2c2 Mon Sep 17 00:00:00 2001 From: Andrea Tarocchi Date: Mon, 11 Sep 2023 13:22:39 +0200 Subject: [PATCH] Bumped PMD version to 8.29 --- .../camel-sjms2-kafka-connector/pom.xml | 5 ----- .../sjms2/CamelSjms2SinkTask.java | 2 -- .../sjms2/CamelSjms2SourceTask.java | 2 -- connectors/pom.xml | 19 ++++------------ .../kafkaconnector/CamelSourceTaskTest.java | 10 ++++----- parent/pom.xml | 2 +- tests/itests-cxf/pom.xml | 1 - tests/itests-cxfrs/pom.xml | 1 - .../GenerateCamelKafkaConnectorsMojoIT.java | 7 +++--- .../maven_project/pom.xml | 22 +++++-------------- 10 files changed, 20 insertions(+), 51 deletions(-) diff --git a/connectors/camel-sjms2-kafka-connector/pom.xml b/connectors/camel-sjms2-kafka-connector/pom.xml index 149c0bfe29..2b7e700588 100644 --- a/connectors/camel-sjms2-kafka-connector/pom.xml +++ b/connectors/camel-sjms2-kafka-connector/pom.xml @@ -45,11 +45,6 @@ camel-sjms2 - - org.apache.activemq - artemis-jms-client - runtime - org.apache.camel.kafkaconnector camel-kafka-connector diff --git a/connectors/camel-sjms2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/sjms2/CamelSjms2SinkTask.java b/connectors/camel-sjms2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/sjms2/CamelSjms2SinkTask.java index 3eea25acf7..7ee5dda013 100644 --- a/connectors/camel-sjms2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/sjms2/CamelSjms2SinkTask.java +++ b/connectors/camel-sjms2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/sjms2/CamelSjms2SinkTask.java @@ -33,8 +33,6 @@ protected CamelSinkConnectorConfig getCamelSinkConnectorConfig( protected Map getDefaultConfig() { return new HashMap() {{ put(CamelSinkConnectorConfig.CAMEL_SINK_COMPONENT_CONF, "sjms2"); - put("camel.component.sjms2.connection-factory", "#class:org.apache.activemq.ActiveMQConnectionFactory"); - put("camel.component.sjms2.connection-factory.brokerURL", "tcp://localhost:61616"); }}; } } \ No newline at end of file diff --git a/connectors/camel-sjms2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/sjms2/CamelSjms2SourceTask.java b/connectors/camel-sjms2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/sjms2/CamelSjms2SourceTask.java index 21f5091aca..b5aaf5b945 100644 --- a/connectors/camel-sjms2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/sjms2/CamelSjms2SourceTask.java +++ b/connectors/camel-sjms2-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/sjms2/CamelSjms2SourceTask.java @@ -33,8 +33,6 @@ protected CamelSourceConnectorConfig getCamelSourceConnectorConfig( protected Map getDefaultConfig() { return new HashMap() {{ put(CamelSourceConnectorConfig.CAMEL_SOURCE_COMPONENT_CONF, "sjms2"); - put("camel.component.sjms2.connection-factory", "#class:org.apache.activemq.ActiveMQConnectionFactory"); - put("camel.component.sjms2.connection-factory.brokerURL", "tcp://localhost:61616"); }}; } } \ No newline at end of file diff --git a/connectors/pom.xml b/connectors/pom.xml index 0f7f4f89ad..0ab1a1436a 100644 --- a/connectors/pom.xml +++ b/connectors/pom.xml @@ -41,6 +41,10 @@ + + javax.annotation + javax.annotation-api + @@ -198,21 +202,6 @@ - - - java11-build - - [11,) - - - - javax.annotation - javax.annotation-api - 1.3.2 - - - - camel-aws-cloudtrail-source-kafka-connector camel-aws-cloudwatch-sink-kafka-connector diff --git a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java index 8542a4f670..70433c4918 100644 --- a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java +++ b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java @@ -454,11 +454,11 @@ public void testSourcePollingWithAggregationBySize() { for (int i = 0; i < size / chunkSize; i++) { assertThat(records) - .element(i) - .hasFieldOrPropertyWithValue( - "value", - IntStream.range(i * chunkSize, (i * chunkSize) + chunkSize).mapToObj(Integer::toString).collect(Collectors.joining("|")) - ); + .element(i) + .hasFieldOrPropertyWithValue( + "value", + IntStream.range(i * chunkSize, (i * chunkSize) + chunkSize).mapToObj(Integer::toString).collect(Collectors.joining("|")) + ); } } finally { diff --git a/parent/pom.xml b/parent/pom.xml index 3dd9e19294..6c0438fd58 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -52,7 +52,7 @@ 2.12.12 1.6.0 - 8.26 + 8.29 3.1.0 3.0.0-M4 0.0.7 diff --git a/tests/itests-cxf/pom.xml b/tests/itests-cxf/pom.xml index 009e76f44b..5fc69140ab 100644 --- a/tests/itests-cxf/pom.xml +++ b/tests/itests-cxf/pom.xml @@ -86,7 +86,6 @@ javax.annotation javax.annotation-api - 1.3.2 diff --git a/tests/itests-cxfrs/pom.xml b/tests/itests-cxfrs/pom.xml index 6fd612a9d7..d6f95a98ec 100644 --- a/tests/itests-cxfrs/pom.xml +++ b/tests/itests-cxfrs/pom.xml @@ -60,7 +60,6 @@ javax.annotation javax.annotation-api - 1.3.2 diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/test/java/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/test/java/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT.java index 2d6d0f2d6d..b3e2d8f62a 100644 --- a/tooling/camel-kafka-connector-generator-maven-plugin/src/test/java/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT.java +++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/test/java/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT.java @@ -29,6 +29,7 @@ import com.soebes.itf.jupiter.extension.MavenGoal; import com.soebes.itf.jupiter.extension.MavenJupiterExtension; +import com.soebes.itf.jupiter.extension.MavenOption; import com.soebes.itf.jupiter.extension.MavenProject; import com.soebes.itf.jupiter.extension.MavenRepository; import com.soebes.itf.jupiter.extension.MavenTest; @@ -53,7 +54,7 @@ class GenerateCamelKafkaConnectorsMojoIT { @Order(10) @MavenGoal("clean") @MavenGoal("verify") -// @MavenOption("--no-snapshot-updates") + @MavenOption("--no-snapshot-updates") // @MavenOption(MavenCLIOptions.DEBUG) public void test_generate(MavenExecutionResult result) throws IOException { assertThat(result).isSuccessful(); @@ -91,9 +92,9 @@ public void test_generate(MavenExecutionResult result) throws IOException { } @MavenTest - @Order(20) + @Order(30) @MavenGoal("package") -// @MavenOption("--no-snapshot-updates") + @MavenOption("--no-snapshot-updates") // @MavenOption(MavenCLIOptions.DEBUG) public void test_build(MavenExecutionResult result) throws IOException { assertThat(result).isSuccessful(); diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/test/resources-its/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT/maven_project/pom.xml b/tooling/camel-kafka-connector-generator-maven-plugin/src/test/resources-its/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT/maven_project/pom.xml index dfc3a9f45f..2cea91c1fc 100644 --- a/tooling/camel-kafka-connector-generator-maven-plugin/src/test/resources-its/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT/maven_project/pom.xml +++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/test/resources-its/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT/maven_project/pom.xml @@ -118,6 +118,12 @@ + + + javax.annotation + javax.annotation-api + + @@ -215,22 +221,6 @@ - - - java11-build - - [11,) - - - - javax.annotation - javax.annotation-api - 1.3.2 - - - - -