Update Travis CI build: Drop Java 6, add OpenJDK 8.
diff --git a/.travis.yml b/.travis.yml
index 6abfbad..466bcea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,40 +1,28 @@
-# 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.
-
-language: java
-sudo: false
-
-addons:
- apt:
- packages:
- - openjdk-6-jdk
-
-# use java 6 compatible maven version (installed into target directory so rat check passes)
-before_install:
- - wget https://archive.apache.org/dist/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.zip -P ./target
- - unzip -qq ./target/apache-maven-3.2.5-bin.zip -d ./target
- - export M2_HOME=$PWD/target/apache-maven-3.2.5
- - export PATH=$M2_HOME/bin:$PATH
-
-jdk:
- - openjdk6
- - openjdk7
- - oraclejdk8
-
-script:
- - mvn
-
-after_success:
- - mvn clean test jacoco:report coveralls:report -Ptravis-jacoco
+# 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.
+
+language: java
+sudo: false
+
+jdk:
+ - openjdk7
+ - openjdk8
+ - oraclejdk8
+
+script:
+ - mvn
+
+after_success:
+ - mvn clean test jacoco:report coveralls:report -Ptravis-jacoco
diff --git a/pom.xml b/pom.xml
index a227751..1a95fed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,8 +176,8 @@
</dependencies>
<properties>
- <maven.compiler.source>1.5</maven.compiler.source>
- <maven.compiler.target>1.5</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
<commons.componentid>cli</commons.componentid>
<commons.module.name>org.apache.commons.cli</commons.module.name>
<commons.release.version>1.4</commons.release.version>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 6cfcc8d..a06b3e8 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -41,6 +41,9 @@
<action type="add" dev="ggregory" due-to="Alex Nordlund" issue="CLI-282">
TypeHandler should throw ParseException for an unsupported class.
</action>
+ <action type="update" dev="ggregory" issue="CLI-294">
+ Update Java from version 5 to 7.
+ </action>
</release>
<release version="1.4" date="2017-03-09" description="New features and bug fixes">
