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
commit 7c0020632cee86dad1416795e6d943653ce5493d Author: Christofer Dutz <christofer.d...@c-ware.de> AuthorDate: Wed Feb 12 22:09:42 2020 +0100 - Re-Enabled the Interop as well as the plc4py module --- .../interop/src/main/java/org/apache/plc4x/interop/impl/Server.java | 1 + plc4j/tools/pom.xml | 5 ++--- sandbox/pom.xml | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/plc4j/tools/interop/src/main/java/org/apache/plc4x/interop/impl/Server.java b/plc4j/tools/interop/src/main/java/org/apache/plc4x/interop/impl/Server.java index 757c75b..1216893 100644 --- a/plc4j/tools/interop/src/main/java/org/apache/plc4x/interop/impl/Server.java +++ b/plc4j/tools/interop/src/main/java/org/apache/plc4x/interop/impl/Server.java @@ -20,6 +20,7 @@ package org.apache.plc4x.interop.impl; import org.apache.commons.lang3.tuple.Pair; +import org.apache.plc4x.interop.InteropServer; import org.apache.plc4x.java.PlcDriverManager; import org.apache.plc4x.java.api.exceptions.PlcConnectionException; import org.apache.plc4x.java.api.messages.PlcSubscriptionEvent; diff --git a/plc4j/tools/pom.xml b/plc4j/tools/pom.xml index 6bc49f9..66958ed 100644 --- a/plc4j/tools/pom.xml +++ b/plc4j/tools/pom.xml @@ -39,14 +39,13 @@ <module>scraper</module> </modules> - <!-- This module requires the Interop-Server which is disabled for incompatibility reasons. --> - <!--profiles> + <profiles> <profile> <id>with-proxies</id> <modules> <module>interop</module> </modules> </profile> - </profiles--> + </profiles> </project> \ No newline at end of file diff --git a/sandbox/pom.xml b/sandbox/pom.xml index 4a5fbbf..2dc9ddd 100644 --- a/sandbox/pom.xml +++ b/sandbox/pom.xml @@ -67,13 +67,12 @@ </profile> <!-- Build PLC4X including the Python modules --> - <!-- This module requires the Interop-Server which is disabled for incompatibility reasons. --> - <!--profile> + <profile> <id>with-python</id> <modules> <module>plc4py</module> </modules> - </profile--> + </profile> </profiles>