build(deps): Updates multiple dependencies and plugins

# Parent apache parent: 33 # Plugins: - maven-invoker-plugin: 3.7.0 - maven-surefire-plugin: 3.5.0 - maven-failsafe-plugin: 3.5.0 - maven-shade-plugin: 3.6.0 - maven-site-plugin: 3.20.0 - maven-javadoc-plugin: 3.10.0 - maven-exec-plugin: 3.4.1 - maven-release-plugin: 3.1.1 - maven-dependency-plugin: 3.8.0 - groovy-maven-plugin: 2.1.1 # Dependencies: - antlr4: 4.12.2 - asertj: 3.26.3 - awaitility: 4.2.2 - byte-buddy: 1.15.1 - cmake: 3.30.2-b1 - commons-cli: 1.9.0 - commons-codec: 1.17.1 - commons-compress: 1.27.1 - commons-lang3: 3.17.0 - equalsverifier: 3.16.2 - google-java-format: 1.23.0 - groovy: 4.0.23 - hamcrest: 3.0 - jackson: 2.27.2 - junit.jupyter: 5.11.0 - logback: 1.5.8 - milo: 0.6.14 - mockito: 5.13.0 - netty: 4.1.113.Final - opentest4j: 1.3.0 - slf4j: 2.0.16 - stax2-api: 4.2.2 - woddstox-core: 7.0.0
apache · Sep 14, 2024 · 273d47d · 273d47d
1 parent 9ba4d7f
commit 273d47d
Show file tree

Hide file tree

Showing 19 changed files with 187 additions and 119 deletions.
diff --git a/code-generation/language-c/pom.xml b/code-generation/language-c/pom.xml
@@ -41,7 +41,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>3.7.0</version>
         <executions>
           <execution>
             <id>integration-test</id>

diff --git a/code-generation/language-go/pom.xml b/code-generation/language-go/pom.xml
@@ -41,7 +41,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>3.7.0</version>
         <executions>
           <execution>
             <id>integration-test</id>

diff --git a/code-generation/language-java/pom.xml b/code-generation/language-java/pom.xml
@@ -71,6 +71,7 @@
               <pomIncludes>
                 <pomInclude>*/pom.xml</pomInclude>
               </pomIncludes>
+              <mavenOpts>--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</mavenOpts>
               <!-- The goals we will be executing in the test-projects -->
               <goals>
                 <goal>test</goal>

diff --git a/jenkins.pom b/jenkins.pom
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>31</version>
+        <version>33</version>
     </parent>
 
     <groupId>org.apache.plc4x</groupId>

diff --git a/plc4j/drivers/bacnet/pom.xml b/plc4j/drivers/bacnet/pom.xml
@@ -125,10 +125,6 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-csv</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
@@ -173,6 +169,11 @@
       <artifactId>commons-codec</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.plc4x</groupId>

diff --git a/plc4j/drivers/c-bus/pom.xml b/plc4j/drivers/c-bus/pom.xml
@@ -85,6 +85,19 @@
           </instructions>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <ignoredDependencies combine.children="append">
+            <!--
+              For some reason we need to do this. The compiler needs it in order to compile,
+              but the plugin doesn't detect this.
+            -->
+            <ignoredDependency>org.apache.commons:commons-text</ignoredDependency>
+          </ignoredDependencies>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

diff --git a/plc4j/drivers/can/pom.xml b/plc4j/drivers/can/pom.xml
@@ -174,6 +174,19 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <configuration>
+              <ignoredDependencies combine.children="append">
+                <!--
+                  For some reason we need to do this. The compiler needs it in order to compile,
+                  but the plugin doesn't detect this.
+                -->
+                <ignoredDependency>io.netty:netty-buffer</ignoredDependency>
+              </ignoredDependencies>
+            </configuration>
+          </plugin>
         </plugins>
       </build>
 

diff --git a/plc4j/drivers/canopen/pom.xml b/plc4j/drivers/canopen/pom.xml
@@ -84,6 +84,19 @@
           </instructions>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <ignoredDependencies combine.children="append">
+            <!--
+              For some reason we need to do this. The compiler needs it in order to compile,
+              but the plugin doesn't detect this.
+            -->
+            <ignoredDependency>io.netty:netty-buffer</ignoredDependency>
+          </ignoredDependencies>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

diff --git a/plc4j/drivers/iec-60870/pom.xml b/plc4j/drivers/iec-60870/pom.xml
@@ -113,10 +113,6 @@
       <groupId>io.netty</groupId>
       <artifactId>netty-transport</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
@@ -128,6 +124,11 @@
       <version>0.13.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.plc4x</groupId>

diff --git a/...ers/modbus/src/main/java/org/apache/plc4x/java/modbus/base/optimizer/ModbusOptimizer.java b/...ers/modbus/src/main/java/org/apache/plc4x/java/modbus/base/optimizer/ModbusOptimizer.java
@@ -329,6 +329,8 @@ protected static class Response {
         public Response(int startingAddress, byte[] responseData) {
             this.startingAddress = startingAddress;
             this.responseData = responseData;
+            // In general a "Celil(responseData.length / 2)" would habe been more correct,
+            // but the data returned from the device should already be an even number.
             this.endingAddress = startingAddress + (responseData.length / 2);
         }
 

diff --git a/plc4j/drivers/profinet/pom.xml b/plc4j/drivers/profinet/pom.xml
@@ -124,6 +124,10 @@
       <groupId>io.netty</groupId>
       <artifactId>netty-buffer</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>

diff --git a/plc4j/pom.xml b/plc4j/pom.xml
@@ -53,28 +53,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
-          <!--
-            As dynamic agent loading has been deprecated and was starting
-            to cause issues in more recent JDK versions, we now fetch the
-            agent manually and pass it in to surefire.
-          -->
-          <execution>
-            <id>copy</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>net.bytebuddy</groupId>
-                  <artifactId>byte-buddy-agent</artifactId>
-                  <version>${byte-buddy.version}</version>
-                  <outputDirectory>${project.build.directory}</outputDirectory>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
           <!--
             Even if Maven transitively pulls in dependencies, relying on these can
             quite often cause hard to find problems. So it's a good practice to make
@@ -107,9 +85,7 @@
                 <ignoredDependency>org.slf4j:slf4j-api</ignoredDependency>
                 <ignoredDependency>ch.qos.logback:logback-classic</ignoredDependency>
                 <ignoredDependency>org.apache.groovy:groovy-test-junit5</ignoredDependency>
-                <ignoredDependency>org.apache.groovy:groovy</ignoredDependency>
                 <ignoredDependency>com.athaydes:spock-reports</ignoredDependency>
-                <ignoredDependency>org.apache.nifi:nifi-standard-nar</ignoredDependency>
               </ignoredDependencies>
             </configuration>
           </execution>
@@ -268,7 +244,7 @@
             Also do we have to pass in the byte-buddy agent to work around issues
             with dynamic loading of jvm agents.
           -->
-          <argLine>-javaagent:${project.basedir}/target/byte-buddy-agent-${byte-buddy.version}.jar -Xmx512m @{surefireArgLine}</argLine>
+          <argLine>-Xmx512m @{surefireArgLine}</argLine>
           <includes>
             <include>**/*Test.java</include>
             <include>**/*Tests.java</include>

diff --git a/plc4j/tools/opm/pom.xml b/plc4j/tools/opm/pom.xml
@@ -43,11 +43,6 @@
       <artifactId>plc4j-api</artifactId>
       <version>0.13.0-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-spi</artifactId>
-      <version>0.13.0-SNAPSHOT</version>
-    </dependency>
 
     <!-- Utils -->
     <dependency>
@@ -64,6 +59,12 @@
     </dependency>
 
     <!--Testing-->
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-spi</artifactId>
+      <version>0.13.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-driver-mock</artifactId>

diff --git a/plc4j/transports/serial/pom.xml b/plc4j/transports/serial/pom.xml
@@ -41,7 +41,6 @@
       <artifactId>plc4j-api</artifactId>
       <version>0.13.0-SNAPSHOT</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-spi</artifactId>
@@ -100,6 +99,19 @@
           </instructions>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <ignoredDependencies combine.children="append">
+            <!--
+              For some reason we need to do this. plc4j-api is indirectly needed by the spi
+              if we add it as a test-dependency, the build fails.
+            -->
+            <ignoredDependency>org.apache.plc4x:plc4j-api</ignoredDependency>
+          </ignoredDependencies>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

diff --git a/plc4j/utils/raw-sockets/pom.xml b/plc4j/utils/raw-sockets/pom.xml
@@ -103,6 +103,13 @@
           <usedDependencies>
             <usedDependency>org.pcap4j:pcap4j-packetfactory-static</usedDependency>
           </usedDependencies>
+          <ignoredDependencies combine.children="append">
+            <!--
+              For some reason we need to do this. The compiler needs it in order to compile,
+              but the plugin doesn't detect this.
+            -->
+            <ignoredDependency>io.netty:netty-common</ignoredDependency>
+          </ignoredDependencies>
         </configuration>
       </plugin>
 

diff --git a/plc4j/utils/test-generator/pom.xml b/plc4j/utils/test-generator/pom.xml
@@ -119,10 +119,6 @@
       <groupId>org.pcap4j</groupId>
       <artifactId>pcap4j-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.xmlunit</groupId>
-      <artifactId>xmlunit-matchers</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
@@ -137,6 +133,11 @@
       <!-- Explicitly managing this back to "compile" -->
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.groovy</groupId>
+      <artifactId>groovy</artifactId>
+      <version>${groovy.version}</version>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.plc4x</groupId>
@@ -169,6 +170,11 @@
       <artifactId>commons-io</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.xmlunit</groupId>
+      <artifactId>xmlunit-matchers</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>