Bug 567234: Upgrade target platform to 2020-09
Change-Id: I09ed75b4bfcd93a2a7313e25cda23d3b4df487d7
diff --git a/plugins/org.eclipse.ease.modules.help/build.properties b/plugins/org.eclipse.ease.modules.help/build.properties
index fc4ecd9..66284f4 100644
--- a/plugins/org.eclipse.ease.modules.help/build.properties
+++ b/plugins/org.eclipse.ease.modules.help/build.properties
@@ -2,7 +2,8 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ help/
# for javadoc API generation.
jars.extra.classpath = platform:/plugin/org.eclipse.ease.modules.platform,\
diff --git a/plugins/org.eclipse.ease.modules.help/pom.xml b/plugins/org.eclipse.ease.modules.help/pom.xml
index a0d19fd..0c6ed28 100644
--- a/plugins/org.eclipse.ease.modules.help/pom.xml
+++ b/plugins/org.eclipse.ease.modules.help/pom.xml
@@ -15,6 +15,19 @@
<ease.api>org.eclipse.ease.help/help/api-docs/javadoc</ease.api>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <timestampProvider>default</timestampProvider>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<!-- Do the javadoc generation in a profile to keep standard builds (e.g.
@@ -47,7 +60,6 @@
<jvmOption>-DhttpnonProxyHosts=*.eclipse.org</jvmOption>
</jvmOptions>
<additionalArguments>
- <additionalArgument>${javadoc-args}</additionalArgument>
<additionalArgument>
-link
http://docs.oracle.com/javase/8/docs/api/
@@ -60,7 +72,7 @@
<additionalArgument>
-linkoffline
../../${ease.api}
- https://hudson.eclipse.org/ease/job/ease-build-core/javadoc/
+ https://ci.eclipse.org/ease/job/ease.build.core/JavaDoc/
</additionalArgument>
<additionalArgument>-public</additionalArgument>
</additionalArguments>
diff --git a/releng/org.eclipse.ease.modules.releng.target/org.eclipse.ease.modules.releng.target.target b/releng/org.eclipse.ease.modules.releng.target/org.eclipse.ease.modules.releng.target.target
index ea28690..32db4d5 100644
--- a/releng/org.eclipse.ease.modules.releng.target/org.eclipse.ease.modules.releng.target.target
+++ b/releng/org.eclipse.ease.modules.releng.target/org.eclipse.ease.modules.releng.target.target
@@ -1,35 +1,34 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="2020-06" sequenceNumber="1594193926">
+<target name="2020-09" sequenceNumber="1600934962">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.platform.feature.group" version="4.16.0.v20200604-0951"/>
- <unit id="org.eclipse.rcp.feature.group" version="4.16.0.v20200604-0951"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.18.400.v20200604-0540"/>
- <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.600.v20200521-1852"/>
- <unit id="org.eclipse.emf.feature.group" version="2.22.0.v20200519-1135"/>
+ <unit id="org.eclipse.platform.feature.group" version="4.17.0.v20200902-1800"/>
+ <unit id="org.eclipse.rcp.feature.group" version="4.17.0.v20200902-1800"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.18.500.v20200902-1800"/>
+ <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.700.v20200705-1016"/>
+ <unit id="org.eclipse.emf.feature.group" version="2.23.0.v20200822-0801"/>
<unit id="org.eclipse.papyrus.infra.feature.feature.group" version="3.0.0.202006100749"/>
<unit id="org.eclipse.papyrus.infra.gmfdiag.feature.feature.group" version="3.0.0.202006100749"/>
<unit id="org.eclipse.papyrus.uml.diagram.feature.feature.group" version="3.0.0.202006100749"/>
<unit id="org.eclipse.uml2.uml" version="5.5.0.v20200302-1312"/>
<unit id="org.eclipse.gmf.runtime.diagram.ui" version="1.9.0.202004160913"/>
- <unit id="org.eclipse.emf.emfstore.client.ui.feature.feature.group" version="1.9.0.v20170530-0703"/>
<unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.12.0.v20200608-1555"/>
<unit id="org.eclipse.ocl.examples.feature.group" version="6.12.0.v20200608-1555"/>
- <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.18.0.v202005180122"/>
- <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.18.0.v202005192253"/>
- <unit id="org.eclipse.pde.feature.group" version="3.14.400.v20200604-0540"/>
- <unit id="org.eclipse.jdt" version="3.18.400.v20200604-0540"/>
- <unit id="org.eclipse.egit.feature.group" version="5.8.0.202006091008-r"/>
- <unit id="org.eclipse.jgit.feature.group" version="5.8.0.202006091008-r"/>
- <unit id="org.eclipse.osgi" version="3.15.300.v20200520-1959"/>
- <repository id="eclipse-2020-06" location="http://download.eclipse.org/releases/2020-06/"/>
+ <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.19.0.v202008180353"/>
+ <unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.19.0.v202008192217"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.14.500.v20200902-1800"/>
+ <unit id="org.eclipse.jdt" version="3.18.500.v20200902-1800"/>
+ <unit id="org.eclipse.egit.feature.group" version="5.9.0.202009080501-r"/>
+ <unit id="org.eclipse.jgit.feature.group" version="5.9.0.202009080501-r"/>
+ <unit id="org.eclipse.osgi" version="3.16.0.v20200828-0759"/>
+ <repository id="eclipse-2020-09" location="http://download.eclipse.org/releases/2020-09/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.mockito" version="1.9.5.v201605172210"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
- <repository id="eclipse-orbit-2020-06" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/"/>
+ <repository id="eclipse-orbit-2020-09" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.team.svn.feature.group" version="4.0.5.I20170425-1700"/>
diff --git a/releng/org.eclipse.ease.modules.releng.target/org.eclipse.ease.modules.releng.target.tpd b/releng/org.eclipse.ease.modules.releng.target/org.eclipse.ease.modules.releng.target.tpd
index 9e23822..1149584 100644
--- a/releng/org.eclipse.ease.modules.releng.target/org.eclipse.ease.modules.releng.target.tpd
+++ b/releng/org.eclipse.ease.modules.releng.target/org.eclipse.ease.modules.releng.target.tpd
@@ -1,6 +1,6 @@
-target "2020-06" with source requirements
+target "2020-09" with source requirements
-location "http://download.eclipse.org/releases/2020-06/" eclipse-2020-06 {
+location "http://download.eclipse.org/releases/2020-09/" eclipse-2020-09 {
org.eclipse.platform.feature.group
org.eclipse.rcp.feature.group
org.eclipse.jdt.feature.group
@@ -16,7 +16,6 @@
org.eclipse.papyrus.uml.diagram.feature.feature.group
org.eclipse.uml2.uml
org.eclipse.gmf.runtime.diagram.ui
- org.eclipse.emf.emfstore.client.ui.feature.feature.group
org.eclipse.ocl.examples.classic.feature.group
org.eclipse.ocl.examples.feature.group
@@ -34,7 +33,7 @@
org.eclipse.osgi
}
-location "https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/" eclipse-orbit-2020-06 {
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository/" eclipse-orbit-2020-09 {
// for java unit test of modules
org.mockito [1.9.5,2.0.0)
org.hamcrest [1.1.0,2.0.0)
diff --git a/releng/org.eclipse.ease.modules.releng/pom.xml b/releng/org.eclipse.ease.modules.releng/pom.xml
index 48d3deb..8047bb9 100644
--- a/releng/org.eclipse.ease.modules.releng/pom.xml
+++ b/releng/org.eclipse.ease.modules.releng/pom.xml
@@ -9,7 +9,7 @@
<properties>
<!-- used plugin versions -->
- <tycho.version>1.3.0</tycho.version>
+ <tycho.version>1.5.0</tycho.version>
<tycho.extras.version>${tycho.version}</tycho.extras.version>
<maven.compiler.version>3.6.1</maven.compiler.version>
<maven.javadoc.version>2.9.1</maven.javadoc.version>
@@ -245,11 +245,11 @@
</offlineLink>
<offlineLink>
<url>../../org.eclipse.ease.help/help/api-docs/javadoc/</url>
- <location>https://hudson.eclipse.org/ease/job/ease-build-core/javadoc/</location>
+ <location>https://ci.eclipse.org/ease/job/ease.build.core/JavaDoc</location>
</offlineLink>
<offlineLink>
<url>../../org.eclipse.ease.modules.help/help/api-docs/javadoc/</url>
- <location>https://hudson.eclipse.org/ease/job/ease-build-modules/javadoc/</location>
+ <location>https://ci.eclipse.org/ease/job/ease.build.modules/JavaDoc/</location>
</offlineLink>
</offlineLinks>
</configuration>
