[incubator-daffodil] branch master updated: Remove Java 7 support

[sl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

slawrence pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-daffodil.git


The following commit(s) were added to refs/heads/master by this push:
     new f046c29  Remove Java 7 support
f046c29 is described below

commit f046c290c8156bca375389239f606e24287e58ce
Author: Steve Lawrence <sl...@apache.org>
AuthorDate: Fri Dec 7 15:03:11 2018 -0500

    Remove Java 7 support
    
    - Daffodil depends on sbt 1.2.1, which requires Scala 2.12.6. But Scala
      2.12 requirements a minimum of Java 8. So the newer version of SBT
      that we depend on cannot run on Java 7.
    - Also fix mixing Rat ignore files that caused TravisCI builds to fail
    
    DAFFODIL-2025
---
 .travis.yml       | 1 -
 project/Rat.scala | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8d5287a..d752c66 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,6 @@ scala:
   - 2.12.6
   - 2.11.12
 jdk:
-  - oraclejdk7
   - oraclejdk8
   - oraclejdk9
   - oraclejdk11
diff --git a/project/Rat.scala b/project/Rat.scala
index 96eaebc..dac2f19 100644
--- a/project/Rat.scala
+++ b/project/Rat.scala
@@ -120,9 +120,9 @@ object Rat {
     file("daffodil-sapi/src/test/resources/test/sapi/myDataBroken.dat"),
     file("daffodil-sapi/src/test/resources/test/sapi/myData.dat"),
     file("daffodil-sapi/src/test/resources/test/sapi/myInfosetBroken.xml"),
-    file("daffodil-tdml/src/test/resources/test/tdml/test.bin"),
-    file("daffodil-tdml/src/test/resources/test/tdml/test.txt"),
-    file("daffodil-tdml/src/test/resources/test/tdml/test.xml"),
+    file("daffodil-tdml-lib/src/test/resources/test/tdml/test.bin"),
+    file("daffodil-tdml-lib/src/test/resources/test/tdml/test.txt"),
+    file("daffodil-tdml-processor/src/test/resources/test/tdml/test.bin"),
     file("daffodil-tdml-processor/src/test/resources/test/tdml/test.txt"),
     file("daffodil-tdml-processor/src/test/resources/test/tdml/test.xml"),
     file("daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AB006.in"),