You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2022/07/29 11:48:44 UTC
[plc4x] branch develop updated: chore(build): Updated plugins and dependencies.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new 96c2713e2 chore(build): Updated plugins and dependencies.
96c2713e2 is described below
commit 96c2713e2c677650f0f5cc2494a864170d0c5cc8
Author: Christofer Dutz <ch...@rivian.com>
AuthorDate: Fri Jul 29 13:46:21 2022 +0200
chore(build): Updated plugins and dependencies.
---
.../language-go/src/test/resources/plc4go/pom.xml | 2 +-
plc4j/drivers/opcua/pom.xml | 59 +++++++++-----------
.../examples/hello-influx-data-collection/pom.xml | 25 ---------
plc4j/examples/hello-world-kotlin/pom.xml | 5 +-
plc4j/transports/serial/pom.xml | 22 ++++----
plc4j/transports/socketcan/pom.xml | 2 +-
.../transport/socketcan/SocketCANFrameBuilder.java | 1 +
.../transport/socketcan/SocketCANTransport.java | 1 +
.../socketcan/netty/SocketCANChannel.java | 6 +--
plc4j/utils/test-generator/pom.xml | 42 +++------------
plc4j/utils/test-utils/pom.xml | 8 ---
pom.xml | 63 ++++++++++++++--------
.../ads/src/main/resources/protocols/ads/ads.mspec | 2 +-
13 files changed, 92 insertions(+), 146 deletions(-)
diff --git a/code-generation/language-go/src/test/resources/plc4go/pom.xml b/code-generation/language-go/src/test/resources/plc4go/pom.xml
index e682fe1b2..d4c746cf2 100644
--- a/code-generation/language-go/src/test/resources/plc4go/pom.xml
+++ b/code-generation/language-go/src/test/resources/plc4go/pom.xml
@@ -40,7 +40,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
+ <version>3.3.0</version>
<executions>
<execution>
<id>go-pkg</id>
diff --git a/plc4j/drivers/opcua/pom.xml b/plc4j/drivers/opcua/pom.xml
index dbb3cdaf9..cc76e25f2 100644
--- a/plc4j/drivers/opcua/pom.xml
+++ b/plc4j/drivers/opcua/pom.xml
@@ -119,8 +119,6 @@
<usedDependencies combine.children="append">
<usedDependency>org.apache.plc4x:plc4x-code-generation-language-java</usedDependency>
<usedDependency>org.apache.plc4x:plc4x-protocols-opcua</usedDependency>
- <usedDependency>org.bouncycastle:bcpkix-jdk15on</usedDependency>
- <usedDependency>org.bouncycastle:bcprov-jdk15on</usedDependency>
</usedDependencies>
</configuration>
</plugin>
@@ -129,39 +127,52 @@
<dependencies>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-api</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-transport-tcp</artifactId>
+ <artifactId>plc4j-spi</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-api</artifactId>
+ <artifactId>plc4j-transport-tcp</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-spi</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-buffer</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-utils-test-utils</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <scope>test</scope>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>io.vavr</groupId>
<artifactId>vavr</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-utils-test-utils</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.eclipse.milo</groupId>
@@ -178,12 +189,6 @@
<artifactId>stack-client</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
-
<dependency>
<groupId>org.eclipse.milo</groupId>
<artifactId>server-examples</artifactId>
@@ -214,17 +219,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <scope>compile</scope>
- </dependency>
</dependencies>
<dependencyManagement>
@@ -233,27 +227,22 @@
<groupId>org.eclipse.milo</groupId>
<artifactId>sdk-client</artifactId>
<version>${milo.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.milo</groupId>
<artifactId>stack-core</artifactId>
<version>${milo.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.milo</groupId>
<artifactId>stack-client</artifactId>
<version>${milo.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.milo</groupId>
<artifactId>server-examples</artifactId>
<version>${milo.version}</version>
- <scope>test</scope>
</dependency>
-
</dependencies>
</dependencyManagement>
diff --git a/plc4j/examples/hello-influx-data-collection/pom.xml b/plc4j/examples/hello-influx-data-collection/pom.xml
index a9e902128..5ea837b75 100644
--- a/plc4j/examples/hello-influx-data-collection/pom.xml
+++ b/plc4j/examples/hello-influx-data-collection/pom.xml
@@ -68,29 +68,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <!-- This is just examples including these checks here requires an insane amount of housekeeping. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <usedDependencies combine.children="append">
- <usedDependency>org.slf4j:log4j-over-slf4j</usedDependency>
- <usedDependency>org.apache.plc4x.sandbox:test-java-bacnetip-driver</usedDependency>
- <usedDependency>org.apache.plc4x:plc4j-transport-pcap-replay</usedDependency>
- <usedDependency>org.apache.plc4x:plc4j-transport-raw-socket</usedDependency>
- </usedDependencies>
- </configuration>
- </plugin-->
- </plugins>
- </build>
-
</project>
\ No newline at end of file
diff --git a/plc4j/examples/hello-world-kotlin/pom.xml b/plc4j/examples/hello-world-kotlin/pom.xml
index 00c1d41ea..491d7beb4 100644
--- a/plc4j/examples/hello-world-kotlin/pom.xml
+++ b/plc4j/examples/hello-world-kotlin/pom.xml
@@ -34,7 +34,6 @@
<properties>
<kotlin.version>1.7.0</kotlin.version>
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
- <junit-jupiter.version>5.8.2</junit-jupiter.version>
<app.main.class>org.apache.plc4x.java.examples.hellokotlin.ReadModbusPalKt</app.main.class>
</properties>
@@ -71,13 +70,13 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
- <version>${junit-jupiter.version}</version>
+ <version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>${junit-jupiter.version}</version>
+ <version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/plc4j/transports/serial/pom.xml b/plc4j/transports/serial/pom.xml
index 0822b7ca9..fdf5bea4d 100644
--- a/plc4j/transports/serial/pom.xml
+++ b/plc4j/transports/serial/pom.xml
@@ -32,18 +32,23 @@
<description>Base classes needed to implement plc4x drivers based on Serial connections.</description>
<dependencies>
-
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-api</artifactId>
<version>0.10.0-SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.plc4x</groupId>
+ <artifactId>plc4j-spi</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
-
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
@@ -52,10 +57,6 @@
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec</artifactId>
- </dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
@@ -67,10 +68,9 @@
</dependency>
<dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-spi</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <scope>compile</scope>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -79,6 +79,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<!--
@@ -98,4 +99,5 @@
</plugin>
</plugins>
</build>
+
</project>
\ No newline at end of file
diff --git a/plc4j/transports/socketcan/pom.xml b/plc4j/transports/socketcan/pom.xml
index 11fb52c9d..fafcf07c0 100644
--- a/plc4j/transports/socketcan/pom.xml
+++ b/plc4j/transports/socketcan/pom.xml
@@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>tel.schich</groupId>
- <artifactId>javacan</artifactId>
+ <artifactId>javacan-core</artifactId>
</dependency>
<dependency>
diff --git a/plc4j/transports/socketcan/src/main/java/org/apache/plc4x/java/transport/socketcan/SocketCANFrameBuilder.java b/plc4j/transports/socketcan/src/main/java/org/apache/plc4x/java/transport/socketcan/SocketCANFrameBuilder.java
index 93288e7c2..f2445b072 100644
--- a/plc4j/transports/socketcan/src/main/java/org/apache/plc4x/java/transport/socketcan/SocketCANFrameBuilder.java
+++ b/plc4j/transports/socketcan/src/main/java/org/apache/plc4x/java/transport/socketcan/SocketCANFrameBuilder.java
@@ -43,4 +43,5 @@ public class SocketCANFrameBuilder implements CANFrameBuilder<SocketCANFrame> {
public SocketCANFrame create() throws PlcRuntimeException {
return new SocketCANFrame(nodeId, data);
}
+
}
diff --git a/plc4j/transports/socketcan/src/main/java/org/apache/plc4x/java/transport/socketcan/SocketCANTransport.java b/plc4j/transports/socketcan/src/main/java/org/apache/plc4x/java/transport/socketcan/SocketCANTransport.java
index 08bf9b880..1aa5cf4fa 100644
--- a/plc4j/transports/socketcan/src/main/java/org/apache/plc4x/java/transport/socketcan/SocketCANTransport.java
+++ b/plc4j/transports/socketcan/src/main/java/org/apache/plc4x/java/transport/socketcan/SocketCANTransport.java
@@ -107,4 +107,5 @@ public class SocketCANTransport implements CANTransport<SocketCANFrame> {
}
};
}
+
}
diff --git a/plc4j/transports/socketcan/src/main/java/org/apache/plc4x/java/transport/socketcan/netty/SocketCANChannel.java b/plc4j/transports/socketcan/src/main/java/org/apache/plc4x/java/transport/socketcan/netty/SocketCANChannel.java
index 0c7130220..9633f322c 100644
--- a/plc4j/transports/socketcan/src/main/java/org/apache/plc4x/java/transport/socketcan/netty/SocketCANChannel.java
+++ b/plc4j/transports/socketcan/src/main/java/org/apache/plc4x/java/transport/socketcan/netty/SocketCANChannel.java
@@ -19,8 +19,6 @@
package org.apache.plc4x.java.transport.socketcan.netty;
import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
-import io.netty.buffer.ByteBufUtil;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelConfig;
import io.netty.channel.ChannelFuture;
@@ -31,10 +29,9 @@ import org.apache.plc4x.java.transport.socketcan.netty.address.SocketCANAddress;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import tel.schich.javacan.CanChannels;
-import tel.schich.javacan.CanFrame;
import tel.schich.javacan.NetworkDevice;
import tel.schich.javacan.RawCanChannel;
-import tel.schich.javacan.linux.LinuxNetworkDevice;
+import tel.schich.javacan.platform.linux.LinuxNetworkDevice;
import java.io.IOException;
import java.io.InputStream;
@@ -282,4 +279,5 @@ public class SocketCANChannel extends OioByteStreamChannel {
}
}
}
+
}
diff --git a/plc4j/utils/test-generator/pom.xml b/plc4j/utils/test-generator/pom.xml
index cf43bcd61..8fcc9ca06 100644
--- a/plc4j/utils/test-generator/pom.xml
+++ b/plc4j/utils/test-generator/pom.xml
@@ -56,9 +56,9 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -69,22 +69,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <configuration>
- <!-- this is a test util -->
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <!-- this is a test util -->
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -93,7 +77,7 @@
<dependency>
<groupId>org.spockframework</groupId>
<artifactId>spock-bom</artifactId>
- <version>2.1-groovy-3.0</version>
+ <version>2.2-M3-groovy-3.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -103,27 +87,19 @@
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
+ <artifactId>groovy-xml</artifactId>
<version>${groovy.version}</version>
- <type>pom</type>
- <!-- CVEs reported for this -->
- <exclusions>
- <exclusion>
- <groupId>org.webjars</groupId>
- <artifactId>jquery</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.pcap4j</groupId>
<artifactId>pcap4j-core</artifactId>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-utils-pcap-shared</artifactId>
<version>0.10.0-SNAPSHOT</version>
<optional>true</optional>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-spi</artifactId>
@@ -141,10 +117,6 @@
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
<artifactId>xmlunit-matchers</artifactId>
</dependency>
</dependencies>
diff --git a/plc4j/utils/test-utils/pom.xml b/plc4j/utils/test-utils/pom.xml
index ebbb43f68..9260fcf27 100644
--- a/plc4j/utils/test-utils/pom.xml
+++ b/plc4j/utils/test-utils/pom.xml
@@ -41,14 +41,6 @@
<suppressionFiles>${project.basedir}/false-positives.xml</suppressionFiles>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <usedDependencies combine.children="append">
- </usedDependencies>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/pom.xml b/pom.xml
index 8ab20e38d..010e428a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,11 +85,6 @@
</mailingLists>
<properties>
- <!--
- At least 3.3.3 required for camel-package-maven-plugin
- -->
- <maven.version>3.8.6</maven.version>
-
<java.version>11</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -131,30 +126,31 @@
<commons-text.version>1.9</commons-text.version>
<commons-csv.version>1.9.0</commons-csv.version>
<dom4j.version>2.1.3</dom4j.version>
- <equalsverifier.version>3.10</equalsverifier.version>
+ <equalsverifier.version>3.10.1</equalsverifier.version>
<freemarker.version>2.3.31</freemarker.version>
- <groovy.version>3.0.11</groovy.version>
+ <groovy.version>3.0.12</groovy.version>
<gson.version>2.9.0</gson.version>
<guava.version>31.1-jre</guava.version>
<hamcrest.version>2.2</hamcrest.version>
<httpclient.version>4.5.13</httpclient.version>
<httpcore.version>4.4.15</httpcore.version>
<jackson.version>2.13.3</jackson.version>
- <woodstox-core.version>6.2.8</woodstox-core.version>
+ <woodstox-core.version>6.3.0</woodstox-core.version>
<!-- When updating this to the latest version, we're getting errors in the opcua server tests -->
<jaxb.version>4.0.0</jaxb.version>
<jetty-util.version>11.0.11</jetty-util.version>
<jna.version>5.12.1</jna.version>
<joda-time.version>2.10.14</joda-time.version>
- <jserialcom.version>2.9.1</jserialcom.version>
- <junit.jupiter.version>5.8.2</junit.jupiter.version>
+ <jserialcom.version>2.9.2</jserialcom.version>
+ <junit.jupiter.version>5.9.0</junit.jupiter.version>
<junit.platform.version>1.8.2</junit.platform.version>
<logback.version>1.2.11</logback.version>
<maven.clean.plugin.version>3.2.0</maven.clean.plugin.version>
- <milo.version>0.6.7</milo.version>
+ <!-- version 0.6.7 is newer, however the ExampleServer doesn't seem to run with that -->
+ <!-- version 0.6.8 is being released, however the milo-examples artifact is not available yet -->
<milo.version>0.6.6</milo.version>
<mockito.version>4.6.1</mockito.version>
- <netty.version>4.1.77.Final</netty.version>
+ <netty.version>4.1.79.Final</netty.version>
<owasp-dependency-check.version>7.1.1</owasp-dependency-check.version>
<pcap4j.version>1.8.2</pcap4j.version>
<slf4j.version>1.7.36</slf4j.version>
@@ -163,7 +159,7 @@
<!-- Site properties -->
<asciidoctor.maven.plugin.version>2.2.2</asciidoctor.maven.plugin.version>
- <asciidoctorj.version>2.5.3</asciidoctorj.version>
+ <asciidoctorj.version>2.5.5</asciidoctorj.version>
<asciidoctorj.diagram.version>2.2.3</asciidoctorj.diagram.version>
<skip-code-generation-tests>true</skip-code-generation-tests>
@@ -419,7 +415,7 @@
<dependency>
<groupId>net.lingala.zip4j</groupId>
<artifactId>zip4j</artifactId>
- <version>2.10.0</version>
+ <version>2.11.1</version>
</dependency>
<dependency>
@@ -598,8 +594,8 @@
<!-- TODO: There's also 3.2.2, but the javacan dependency only seem to be poms with stuff in core and epoll sub-modules -->
<dependency>
<groupId>tel.schich</groupId>
- <artifactId>javacan</artifactId>
- <version>2.3.0</version>
+ <artifactId>javacan-core</artifactId>
+ <version>3.2.2</version>
</dependency>
<!-- *****************************************************************************
@@ -906,6 +902,21 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
+ <!-- Some of our plugins require certain minimum Maven versions -->
+ <execution>
+ <id>enforce-minimum-maven-version</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[3.6.3,)</version>
+ </requireMavenVersion>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
<!-- Ensure we're not mixing dependency versions -->
<execution>
<id>enforce-version-convergence</id>
@@ -948,7 +959,7 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
- <version>1.5.1</version>
+ <version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -1082,20 +1093,19 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <!-- With 3.0.0 the dependencyConvergence rule wouldn't work anymore -->
- <version>3.0.0</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.6</version>
+ <version>5.1.7</version>
</plugin>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
- <version>4.3.6</version>
+ <version>4.4.0</version>
</plugin>
<plugin>
@@ -1104,6 +1114,12 @@
<version>1.5.3</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.3.0</version>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
@@ -1191,6 +1207,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
+ <!-- It seems that when going to 3.3.0 the apache-rat-plugin fails when the shade plugin is also being run -->
<version>3.2.4</version>
<configuration>
<outputFile>${project.build.directory}/${project.artifactId}-${project.version}-uber-jar.${project.packaging}</outputFile>
@@ -1219,7 +1236,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.12.0</version>
+ <version>4.0.0-M3</version>
<configuration>
<!--templateFile>${session.executionRootDirectory}/src/site/template/site.vm</templateFile-->
<generateReports>true</generateReports>
@@ -1340,7 +1357,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<!--
- TODO: somehow the newer version is broken as it reports dependencies which are compile in fact
+ TODO: somehow the newer version (checked till 3.3.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:
diff --git a/protocols/ads/src/main/resources/protocols/ads/ads.mspec b/protocols/ads/src/main/resources/protocols/ads/ads.mspec
index 5b32d4177..dd5f6de7b 100644
--- a/protocols/ads/src/main/resources/protocols/ads/ads.mspec
+++ b/protocols/ads/src/main/resources/protocols/ads/ads.mspec
@@ -131,7 +131,7 @@
[simple uint 32 errorCode ]
// free usable field of 4 bytes
// 4 bytes Free usable 32 bit array. Usually this array serves to send an Id. This Id makes is possible to assign a received response to a request, which was sent before.
- [simple uint 32 invokeId ]
+ [simple uint 32 invokeId ]
// The payload
[simple AdsData('commandId', 'state.response') data ]
]