Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStéphane Bégaudeau2019-01-31 11:25:23 +0000
committerStéphane Bégaudeau2019-01-31 11:34:52 +0000
commit500fcdffc026dab30380ac1bd9ea77a6d275424d (patch)
treeba8ea797a37d16f839d9f72b2257e85b115c83f8
parent5ce1f06e9c4147412105ebebe355f03b01ad276a (diff)
downloadorg.eclipse.eef-500fcdffc026dab30380ac1bd9ea77a6d275424d.tar.gz
org.eclipse.eef-500fcdffc026dab30380ac1bd9ea77a6d275424d.tar.xz
org.eclipse.eef-500fcdffc026dab30380ac1bd9ea77a6d275424d.zip
[releng] Update the build for 2018-09
The Javadoc is no longer created during the build due to a regression in Java 9, 10, 11. See https://bugs.openjdk.java.net/browse/JDK-8205593 for additional information. The crux of the issue comes from the fact that after Java 9, the file package-list has been renamed into element-list. Change-Id: I4e7d2fd8e0198baa76a1ede03f0612d81327915c Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>
-rw-r--r--doc/org.eclipse.eef.documentation.javadoc/pom.xml1
-rw-r--r--features/org.eclipse.eef.sdk-feature/feature.xml4
-rw-r--r--releng/org.eclipse.eef.releng/pom.xml15
-rw-r--r--releng/org.eclipse.eef.releng/targetplatforms/2018-09/2018-09.target37
-rw-r--r--releng/org.eclipse.eef.releng/targetplatforms/2018-09/2018-09.tpd30
-rw-r--r--releng/org.eclipse.eef.releng/targetplatforms/2018-09/pom.xml29
-rw-r--r--releng/org.eclipse.eef.releng/targetplatforms/photon/photon.target8
-rw-r--r--releng/org.eclipse.eef.releng/targetplatforms/photon/photon.tpd4
8 files changed, 116 insertions, 12 deletions
diff --git a/doc/org.eclipse.eef.documentation.javadoc/pom.xml b/doc/org.eclipse.eef.documentation.javadoc/pom.xml
index a948aa151..749ee11e5 100644
--- a/doc/org.eclipse.eef.documentation.javadoc/pom.xml
+++ b/doc/org.eclipse.eef.documentation.javadoc/pom.xml
@@ -50,6 +50,7 @@ Contributors: Obeo - initial API and implementation
<tocOptions>
<mainLabel>EEF Javadoc</mainLabel>
</tocOptions>
+ <cleanFirst>true</cleanFirst>
<javadocOptions>
<encoding>UTF-8</encoding>
</javadocOptions>
diff --git a/features/org.eclipse.eef.sdk-feature/feature.xml b/features/org.eclipse.eef.sdk-feature/feature.xml
index 164faedbc..9ff2d8bd6 100644
--- a/features/org.eclipse.eef.sdk-feature/feature.xml
+++ b/features/org.eclipse.eef.sdk-feature/feature.xml
@@ -95,11 +95,11 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
+<!--
<plugin
id="org.eclipse.eef.documentation.javadoc"
download-size="0"
install-size="0"
version="0.0.0"/>
-
+-->
</feature>
diff --git a/releng/org.eclipse.eef.releng/pom.xml b/releng/org.eclipse.eef.releng/pom.xml
index 216885d8c..a441ffd54 100644
--- a/releng/org.eclipse.eef.releng/pom.xml
+++ b/releng/org.eclipse.eef.releng/pom.xml
@@ -21,13 +21,20 @@ Contributors: Obeo - initial API and implementation
<name>EEF Parent</name>
<properties>
- <tycho-version>1.1.0</tycho-version>
- <tycho-extras-version>1.1.0</tycho-extras-version>
+ <tycho-version>1.4.0-SNAPSHOT</tycho-version>
+ <tycho-extras-version>1.4.0-SNAPSHOT</tycho-extras-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <platform-version-name>photon</platform-version-name>
+ <platform-version-name>2018-09</platform-version-name>
<tycho.scmUrl>scm:git:http://git.eclipse.org/gitroot/eef/org.eclipse.eef.git</tycho.scmUrl>
</properties>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>tycho-snapshots</id>
+ <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
<build>
<plugins>
<plugin>
@@ -163,7 +170,7 @@ Contributors: Obeo - initial API and implementation
<module>../../tests/org.eclipse.eef.ui.tests</module>
<module>../../doc/org.eclipse.eef.documentation</module>
- <module>../../doc/org.eclipse.eef.documentation.javadoc</module>
+ <!-- <module>../../doc/org.eclipse.eef.documentation.javadoc</module> -->
<module>../../doc/org.eclipse.eef.documentation.export</module>
<module>../../doc/org.eclipse.eef.documentation.ext.widgets.reference</module>
diff --git a/releng/org.eclipse.eef.releng/targetplatforms/2018-09/2018-09.target b/releng/org.eclipse.eef.releng/targetplatforms/2018-09/2018-09.target
new file mode 100644
index 000000000..aaeb62322
--- /dev/null
+++ b/releng/org.eclipse.eef.releng/targetplatforms/2018-09/2018-09.target
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Eclipse Oxygen" sequenceNumber="1548927991">
+ <locations>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.acceleo.query.source.feature.group" version="0.0.0"/>
+ <unit id="org.antlr.runtime" version="4.3.0.v201502022030"/>
+ <repository id="Acceleo-Nightly" location="http://download.eclipse.org/acceleo/updates/nightly/latest"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.uml2.uml.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.uml2.uml.editor" version="0.0.0"/>
+ <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.transaction.feature.group" version="0.0.0"/>
+ <repository id="Eclipse-Luna" location="http://download.eclipse.org/releases/2018-09"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
+ <repository id="Eclipse-Shared-License" location="http://download.eclipse.org/cbi/updates/license"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.sirius.interpreter.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
+ <repository id="Sirius" location="http://download.eclipse.org/sirius/updates/releases/6.1.1/photon"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository"/>
+ </location>
+ </locations>
+</target>
diff --git a/releng/org.eclipse.eef.releng/targetplatforms/2018-09/2018-09.tpd b/releng/org.eclipse.eef.releng/targetplatforms/2018-09/2018-09.tpd
new file mode 100644
index 000000000..ade37b51c
--- /dev/null
+++ b/releng/org.eclipse.eef.releng/targetplatforms/2018-09/2018-09.tpd
@@ -0,0 +1,30 @@
+target "Eclipse Oxygen"
+
+include "http://download.eclipse.org/sirius/updates/nightly/targets/modules/aql-nightly.tpd"
+
+with source requirements
+
+location Eclipse-Luna "http://download.eclipse.org/releases/2018-09" {
+ org.eclipse.platform.feature.group lazy
+ org.eclipse.sdk.feature.group lazy
+ org.eclipse.uml2.uml.feature.group lazy
+ org.eclipse.uml2.uml.editor lazy
+ org.eclipse.xtext.sdk.feature.group lazy
+ org.eclipse.xtend.sdk.feature.group lazy
+ org.eclipse.emf.mwe2.runtime.sdk.feature.group lazy
+ org.eclipse.emf.transaction.feature.group lazy
+}
+
+
+location Eclipse-Shared-License "http://download.eclipse.org/cbi/updates/license" {
+ org.eclipse.license.feature.group lazy
+}
+
+location Sirius "http://download.eclipse.org/sirius/updates/releases/6.1.1/photon" {
+ org.eclipse.sirius.interpreter.feature.feature.group lazy
+ org.eclipse.sirius.runtime.feature.group lazy
+}
+
+location "http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository" {
+ org.hamcrest.library
+}
diff --git a/releng/org.eclipse.eef.releng/targetplatforms/2018-09/pom.xml b/releng/org.eclipse.eef.releng/targetplatforms/2018-09/pom.xml
new file mode 100644
index 000000000..94ed3a7fd
--- /dev/null
+++ b/releng/org.eclipse.eef.releng/targetplatforms/2018-09/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2019 Obeo.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+
+Contributors:
+ Obeo - initial API and implementation
+-->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.eef</groupId>
+ <artifactId>org.eclipse.eef.parent</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
+
+ <artifactId>2018-09</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-target-definition</packaging>
+
+ <name>EEF 2018-09 Target Definition</name>
+
+</project> \ No newline at end of file
diff --git a/releng/org.eclipse.eef.releng/targetplatforms/photon/photon.target b/releng/org.eclipse.eef.releng/targetplatforms/photon/photon.target
index bb1aa3d44..790bee2a3 100644
--- a/releng/org.eclipse.eef.releng/targetplatforms/photon/photon.target
+++ b/releng/org.eclipse.eef.releng/targetplatforms/photon/photon.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Eclipse Oxygen" sequenceNumber="1548927313">
+<target name="Eclipse Oxygen" sequenceNumber="1548927940">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
@@ -27,11 +27,11 @@
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.sirius.interpreter.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
- <repository id="Sirius" location="http://download.eclipse.org/sirius/updates/nightly/6.0.x/photon"/>
+ <repository id="Sirius" location="http://download.eclipse.org/sirius/updates/releases/6.0.2/photon"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository"/>
+ <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository"/>
</location>
</locations>
</target>
diff --git a/releng/org.eclipse.eef.releng/targetplatforms/photon/photon.tpd b/releng/org.eclipse.eef.releng/targetplatforms/photon/photon.tpd
index c5a4ff144..05db34a56 100644
--- a/releng/org.eclipse.eef.releng/targetplatforms/photon/photon.tpd
+++ b/releng/org.eclipse.eef.releng/targetplatforms/photon/photon.tpd
@@ -20,11 +20,11 @@ location Eclipse-Shared-License "http://download.eclipse.org/cbi/updates/license
org.eclipse.license.feature.group lazy
}
-location Sirius "http://download.eclipse.org/sirius/updates/nightly/6.0.x/photon" {
+location Sirius "http://download.eclipse.org/sirius/updates/releases/6.0.2/photon" {
org.eclipse.sirius.interpreter.feature.feature.group lazy
org.eclipse.sirius.runtime.feature.group lazy
}
-location "http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository" {
+location "http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository" {
org.hamcrest.library
}

Back to the top