chore: Updated the dependency plugin to the latest version and did al…

…l adjustments now needed or problems now detected by it.
apache · Sep 13, 2024 · ca0f8c6 · ca0f8c6
1 parent fcc89a4
commit ca0f8c6
Show file tree

Hide file tree

Showing 9 changed files with 75 additions and 24 deletions.
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/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/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
@@ -36,12 +36,6 @@
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>org.apache.plc4x</groupId>
-      <artifactId>plc4j-api</artifactId>
-      <version>0.13.0-SNAPSHOT</version>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.plc4x</groupId>
       <artifactId>plc4j-spi</artifactId>
@@ -71,6 +65,12 @@
       <artifactId>jSerialComm</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.plc4x</groupId>
+      <artifactId>plc4j-api</artifactId>
+      <version>0.13.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-codec</artifactId>

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/pom.xml b/pom.xml
@@ -1362,15 +1362,14 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <!--
-          TODO: somehow the newer version (checked till 3.8.0) is broken as it reports dependencies which are compile in fact
-          e.g. plc4j-connection-pool:
-          [INFO] - maven-dependency-plugin:3.2.0:analyze-only (check-dependencies) @ plc4j-connection-pool -
-          [WARNING] Non-test scoped test only dependencies found:
-          [WARNING]    org.apache.commons:commons-pool2:jar:2.11.1:compile
-          [WARNING]    org.apache.plc4x:plc4j-api:jar:0.11.0-SNAPSHOT:compile
-          -->
-          <version>3.1.2</version>
+          <version>3.8.0</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.shared</groupId>
+              <artifactId>maven-dependency-analyzer</artifactId>
+              <version>1.14.1</version>
+            </dependency>
+          </dependencies>
         </plugin>
       </plugins>
     </pluginManagement>