Skip to content

Commit

Permalink
Remove Oracle JDKs from tests
Browse files Browse the repository at this point in the history
After recent license changes, we have decided to remove Oracle JDK
support from MMT entirely. This commit removes the last remnants of them
from testing.
  • Loading branch information
tkw1536 committed Apr 11, 2019
1 parent 31cfdd6 commit 9f833f5
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
16 changes: 8 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
env:
- "INFO='Check mmt.jar generation and integration tests'"
- 'SBT_VERSION_CMD="^validate"'
jdk: oraclejdk8
jdk: openjdk8
language: scala
scala: "2.12.3"
script:
Expand All @@ -75,7 +75,7 @@ jobs:
env:
- "INFO='Check mmt.jar generation and integration tests'"
- 'SBT_VERSION_CMD="^validate"'
jdk: oraclejdk11
jdk: openjdk11
language: scala
scala: "2.12.3"
script:
Expand All @@ -89,7 +89,7 @@ jobs:
env:
- "INFO='Check that unit tests run'"
- 'SBT_VERSION_CMD="^validate"'
jdk: oraclejdk8
jdk: openjdk8
language: scala
scala: "2.12.3"
script:
Expand All @@ -98,7 +98,7 @@ jobs:
env:
- "INFO='Check that unit tests run'"
- 'SBT_VERSION_CMD="^validate"'
jdk: oraclejdk11
jdk: openjdk11
language: scala
scala: "2.12.3"
script:
Expand All @@ -108,7 +108,7 @@ jobs:
env:
- "INFO='Check lfcatalog.jar generation using `sbt deployLFCatalog`'"
- 'SBT_VERSION_CMD="^validate"'
jdk: oraclejdk8
jdk: openjdk8
language: scala
scala: "2.12.3"
script:
Expand All @@ -119,7 +119,7 @@ jobs:
env:
- "INFO='Check lfcatalog.jar generation using `sbt deployLFCatalog`'"
- 'SBT_VERSION_CMD="^validate"'
jdk: oraclejdk11
jdk: openjdk11
language: scala
scala: "2.12.3"
script:
Expand All @@ -129,7 +129,7 @@ jobs:
env:
- "INFO='Check that apidoc generation works'"
- 'SBT_VERSION_CMD="^validate"'
jdk: oraclejdk8
jdk: openjdk8
language: scala
scala: "2.12.3"
script:
Expand All @@ -139,7 +139,7 @@ jobs:
env:
- "INFO='Check that apidoc generation works'"
- 'SBT_VERSION_CMD="^validate"'
jdk: oraclejdk11
jdk: openjdk11
language: scala
scala: "2.12.3"
script:
Expand Down
6 changes: 3 additions & 3 deletions src/project/src/main/scala/travis/Matrix/MatrixKey.scala
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ case object IBMJava8 extends MatrixKey[YAMLString]("jdk", "ibmjava8")
case object OpenJDK6 extends MatrixKey[YAMLString]("jdk", "openjdk6")
case object OpenJDK7 extends MatrixKey[YAMLString]("jdk", "openjdk7")
case object OpenJDK8 extends MatrixKey[YAMLString]("jdk", "openjdk8")
case object OpenJDK11 extends MatrixKey[YAMLString]("jdk", "oraclejdk11")
case object OracleJDK8 extends MatrixKey[YAMLString]("jdk", "oraclejdk8")
case object OracleJDK9 extends MatrixKey[YAMLString]("jdk", "oraclejdk9")
case object OpenJDK11 extends MatrixKey[YAMLString]("jdk", "openjdk11")
// case object OracleJDK8 extends MatrixKey[YAMLString]("jdk", "oraclejdk8")
// case object OracleJDK9 extends MatrixKey[YAMLString]("jdk", "oraclejdk9")


/** the versions of Scala being used */
Expand Down
2 changes: 1 addition & 1 deletion src/travis.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ travisConfig := {

val LinuxTesting = MatrixSet(
Trusty, Language("scala"), Env(Map(("SBT_VERSION_CMD", "\"^validate\""))),
OracleJDK8, OpenJDK11
OpenJDK8, OpenJDK11
)

// in principle we would test OS X as follows
Expand Down

0 comments on commit 9f833f5

Please sign in to comment.