File tree Expand file tree Collapse file tree 3 files changed +11
-12
lines changed
Expand file tree Collapse file tree 3 files changed +11
-12
lines changed Original file line number Diff line number Diff line change @@ -12,22 +12,21 @@ install:
1212 - mvn -B -N io.takari:maven:wrapper -Dmaven=3.5.4
1313 # download and install Cloud SDK (may be cached)
1414 - build/install-cloudsdk.sh 241.0.0 $HOME
15- # ECLIPSE_TARGET is the targeted platform: photon is the default target
15+ # ECLIPSE_TARGET is the targeted platform: 2018-09 is the default target
1616# We run jacoco on photon
1717matrix :
1818 include :
1919 - name : " Eclipse Photon (4.8) on Java 8"
2020 jdk : oraclejdk8
2121 dist : trusty
22- env : MAVEN_FLAGS='-Pjacoco'
22+ env : ECLIPSE_TARGET=photon MAVEN_FLAGS='-Pjacoco'
2323 - name : " Eclipse 2018-09 (4.9) on Java 8"
2424 jdk : oraclejdk8
2525 dist : trusty
26- env : ECLIPSE_TARGET=2018-09
2726 - name : " Eclipse 2018-09 (4.9) on Java 11"
2827 jdk : openjdk11
2928 dist : trusty
30- env : ECLIPSE_TARGET=2018-09 MAVEN_FLAGS='--toolchains=.travisci/toolchains.xml'
29+ env : MAVEN_FLAGS='--toolchains=.travisci/toolchains.xml'
3130 - name : " Eclipse 2018-12 (4.10) on Java 11"
3231 dist : trusty
3332 jdk : openjdk11
Original file line number Diff line number Diff line change @@ -76,11 +76,11 @@ The tests need to find the Google Cloud SDK. You can either:
7676
7777### Changing the Eclipse Platform compilation and testing target
7878
79- By default, the build is targeted against Eclipse Photon / 4.8 .
79+ By default, the build is targeted against Eclipse ` 2018-09 ` (4.9) .
8080You can explicitly set the ` eclipse.target ` property to
81- ` 2018-09 ` (4.9 ), or ` 2018-12 ` (4.10).
81+ ` photon ` (4.8 ), or ` 2018-12 ` (4.10).
8282```
83- $ mvn -Declipse.target=2018-09 package
83+ $ mvn -Declipse.target=2018-12 package
8484```
8585
8686### Adding a new bundle/fragment
Original file line number Diff line number Diff line change 4343 <tycho-extras .version>1.3.0</tycho-extras .version>
4444 <product .version.qualifier.suffix/> <!-- 0-length string by default -->
4545 <project .build.sourceEncoding>UTF-8</project .build.sourceEncoding>
46- <eclipse .target>photon </eclipse .target> <!-- the default build -->
46+ <eclipse .target>2018-09 </eclipse .target> <!-- the default build -->
4747 <maven .compiler.source>1.8</maven .compiler.source>
4848 <maven .compiler.target>1.8</maven .compiler.target>
4949
417417 <profile >
418418 <id >build-eclipse-photon</id >
419419 <activation >
420- <!-- Default target if no eclipse.target specified. -->
421420 <property >
422- <name >!eclipse.target</name >
423- <!-- when no longer the default: <name>eclipse.target</name> <value>photon</value> -->
421+ <name >eclipse.target</name > <value >photon</value >
424422 </property >
425423 </activation >
426424 <properties >
451449 </profile >
452450
453451 <profile >
452+ <!-- Default target if no eclipse.target specified. -->
454453 <id >build-eclipse-2018-09</id >
455454 <activation >
456455 <property >
457- <name >eclipse.target</name > <value >2018-09</value >
456+ <name >!eclipse.target</name >
457+ <!-- when no longer the default: <name>eclipse.target</name> <value>2018-09</value> -->
458458 </property >
459459 </activation >
460460 <properties >
You can’t perform that action at this time.
0 commit comments