Skip to content

Commit bdaea16

Browse files
authored
Change Travis build to Xenial (#3594)
* use openjdk8 as oraclejdk8 not available in xenial * update toolchains.xml for openjdk8 and new location for openjdk11 * update to tycho 1.5.0
1 parent ba8df9d commit bdaea16

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

.travis.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
sudo: false
22
language: java
3+
dist: xenial
4+
services:
5+
- xvfb
36
addons:
47
apt:
58
packages:
@@ -9,6 +12,7 @@ before_install:
912
- sed -i.bak -e 's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g' ~/.m2/settings.xml
1013
install:
1114
# use mvn ≥ 3.3.9 to ensure faulty test exit states fail the build (#1276)
15+
# todo: mvn 3.6.3 should work with tycho
1216
- mvn -B -N io.takari:maven:wrapper -Dmaven=3.5.4
1317
# download and install Cloud SDK (may be cached)
1418
- build/install-cloudsdk.sh 241.0.0 $HOME
@@ -17,18 +21,14 @@ install:
1721
matrix:
1822
include:
1923
- name: "Eclipse Photon (4.8) on Java 8"
20-
jdk: oraclejdk8
21-
dist: trusty
24+
jdk: openjdk8
2225
env: ECLIPSE_TARGET=photon MAVEN_FLAGS='-Pjacoco'
2326
- name: "Eclipse 2018-09 (4.9) on Java 8"
24-
jdk: oraclejdk8
25-
dist: trusty
27+
jdk: openjdk8
2628
- name: "Eclipse 2018-09 (4.9) on Java 11"
2729
jdk: openjdk11
28-
dist: trusty
2930
env: MAVEN_FLAGS='--toolchains=.travisci/toolchains.xml'
3031
- name: "Eclipse 2018-12 (4.10) on Java 11"
31-
dist: trusty
3232
jdk: openjdk11
3333
env: ECLIPSE_TARGET=2018-12 MAVEN_FLAGS='--toolchains=.travisci/toolchains.xml'
3434
env:
@@ -39,11 +39,8 @@ env:
3939
# -DshowDateTime: show milliseconds since start
4040
- MAVEN_OPTS='-Xmx700m -Dorg.slf4j.simpleLogger.showDateTime=true'
4141
- CLOUDSDK_CORE_DISABLE_USAGE_REPORTING=true
42-
- DISPLAY=:99.0
4342
- GCS_BUILD_BUCKET=gs://travis_artifacts
4443
before_script:
45-
- "sh -e /etc/init.d/xvfb start"
46-
- sleep 3 # give xvfb some time to start
4744
- metacity --sm-disable --replace &
4845
- sleep 3 # give metacity some time to start
4946
script: ./mvnw -V -B --fail-at-end verify ${MAVEN_FLAGS}

.travisci/toolchains.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
<provides>
1111
<id>JavaSE-1.8</id>
1212
<version>1.8</version>
13-
<vendor>oracle</vendor>
13+
<vendor>openjdk</vendor>
1414
</provides>
1515
<configuration>
16-
<jdkHome>/usr/lib/jvm/java-8-oracle/jre</jdkHome>
16+
<jdkHome>/usr/lib/jvm/java-8-openjdk-amd64/jre</jdkHome>
1717
</configuration>
1818
</toolchain>
1919
<toolchain>
@@ -25,7 +25,7 @@
2525
<vendor>openjdk</vendor>
2626
</provides>
2727
<configuration>
28-
<jdkHome>/home/travis/openjdk11</jdkHome>
28+
<jdkHome>/usr/local/lib/jvm/openjdk11</jdkHome>
2929
</configuration>
3030
</toolchain>
3131
</toolchains>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<!-- Execution environment supported by Cloud Tools for Eclipse -->
4040
<requiredExecutionEnvironment>JavaSE-1.8</requiredExecutionEnvironment>
4141

42-
<tycho.version>1.3.0</tycho.version>
43-
<tycho-extras.version>1.3.0</tycho-extras.version>
42+
<tycho.version>1.5.0</tycho.version>
43+
<tycho-extras.version>1.5.0</tycho-extras.version>
4444
<product.version.qualifier.suffix/> <!-- 0-length string by default -->
4545
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4646
<eclipse.target>2018-09</eclipse.target> <!-- the default build -->

0 commit comments

Comments
 (0)