Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Merks2019-12-03 22:58:14 -0500
committerEd Merks2019-12-03 22:58:14 -0500
commitf05f631201b18b15250ea0cafa31701843f9aae4 (patch)
treefbb131b9c3d9318c280e9744835bb26141831f84 /releng/org.eclipse.emf.parent
parent21bbdbf357f17ef37c5e95663134dcb1861df060 (diff)
downloadorg.eclipse.emf-f05f631201b18b15250ea0cafa31701843f9aae4.tar.gz
org.eclipse.emf-f05f631201b18b15250ea0cafa31701843f9aae4.tar.xz
org.eclipse.emf-f05f631201b18b15250ea0cafa31701843f9aae4.zip
[releng] Prepare for 2.20 release.
Fix issues related to building against the Xtext 2.20 release, i.e., make sure the Xcore tests run. Fix issues for building against older target platforms.
Diffstat (limited to 'releng/org.eclipse.emf.parent')
-rw-r--r--releng/org.eclipse.emf.parent/Build EMF.launch2
-rw-r--r--releng/org.eclipse.emf.parent/tp/2019-12.target5
-rw-r--r--releng/org.eclipse.emf.parent/tp/helios.target1
-rw-r--r--releng/org.eclipse.emf.parent/tp/indigo.target1
-rw-r--r--releng/org.eclipse.emf.parent/tp/juno.target1
-rw-r--r--releng/org.eclipse.emf.parent/tp/kepler.target1
-rw-r--r--releng/org.eclipse.emf.parent/tp/luna.target1
-rw-r--r--releng/org.eclipse.emf.parent/tp/mars.target1
-rw-r--r--releng/org.eclipse.emf.parent/tp/neon.target1
-rw-r--r--releng/org.eclipse.emf.parent/tp/oxygen.target1
-rw-r--r--releng/org.eclipse.emf.parent/tp/photon.target1
11 files changed, 14 insertions, 2 deletions
diff --git a/releng/org.eclipse.emf.parent/Build EMF.launch b/releng/org.eclipse.emf.parent/Build EMF.launch
index e8216d233..cc8298c43 100644
--- a/releng/org.eclipse.emf.parent/Build EMF.launch
+++ b/releng/org.eclipse.emf.parent/Build EMF.launch
@@ -10,6 +10,6 @@
</listAttribute>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${maven.build.command}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.id=${current_date:yyyyMMddHHmm}&#13;&#10;-Demf.commit.id=fe63d690ef8473ea88c97f5a5dbcde5f6ca9e0ce&#13;&#10;-Dxsd.commit.id=411d33726100f7b27ec81ebaeb0704418753c37a&#13;&#10;-Dtycho.debug.resolver=true&#13;&#10;-DX&#13;&#10;${string_prompt:arguments to modify the arguments used for the Tycho build.&#13;&#10;&#13;&#10;&#9;Change -Dtarget-platform to one of the following valid choices.&#13;&#10;&#9; &#9;helios&#13;&#10;&#9;&#9;indigo&#13;&#10;&#9;&#9;juno&#13;&#10;&#9;&#9;kepler&#13;&#10;&#9;&#9;luna&#13;&#10;&#9;&#9;mars&#13;&#10;&#9;&#9;neon&#13;&#10;&#9;&#9;oxygen&#13;&#10;&#9;&#9;photon&#13;&#10;&#9;&#9;2018-09&#13;&#10;&#9;&#9;2018-12&#13;&#10;&#9;&#9;2019-03&#13;&#10;&#9;&#9;2019-06&#13;&#10;&#9;&#9;2019-09&#13;&#10;&#13;&#10;&#9;Change -DskipTests=false to -DskipTests=true to skip the tests.&#13;&#10;&#9;&#9;The tests take long to run!&#13;&#10;&#13;&#10;&#9;Change -DDdebugPort=8000 to -DdebugPort=8000 to remote debug the tests.&#13;&#10;&#9;&#9;Each test will block waiting for a remote debugger to attach.&#13;&#10;&#13;&#10;&#9;Remove --offline to build online.&#13;&#10;&#9;&#9;Online takes longer but it is needed the first time you build!&#13;&#10;&#13;&#10;:-Dtarget-platform=2019-09 -DskipTests=false -DDdebugPort=8000 --offline}&#13;&#10;--fail-at-end&#13;&#10;clean&#13;&#10;verify"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.id=${current_date:yyyyMMddHHmm}&#13;&#10;-Demf.commit.id=fe63d690ef8473ea88c97f5a5dbcde5f6ca9e0ce&#13;&#10;-Dxsd.commit.id=411d33726100f7b27ec81ebaeb0704418753c37a&#13;&#10;-Dtycho.debug.resolver=true&#13;&#10;-DX&#13;&#10;${string_prompt:arguments to modify the arguments used for the Tycho build.&#13;&#10;&#13;&#10;&#9;Change -Dtarget-platform to one of the following valid choices.&#13;&#10;&#9; &#9;helios&#13;&#10;&#9;&#9;indigo&#13;&#10;&#9;&#9;juno&#13;&#10;&#9;&#9;kepler&#13;&#10;&#9;&#9;luna&#13;&#10;&#9;&#9;mars&#13;&#10;&#9;&#9;neon&#13;&#10;&#9;&#9;oxygen&#13;&#10;&#9;&#9;photon&#13;&#10;&#9;&#9;2018-09&#13;&#10;&#9;&#9;2018-12&#13;&#10;&#9;&#9;2019-03&#13;&#10;&#9;&#9;2019-06&#13;&#10;&#9;&#9;2019-09&#13;&#10;&#13;&#10;&#9;Change -DskipTests=false to -DskipTests=true to skip the tests.&#13;&#10;&#9;&#9;The tests take long to run!&#13;&#10;&#13;&#10;&#9;Change -DDdebugPort=8000 to -DdebugPort=8000 to remote debug the tests.&#13;&#10;&#9;&#9;Each test will block waiting for a remote debugger to attach.&#13;&#10;&#13;&#10;&#9;Remove --offline to build online.&#13;&#10;&#9;&#9;Online takes longer but it is needed the first time you build!&#13;&#10;&#13;&#10;:-Dtarget-platform=2019-12 -DskipTests=false -DDdebugPort=8000 --offline}&#13;&#10;--fail-at-end&#13;&#10;clean&#13;&#10;verify"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${emf.git.clone.location}"/>
</launchConfiguration>
diff --git a/releng/org.eclipse.emf.parent/tp/2019-12.target b/releng/org.eclipse.emf.parent/tp/2019-12.target
index 64791015a..ee0e723fc 100644
--- a/releng/org.eclipse.emf.parent/tp/2019-12.target
+++ b/releng/org.eclipse.emf.parent/tp/2019-12.target
@@ -18,13 +18,16 @@
<unit id="org.eclipse.nebula.widgets.cdatetime" version="0.0.0"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.14-I-builds"/>
- <repository location="http://download.eclipse.org/releases/2019-12"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R"/>
<repository location="https://dl.google.com/eclipse/plugin/4.6"/>
<repository location="http://download.itemis.com/updates/releases/2.1.0"/>
+ <repository location="http://download.eclipse.org/datatools/updates/1.14.105-SNAPSHOT/repository"/>
+
+ <repository location="http://download.eclipse.org/rt/rap/3.10/R-20190911-1524"/>
+
<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.20.0"/>
<repository location="http://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315"/>
<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.11.1"/>
diff --git a/releng/org.eclipse.emf.parent/tp/helios.target b/releng/org.eclipse.emf.parent/tp/helios.target
index eb027643e..3813c0c41 100644
--- a/releng/org.eclipse.emf.parent/tp/helios.target
+++ b/releng/org.eclipse.emf.parent/tp/helios.target
@@ -19,6 +19,7 @@
<repository location="http://download.eclipse.org/releases/helios/201102250900"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/2019-06"/>
<repository location="https://dl.google.com/eclipse/plugin/4.6"/>
diff --git a/releng/org.eclipse.emf.parent/tp/indigo.target b/releng/org.eclipse.emf.parent/tp/indigo.target
index 6a91428da..1b45c77f3 100644
--- a/releng/org.eclipse.emf.parent/tp/indigo.target
+++ b/releng/org.eclipse.emf.parent/tp/indigo.target
@@ -19,6 +19,7 @@
<repository location="http://download.eclipse.org/releases/indigo/201202240900"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/2019-06"/>
<repository location="https://dl.google.com/eclipse/plugin/4.6"/>
diff --git a/releng/org.eclipse.emf.parent/tp/juno.target b/releng/org.eclipse.emf.parent/tp/juno.target
index b33b34341..7855eb134 100644
--- a/releng/org.eclipse.emf.parent/tp/juno.target
+++ b/releng/org.eclipse.emf.parent/tp/juno.target
@@ -19,6 +19,7 @@
<repository location="http://download.eclipse.org/releases/juno/201303010900"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/2019-06"/>
<repository location="https://dl.google.com/eclipse/plugin/4.6"/>
diff --git a/releng/org.eclipse.emf.parent/tp/kepler.target b/releng/org.eclipse.emf.parent/tp/kepler.target
index 202c5e4c2..8f936b315 100644
--- a/releng/org.eclipse.emf.parent/tp/kepler.target
+++ b/releng/org.eclipse.emf.parent/tp/kepler.target
@@ -19,6 +19,7 @@
<repository location="http://download.eclipse.org/releases/kepler/201402280900"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/2019-06"/>
<repository location="https://dl.google.com/eclipse/plugin/4.6"/>
diff --git a/releng/org.eclipse.emf.parent/tp/luna.target b/releng/org.eclipse.emf.parent/tp/luna.target
index 97e40149c..509d3929a 100644
--- a/releng/org.eclipse.emf.parent/tp/luna.target
+++ b/releng/org.eclipse.emf.parent/tp/luna.target
@@ -19,6 +19,7 @@
<repository location="http://download.eclipse.org/releases/luna/201502271000"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/2019-06"/>
<repository location="https://dl.google.com/eclipse/plugin/4.6"/>
diff --git a/releng/org.eclipse.emf.parent/tp/mars.target b/releng/org.eclipse.emf.parent/tp/mars.target
index f3bb11c98..da1410578 100644
--- a/releng/org.eclipse.emf.parent/tp/mars.target
+++ b/releng/org.eclipse.emf.parent/tp/mars.target
@@ -19,6 +19,7 @@
<repository location="http://download.eclipse.org/releases/mars/201602261000"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/2019-06"/>
<repository location="https://dl.google.com/eclipse/plugin/4.6"/>
diff --git a/releng/org.eclipse.emf.parent/tp/neon.target b/releng/org.eclipse.emf.parent/tp/neon.target
index a342ac7bf..74871143a 100644
--- a/releng/org.eclipse.emf.parent/tp/neon.target
+++ b/releng/org.eclipse.emf.parent/tp/neon.target
@@ -19,6 +19,7 @@
<repository location="http://download.eclipse.org/releases/neon/201705151400"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/2019-06"/>
<repository location="https://dl.google.com/eclipse/plugin/4.6"/>
diff --git a/releng/org.eclipse.emf.parent/tp/oxygen.target b/releng/org.eclipse.emf.parent/tp/oxygen.target
index 459419513..99d4b8e4c 100644
--- a/releng/org.eclipse.emf.parent/tp/oxygen.target
+++ b/releng/org.eclipse.emf.parent/tp/oxygen.target
@@ -19,6 +19,7 @@
<repository location="http://download.eclipse.org/releases/oxygen"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/2019-06"/>
<repository location="https://dl.google.com/eclipse/plugin/4.6"/>
diff --git a/releng/org.eclipse.emf.parent/tp/photon.target b/releng/org.eclipse.emf.parent/tp/photon.target
index 7d984f6a3..d1d9eb800 100644
--- a/releng/org.eclipse.emf.parent/tp/photon.target
+++ b/releng/org.eclipse.emf.parent/tp/photon.target
@@ -19,6 +19,7 @@
<repository location="http://download.eclipse.org/releases/photon/201806271001"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/2019-06"/>
<repository location="https://dl.google.com/eclipse/plugin/4.6"/>

Back to the top