fix(plc4j/s7): fix build

apache · Apr 28, 2023 · 7647763 · 7647763
1 parent 5cba298
commit 7647763
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 17 deletions.
diff --git a/plc4go/internal/cbus/tagtype_string.go b/plc4go/internal/cbus/tagtype_string.go
diff --git a/plc4go/internal/modbus/tagtype_string.go b/plc4go/internal/modbus/tagtype_string.go
diff --git a/plc4go/internal/s7/tagtype_string.go b/plc4go/internal/s7/tagtype_string.go
diff --git a/plc4go/spi/testutils/steptype_string.go b/plc4go/spi/testutils/steptype_string.go
diff --git a/plc4j/drivers/s7/src/test/java/S7IoTest.java b/plc4j/drivers/s7/src/test/java/S7IoTest.java
@@ -34,7 +34,8 @@ public class S7IoTest {
 
     @Test
     void TestS7MessageBytes() throws Exception {
-        String wantBoxStringSerialized = "╔═TPKTPacket═══════════════════════════════════════════════════════════════════════════════════════════════════════╗\n"
+        String wantBoxStringSerialized = ""
+            + "╔═TPKTPacket═══════════════════════════════════════════════════════════════════════════════════════════════════════╗\n"
             + "║╔═protocolId╗╔═reserved╗╔═len═════╗                                                                               ║\n"
             + "║║  0x03 3   ║║ 0x00 0  ║║0x001d 29║                                                                               ║\n"
             + "║╚═══════════╝╚═════════╝╚═════════╝                                                                               ║\n"
@@ -88,7 +89,8 @@ void TestS7MessageBytes() throws Exception {
             + "║║╚══════════════════════════════════════════════════════════════════════════════════════════════════════════════╝║║\n"
             + "║╚════════════════════════════════════════════════════════════════════════════════════════════════════════════════╝║\n"
             + "╚══════════════════════════════════════════════════════════════════════════════════════════════════════════════════╝";
-        String wantBoxStringSerializedCompact = "╔═TPKTPacket═════════════════════════════════════════════════════════════════════════════════════╗\n"
+        String wantBoxStringSerializedCompact = ""
+            + "╔═TPKTPacket═════════════════════════════════════════════════════════════════════════════════════╗\n"
             + "║╔═protocolId╗╔═reserved╗╔═len═════╗                                                             ║\n"
             + "║║  0x03 3   ║║ 0x00 0  ║║0x001d 29║                                                             ║\n"
             + "║╚═══════════╝╚═════════╝╚═════════╝                                                             ║\n"

diff --git a/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/S7DriverIT.java b/plc4j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/S7DriverIT.java
@@ -24,8 +24,10 @@ public class S7DriverIT extends DriverTestsuiteRunner {
 
     public S7DriverIT() {
         super("/protocols/s7/DriverTestsuite.xml",
-	"Single element read request",
-	"Single element read request with disabled PUT/GET");
+            // TODO: ignored due to carcia changes
+            "Single element read request",
+            "Single element read request with disabled PUT/GET"
+        );
     }
 
 }
diff --git a/...j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/S7ParserSerializerTest.java b/...j/drivers/s7/src/test/java/org/apache/plc4x/java/s7/readwrite/S7ParserSerializerTest.java
@@ -24,13 +24,15 @@ public class S7ParserSerializerTest extends ParserSerializerTestsuiteRunner {
 
     public S7ParserSerializerTest() {
         super("/protocols/s7/ParserSerializerTestsuite.xml",
-	      "S7 Read PLC Type Request",
-	      "S7 Read PLC Type Response",
-	      "S7 Read Request",
-	      "S7 Read Response",
-	      "S7 Read Error Response",
-	      "S7 Write Request",
-	      "S7 Write Request");
+            // TODO: ignored due to carcia changes
+            "S7 Read PLC Type Request",
+            "S7 Read PLC Type Response",
+            "S7 Read Request",
+            "S7 Read Response",
+            "S7 Read Error Response",
+            "S7 Write Request",
+            "S7 Write Request"
+        );
     }
 
 }
diff --git a/plc4j/pom.xml b/plc4j/pom.xml
@@ -153,7 +153,7 @@
       </plugin>
 
       <!--
-        As our libraries should be consumable on Java 1.8, downgrade the compiler settings.
+        As our libraries should be consumable on Java 11, downgrade the compiler settings.
       -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -166,7 +166,7 @@
               <goal>compile</goal>
             </goals>
             <configuration>
-              <release>8</release>
+              <release>11</release>
             </configuration>
           </execution>
           <execution>