[incubator-plc4x] branch develop updated: - Got the testsuite working for the protocols module (Was missing a "src/main/java" directory, which activates the "java-module" profile)

[cd...@apache.org]

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/incubator-plc4x.git


The following commit(s) were added to refs/heads/develop by this push:
     new be30559  - Got the testsuite working for the protocols module (Was missing a "src/main/java" directory, which activates the "java-module" profile)
be30559 is described below

commit be305595bc48ede692dc5f6b3999fb6b33f4bd36
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Jan 21 15:50:04 2019 +0100

    - Got the testsuite working for the protocols module (Was missing a "src/main/java" directory, which activates the "java-module" profile)
---
 pom.xml                                                  | 11 +++++++++++
 protocols/pom.xml                                        | 11 +++++++----
 protocols/src/main/java/.keepMe                          | 16 ++++++++++++++++
 .../org/apache/plc4x/protocols/TpktProtocolTest.java     |  3 +++
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9ff3e66..df15eb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,6 +126,7 @@
     <netty.version>4.1.23.Final</netty.version>
     <netty-transport-jserialcomm.version>1.0.0</netty-transport-jserialcomm.version>
     <pcap4j.version>1.7.3</pcap4j.version>
+    <scala.version>2.12.6</scala.version>
     <slf4j.version>1.7.25</slf4j.version>
     <snakeyaml.version>1.23</snakeyaml.version>
     <spock-reports.version>1.6.1</spock-reports.version>
@@ -354,6 +355,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.daffodil</groupId>
+        <artifactId>daffodil-lib_2.12</artifactId>
+        <version>${daffodil.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.daffodil</groupId>
         <artifactId>daffodil-tdml_2.12</artifactId>
         <version>${daffodil.version}</version>
       </dependency>
@@ -566,6 +572,11 @@
         <version>${pcap4j.version}</version>
       </dependency>
       <dependency>
+        <groupId>org.scala-lang</groupId>
+        <artifactId>scala-library</artifactId>
+        <version>${scala.version}</version>
+      </dependency>
+      <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
         <version>${slf4j.version}</version>
diff --git a/protocols/pom.xml b/protocols/pom.xml
index cf1dccb..446b4cc 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -47,13 +47,16 @@
       <artifactId>daffodil-tdml_2.12</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
+      <groupId>org.apache.daffodil</groupId>
+      <artifactId>daffodil-lib_2.12</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-library</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
 
-
 </project>
\ No newline at end of file
diff --git a/protocols/src/main/java/.keepMe b/protocols/src/main/java/.keepMe
new file mode 100644
index 0000000..cf84b4e
--- /dev/null
+++ b/protocols/src/main/java/.keepMe
@@ -0,0 +1,16 @@
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
diff --git a/protocols/src/test/java/org/apache/plc4x/protocols/TpktProtocolTest.java b/protocols/src/test/java/org/apache/plc4x/protocols/TpktProtocolTest.java
index 03a4aa3..4fcd540 100644
--- a/protocols/src/test/java/org/apache/plc4x/protocols/TpktProtocolTest.java
+++ b/protocols/src/test/java/org/apache/plc4x/protocols/TpktProtocolTest.java
@@ -31,6 +31,7 @@ public class TpktProtocolTest {
 
     @BeforeEach
     public void setup() {
+        System.out.println("Starting");
         String tpktProtocolTestCases = "org/apache/plc4x/protocols/tpkt-protocol.tdml";
         testSuite = new DFDLTestSuite(Misc.getRequiredResource(tpktProtocolTestCases), true, true, false,
             Runner.defaultRoundTripDefaultDefault(), Runner.defaultValidationDefaultDefault());
@@ -38,7 +39,9 @@ public class TpktProtocolTest {
 
     @Test
     public void tpktPacketContainingCotpConnectResponse() {
+        System.out.println("Running");
         testSuite.runOneTest("tpktPacketContainingCotpConnectResponse", scala.Option.apply(null), false);
+        System.out.println("Done");
     }
 
 }