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

Bumped PMD version to 8.29 #1564

Merged
merged 1 commit into from
Sep 11, 2023
+20 −51
Merged

Bumped PMD version to 8.29 #1564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions connectors/camel-sjms2-kafka-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions ...fka-connector/src/main/java/org/apache/camel/kafkaconnector/sjms2/CamelSjms2SinkTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}};
}
}
2 changes: 0 additions & 2 deletions ...a-connector/src/main/java/org/apache/camel/kafkaconnector/sjms2/CamelSjms2SourceTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}};
}
}
19 changes: 4 additions & 15 deletions connectors/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
</dependencies>

<repositories>
Expand Down Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion tests/itests-cxf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>

</dependencies>
Expand Down
1 change: 0 additions & 1 deletion tests/itests-cxfrs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>

<dependency>
Expand Down
7 changes: 4 additions & 3 deletions ...c/test/java/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
22 changes: 6 additions & 16 deletions ...pache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT/maven_project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,12 @@
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
Expand Down Expand Up @@ -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>
Loading