Skip to content

Commit cb63d85

Browse files
author
Gary Gregory
committed
Update Travis CI build: Drop Java 6, add OpenJDK 8.
1 parent 18e3638 commit cb63d85

3 files changed

Lines changed: 33 additions & 42 deletions

File tree

.travis.yml

Lines changed: 28 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,28 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one or more
2-
# contributor license agreements. See the NOTICE file distributed with
3-
# this work for additional information regarding copyright ownership.
4-
# The ASF licenses this file to You under the Apache License, Version 2.0
5-
# (the "License"); you may not use this file except in compliance with
6-
# the License. You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
15-
16-
language: java
17-
sudo: false
18-
19-
addons:
20-
apt:
21-
packages:
22-
- openjdk-6-jdk
23-
24-
# use java 6 compatible maven version (installed into target directory so rat check passes)
25-
before_install:
26-
- wget https://archive.apache.org/dist/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.zip -P ./target
27-
- unzip -qq ./target/apache-maven-3.2.5-bin.zip -d ./target
28-
- export M2_HOME=$PWD/target/apache-maven-3.2.5
29-
- export PATH=$M2_HOME/bin:$PATH
30-
31-
jdk:
32-
- openjdk6
33-
- openjdk7
34-
- oraclejdk8
35-
36-
script:
37-
- mvn
38-
39-
after_success:
40-
- mvn clean test jacoco:report coveralls:report -Ptravis-jacoco
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
language: java
17+
sudo: false
18+
19+
jdk:
20+
- openjdk7
21+
- openjdk8
22+
- oraclejdk8
23+
24+
script:
25+
- mvn
26+
27+
after_success:
28+
- mvn clean test jacoco:report coveralls:report -Ptravis-jacoco

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@
176176
</dependencies>
177177

178178
<properties>
179-
<maven.compiler.source>1.5</maven.compiler.source>
180-
<maven.compiler.target>1.5</maven.compiler.target>
179+
<maven.compiler.source>1.7</maven.compiler.source>
180+
<maven.compiler.target>1.7</maven.compiler.target>
181181
<commons.componentid>cli</commons.componentid>
182182
<commons.module.name>org.apache.commons.cli</commons.module.name>
183183
<commons.release.version>1.4</commons.release.version>

src/changes/changes.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@
4141
<action type="add" dev="ggregory" due-to="Alex Nordlund" issue="CLI-282">
4242
TypeHandler should throw ParseException for an unsupported class.
4343
</action>
44+
<action type="update" dev="ggregory" issue="CLI-294">
45+
Update Java from version 5 to 7.
46+
</action>
4447
</release>
4548

4649
<release version="1.4" date="2017-03-09" description="New features and bug fixes">

0 commit comments

Comments
 (0)