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 2019/10/21 14:40:26 UTC
[plc4x] branch develop updated: - Fixed some broken tests (No idea
why they were not executed in the sandbox) - Cleaned up some dependency
issues (Also no idea why this wasn't detected in the sandbox)
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 cdd50b4 - Fixed some broken tests (No idea why they were not executed in the sandbox) - Cleaned up some dependency issues (Also no idea why this wasn't detected in the sandbox)
cdd50b4 is described below
commit cdd50b440ced474fc98c27262bcd7e5deea5c63d
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Oct 21 16:40:19 2019 +0200
- Fixed some broken tests (No idea why they were not executed in the sandbox)
- Cleaned up some dependency issues (Also no idea why this wasn't detected in the sandbox)
---
plc4j/drivers/ab-eth/pom.xml | 27 +++++++++++++++++++++-
.../test/resources/testsuite/AbEthTestsuite.xml | 15 ++++++------
2 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/plc4j/drivers/ab-eth/pom.xml b/plc4j/drivers/ab-eth/pom.xml
index 39e3ddb..d08c4fb 100644
--- a/plc4j/drivers/ab-eth/pom.xml
+++ b/plc4j/drivers/ab-eth/pom.xml
@@ -52,11 +52,20 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <usedDependencies combine.children="append">
+ <usedDependency>org.apache.plc4x:plc4x-build-utils-language-java</usedDependency>
+ <usedDependency>org.apache.plc4x:plc4x-protocols-ab-eth</usedDependency>
+ </usedDependencies>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
-
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-api</artifactId>
@@ -81,6 +90,22 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-buffer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
diff --git a/plc4j/drivers/ab-eth/src/test/resources/testsuite/AbEthTestsuite.xml b/plc4j/drivers/ab-eth/src/test/resources/testsuite/AbEthTestsuite.xml
index b9b13f7..d7ab531 100644
--- a/plc4j/drivers/ab-eth/src/test/resources/testsuite/AbEthTestsuite.xml
+++ b/plc4j/drivers/ab-eth/src/test/resources/testsuite/AbEthTestsuite.xml
@@ -27,7 +27,7 @@
<raw>01010000000000000000000000040005000000000000000000000000</raw>
<root-type>CIPEncapsulationPacket</root-type>
<xml>
- <CIPEncapsulationConnectionRequest className="org.apache.plc4x.java.abeth.CIPEncapsulationConnectionRequest">
+ <CIPEncapsulationConnectionRequest className="org.apache.plc4x.java.abeth.readwrite.CIPEncapsulationConnectionRequest">
<sessionHandle>0</sessionHandle>
<status>0</status>
<senderContext>
@@ -50,7 +50,7 @@
<raw>02010000000003320000000000040005000000000000000000000000</raw>
<root-type>CIPEncapsulationPacket</root-type>
<xml>
- <CIPEncapsulationConnectionResponse className="org.apache.plc4x.java.abeth.CIPEncapsulationConnectionResponse">
+ <CIPEncapsulationConnectionResponse className="org.apache.plc4x.java.abeth.readwrite.CIPEncapsulationConnectionResponse">
<sessionHandle>818</sessionHandle>
<status>0</status>
<senderContext>
@@ -73,7 +73,7 @@
<raw>0107000e000003320000000040000000000000000000000000000000080500000f000401a21800640000</raw>
<root-type>CIPEncapsulationPacket</root-type>
<xml>
- <CIPEncapsulationReadRequest className="org.apache.plc4x.java.abeth.CIPEncapsulationReadRequest">
+ <CIPEncapsulationReadRequest className="org.apache.plc4x.java.abeth.readwrite.CIPEncapsulationReadRequest">
<sessionHandle>818</sessionHandle>
<status>0</status>
<senderContext>
@@ -87,12 +87,12 @@
<senderContext>0</senderContext>
</senderContext>
<options>0</options>
- <request className="org.apache.plc4x.java.abeth.DF1CommandRequestMessage">
+ <request className="org.apache.plc4x.java.abeth.readwrite.DF1CommandRequestMessage">
<destinationAddress>8</destinationAddress>
<sourceAddress>5</sourceAddress>
<status>0</status>
<transactionCounter>1025</transactionCounter>
- <command className="org.apache.plc4x.java.abeth.DF1RequestProtectedTypedLogicalRead">
+ <command className="org.apache.plc4x.java.abeth.readwrite.DF1RequestProtectedTypedLogicalRead">
<byteSize>24</byteSize>
<fileNumber>0</fileNumber>
<fileType>100</fileType>
@@ -109,7 +109,7 @@
<raw>02070020000003320000000040000000000000000000000000000000000508004f000401910101000900040405001f02010003000404050000024000</raw>
<root-type>CIPEncapsulationPacket</root-type>
<xml>
- <CIPEncapsulationReadResponse className="org.apache.plc4x.java.abeth.CIPEncapsulationReadResponse">
+ <CIPEncapsulationReadResponse className="org.apache.plc4x.java.abeth.readwrite.CIPEncapsulationReadResponse">
<sessionHandle>818</sessionHandle>
<status>0</status>
<senderContext>
@@ -123,7 +123,7 @@
<senderContext>0</senderContext>
</senderContext>
<options>0</options>
- <response className="org.apache.plc4x.java.abeth.DF1CommandResponseMessageProtectedTypedLogicalRead">
+ <response className="org.apache.plc4x.java.abeth.readwrite.DF1CommandResponseMessageProtectedTypedLogicalRead">
<destinationAddress>5</destinationAddress>
<sourceAddress>8</sourceAddress>
<status>0</status>
@@ -154,7 +154,6 @@
<data>64</data>
<data>0</data>
</data>
- <extendedStatus/>
</response>
</CIPEncapsulationReadResponse>
</xml>