Bumped PMD version to 8.29

apache · Sep 11, 2023 · add37ce · add37ce
1 parent 689a363
commit add37ce
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 51 deletions.
diff --git a/connectors/camel-sjms2-kafka-connector/pom.xml b/connectors/camel-sjms2-kafka-connector/pom.xml
@@ -45,11 +45,6 @@
       <artifactId>camel-sjms2</artifactId>
     </dependency>
     <!--START OF GENERATED CODE-->
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>artemis-jms-client</artifactId>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.camel.kafkaconnector</groupId>
       <artifactId>camel-kafka-connector</artifactId>

diff --git a/...fka-connector/src/main/java/org/apache/camel/kafkaconnector/sjms2/CamelSjms2SinkTask.java b/...fka-connector/src/main/java/org/apache/camel/kafkaconnector/sjms2/CamelSjms2SinkTask.java
@@ -33,8 +33,6 @@ protected CamelSinkConnectorConfig getCamelSinkConnectorConfig(
     protected Map<String, String> getDefaultConfig() {
         return new HashMap<String, String>() {{
             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");
         }};
     }
 }
diff --git a/...a-connector/src/main/java/org/apache/camel/kafkaconnector/sjms2/CamelSjms2SourceTask.java b/...a-connector/src/main/java/org/apache/camel/kafkaconnector/sjms2/CamelSjms2SourceTask.java
@@ -33,8 +33,6 @@ protected CamelSourceConnectorConfig getCamelSourceConnectorConfig(
     protected Map<String, String> getDefaultConfig() {
         return new HashMap<String, String>() {{
             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");
         }};
     }
 }
diff --git a/connectors/pom.xml b/connectors/pom.xml
@@ -41,6 +41,10 @@
         </dependencies>
     </dependencyManagement>
     <dependencies>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+        </dependency>
     </dependencies>
 
     <repositories>
@@ -198,21 +202,6 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>java11-build</id>
-            <activation>
-                <jdk>[11,)</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>javax.annotation</groupId>
-                    <artifactId>javax.annotation-api</artifactId>
-                    <version>1.3.2</version>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
     <modules>
         <module>camel-aws-cloudtrail-source-kafka-connector</module>
         <module>camel-aws-cloudwatch-sink-kafka-connector</module>

diff --git 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
@@ -52,7 +52,7 @@
         <version.scala.library>2.12.12</version.scala.library>
         <version.maven.maven-remote-resources-plugin>1.6.0</version.maven.maven-remote-resources-plugin>
 
-        <version.maven.checkstyle>8.26</version.maven.checkstyle>
+        <version.maven.checkstyle>8.29</version.maven.checkstyle>
         <version.maven.checkstyle.plugin>3.1.0</version.maven.checkstyle.plugin>
         <version.maven.surefire.plugin>3.0.0-M4</version.maven.surefire.plugin>
         <version.plexus.build.api>0.0.7</version.plexus.build.api>

diff --git a/tests/itests-cxf/pom.xml b/tests/itests-cxf/pom.xml
@@ -86,7 +86,6 @@
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.2</version>
         </dependency>
 
     </dependencies>

diff --git a/tests/itests-cxfrs/pom.xml b/tests/itests-cxfrs/pom.xml
@@ -60,7 +60,6 @@
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.2</version>
         </dependency>
 
         <dependency>

diff --git a/...c/test/java/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT.java b/...c/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/...pache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT/maven_project/pom.xml b/...pache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT/maven_project/pom.xml
@@ -118,6 +118,12 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>
@@ -215,22 +221,6 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>java11-build</id>
-            <activation>
-                <jdk>[11,)</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>javax.annotation</groupId>
-                    <artifactId>javax.annotation-api</artifactId>
-                    <version>1.3.2</version>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
     <modules>
     </modules>
 </project>