Skip to content

Commit ac42e76

Browse files
authored
Add target for Eclipse 2020-03 (#3619)
1 parent afbab6d commit ac42e76

File tree

6 files changed

+159
-0
lines changed

6 files changed

+159
-0
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ matrix:
3434
- name: "Eclipse 2019-12 (4.14) on Java 11"
3535
jdk: openjdk11
3636
env: ECLIPSE_TARGET=2019-12 MAVEN_FLAGS='--toolchains=.travisci/toolchains.xml'
37+
- name: "Eclipse 2020-03 (4.15) on Java 11"
38+
jdk: openjdk11
39+
env: ECLIPSE_TARGET=2020-03 MAVEN_FLAGS='--toolchains=.travisci/toolchains.xml'
3740
env:
3841
global:
3942
- CLOUD_SDK_HOME=$HOME/google-cloud-sdk
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<?pde?>
3+
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4+
<target name="GCP for Eclipse 2020-03" sequenceNumber="1591024101">
5+
<locations>
6+
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
7+
<unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191210-0610"/>
8+
<unit id="org.eclipse.jdt.feature.group" version="3.18.200.v20191210-0610"/>
9+
<unit id="org.eclipse.m2e.feature.feature.group" version="1.14.0.20191209-1925"/>
10+
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.14.0.20191209-1925"/>
11+
<unit id="org.eclipse.m2e.wtp.feature.feature.group" version="1.4.3.20191209-1849"/>
12+
<unit id="org.eclipse.m2e.wtp.sdk.feature.feature.group" version="1.4.3.20191209-1849"/>
13+
<unit id="org.eclipse.mylyn.commons.feature.group" version="3.24.2.v20180904-2231"/>
14+
<unit id="org.eclipse.epp.logging.aeri.feature.feature.group" version="2.0.7.v20180504-0806"/>
15+
<unit id="org.eclipse.epp.logging.aeri.feature.source.feature.group" version="2.0.7.v20180504-0806"/>
16+
<unit id="org.eclipse.jetty.http" version="9.4.24.v20191120"/>
17+
<unit id="org.eclipse.jetty.servlet" version="9.4.24.v20191120"/>
18+
<unit id="org.eclipse.jetty.server" version="9.4.24.v20191120"/>
19+
<unit id="org.eclipse.jetty.util" version="9.4.24.v20191120"/>
20+
<repository location="http://download.eclipse.org/releases/2019-12/"/>
21+
</location>
22+
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
23+
<unit id="org.eclipse.jst.web_sdk.feature.feature.group" version="3.15.0.v201908261515"/>
24+
<unit id="org.eclipse.jst.server_sdk.feature.feature.group" version="3.4.400.v201910252115"/>
25+
<unit id="org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group" version="3.8.0.v201903222010"/>
26+
<unit id="org.eclipse.wst.common.fproj.sdk.feature.group" version="3.7.1.v201903222010"/>
27+
<unit id="org.eclipse.wst.web_sdk.feature.feature.group" version="3.16.0.v201909302219"/>
28+
<unit id="org.eclipse.jst.enterprise_sdk.feature.feature.group" version="3.15.0.v201908261515"/>
29+
<unit id="org.eclipse.wst.server_adapters.sdk.feature.feature.group" version="3.2.700.v201910252115"/>
30+
<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.16.0/R-3.16.0-20191210070716/repository"/>
31+
</location>
32+
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
33+
<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="4.5.0.201912091550"/>
34+
<repository location="http://download.eclipse.org/linuxtools/update-2019-12-docker/"/>
35+
</location>
36+
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
37+
<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
38+
<unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
39+
<unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
40+
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
41+
<unit id="org.slf4j.apis.jcl" version="1.7.30.v20200204-2150"/>
42+
<unit id="org.slf4j.apis.log4j" version="1.7.30.v20200204-2150"/>
43+
<unit id="org.slf4j.bridge.jul" version="1.7.30.v20200204-2150"/>
44+
<unit id="ch.qos.logback.slf4j" version="1.2.3.v20200428-2012"/>
45+
<repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
46+
</location>
47+
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
48+
<unit id="org.dadacoalition.yedit.feature.feature.group" version="1.0.20.201509041456-RELEASE"/>
49+
<repository location="http://dadacoalition.org/yedit/"/>
50+
</location>
51+
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
52+
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.8.0.201906121535"/>
53+
<repository location="http://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
54+
</location>
55+
</locations>
56+
</target>
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/*
2+
* Target Platform Definition created using Eclipse TPD editor
3+
* (http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
4+
*
5+
* If you make changes to this file, either:
6+
*
7+
* * Right-click in the editor and choose 'Create Target Definition File'
8+
* to update the corresponding .target file.
9+
* * Right-click in the editor and choose 'Set as Target Platform'
10+
* to update your IDE's target platform (regenerates the .target too)
11+
*/
12+
target "GCP for Eclipse 2020-03" with source requirements
13+
// Eclipse Platform 4.15
14+
// Eclipse WTP 3.17
15+
16+
location "http://download.eclipse.org/releases/2020-03/" {
17+
org.eclipse.sdk.feature.group
18+
org.eclipse.jdt.feature.group
19+
org.eclipse.m2e.feature.feature.group
20+
org.eclipse.m2e.sdk.feature.feature.group
21+
org.eclipse.m2e.wtp.feature.feature.group
22+
org.eclipse.m2e.wtp.sdk.feature.feature.group
23+
org.eclipse.mylyn.commons.feature.group
24+
25+
org.eclipse.epp.logging.aeri.feature.feature.group
26+
org.eclipse.epp.logging.aeri.feature.source.feature.group
27+
28+
org.eclipse.jetty.http
29+
org.eclipse.jetty.servlet
30+
org.eclipse.jetty.server
31+
org.eclipse.jetty.util
32+
}
33+
34+
// WTP SDKs aren't exposed through the main release links
35+
// (composite at http://download.eclipse.org/webtools/repository/2020-03/)
36+
location "https://download.eclipse.org/webtools/downloads/drops/R3.17.0/R-3.17.0-20200306035042/repository/" {
37+
org.eclipse.jst.web_sdk.feature.feature.group
38+
org.eclipse.jst.server_sdk.feature.feature.group
39+
org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group
40+
org.eclipse.wst.common.fproj.sdk.feature.group
41+
org.eclipse.wst.web_sdk.feature.feature.group
42+
org.eclipse.jst.enterprise_sdk.feature.feature.group
43+
org.eclipse.wst.server_adapters.sdk.feature.feature.group
44+
}
45+
46+
location "http://download.eclipse.org/linuxtools/update-2020-03-docker/" {
47+
org.eclipse.linuxtools.docker.feature.feature.group
48+
}
49+
50+
include "../common-dependencies.tpd"

eclipse/eclipse-2020-03/pom.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<parent>
7+
<groupId>com.google.cloud.tools.eclipse</groupId>
8+
<artifactId>trunk</artifactId>
9+
<version>0.1.0-SNAPSHOT</version>
10+
<relativePath>../../</relativePath>
11+
</parent>
12+
<artifactId>gcp-eclipse-2020-03</artifactId>
13+
<version>4.15.0-SNAPSHOT</version>
14+
<packaging>eclipse-target-definition</packaging>
15+
</project>

eclipse/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<module>eclipse-2018-12</module>
1919
<module>eclipse-2019-09</module>
2020
<module>eclipse-2019-12</module>
21+
<module>eclipse-2020-03</module>
2122
</modules>
2223

2324
<profiles>

pom.xml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,40 @@
553553
</build>
554554
</profile>
555555

556+
<profile>
557+
<id>build-eclipse-2020-03</id>
558+
<activation>
559+
<property>
560+
<name>eclipse.target</name> <value>2020-03</value>
561+
</property>
562+
</activation>
563+
<properties>
564+
<jettyMinVersion>9.4</jettyMinVersion>
565+
<jettyMaxVersion>9.5</jettyMaxVersion>
566+
</properties>
567+
<!-- build against a known target platform -->
568+
<modules>
569+
<module>eclipse/eclipse-2020-03</module>
570+
</modules>
571+
<build>
572+
<plugins>
573+
<plugin>
574+
<groupId>org.eclipse.tycho</groupId>
575+
<artifactId>target-platform-configuration</artifactId>
576+
<configuration>
577+
<target>
578+
<artifact>
579+
<groupId>com.google.cloud.tools.eclipse</groupId>
580+
<artifactId>gcp-eclipse-2020-03</artifactId>
581+
<version>4.15.0-SNAPSHOT</version>
582+
</artifact>
583+
</target>
584+
</configuration>
585+
</plugin>
586+
</plugins>
587+
</build>
588+
</profile>
589+
556590
<!--
557591
The following profiles work to prevent Java 9'isms
558592
using Maven and Tycho's support for toolchains.

0 commit comments

Comments
 (0)