Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Merks2020-08-17 15:08:30 +0000
committerEd Merks2020-08-17 15:08:30 +0000
commit711c7b192fd965e827b25296b6cec3fa77a21c56 (patch)
tree9a4c5d8885bee99ca008659859fdb7e4ad344f3d
parentcbb8cbb9c53acd010b4d28c8452ad216022478d3 (diff)
downloadorg.eclipse.emf-711c7b192fd965e827b25296b6cec3fa77a21c56.tar.gz
org.eclipse.emf-711c7b192fd965e827b25296b6cec3fa77a21c56.tar.xz
org.eclipse.emf-711c7b192fd965e827b25296b6cec3fa77a21c56.zip
[Releng] Update launchers and publishing to newer Tycho and platform.
-rw-r--r--releng/org.eclipse.emf.parent/Build EMF.launch2
-rw-r--r--releng/org.eclipse.emf.releng/Build EMF Releng.launch2
-rw-r--r--releng/org.eclipse.emf.releng/pom.xml4
-rw-r--r--releng/org.eclipse.emf.releng/publish/Build EMF Maven Publish.launch2
-rw-r--r--releng/org.eclipse.emf.releng/publish/pom.xml6
5 files changed, 8 insertions, 8 deletions
diff --git a/releng/org.eclipse.emf.parent/Build EMF.launch b/releng/org.eclipse.emf.parent/Build EMF.launch
index 69a7d1e96..b27fd24d6 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;&#9;&#9;2019-12&#13;&#10;&#9;&#9;2020-03&#13;&#10;&#9;&#9;2020-06&#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=2020-06 -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;&#9;&#9;2019-12&#13;&#10;&#9;&#9;2020-03&#13;&#10;&#9;&#9;2020-06&#13;&#10;&#9;&#9;2020-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=2020-09 -DskipTests=false -DDdebugPort=8000 --offline -DjavaVersion=11}&#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.releng/Build EMF Releng.launch b/releng/org.eclipse.emf.releng/Build EMF Releng.launch
index 56a35c33d..1f9288e0c 100644
--- a/releng/org.eclipse.emf.releng/Build EMF Releng.launch
+++ b/releng/org.eclipse.emf.releng/Build EMF Releng.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=Unknown&#13;&#10;-Dxsd.commit.id=Unknown&#13;&#10;-Dpublish.repository=true&#13;&#10;-Dpublish.download.root.folder=${maven.build.releng.publish.target}&#13;&#10;-Dpublish.build.timestamp=${current_date:yyyyMMddHHmm}&#13;&#10;-Dtycho.debug.resolver=false&#13;&#10;${string_prompt:arguments to modify the arguments used for the Tycho build.&#13;&#10;&#13;&#10;&#9;Change -Dpublish.build.type to one of the following valid choices.&#13;&#10;&#9; &#9;nightly&#13;&#10;&#9;&#9;milestone&#13;&#10;&#9;&#9;release&#13;&#10;&#9;&#13;&#10;&#9;Change -Dpublish.clean=true to -Dpublish.clean=false to retain stale builds.&#13;&#10;&#9;&#9;Older nightly and milestone builds will be retained.&#13;&#10;&#13;&#10;&#9;Change -DDdebugPort=8000 to -DdebugPort=8000 to remote debug the test.&#13;&#10;&#9;&#9;The 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;:&#13;&#10;-Dpublish.build.type=milestone &#13;&#10;-Dpublish.clean=true &#13;&#10;-DDdebugPort=8000 &#13;&#10;--offline&#13;&#10;}&#13;&#10;-DX&#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=Unknown&#13;&#10;-Dxsd.commit.id=Unknown&#13;&#10;-Dpublish.repository=true&#13;&#10;-Dpublish.download.root.folder=${maven.build.releng.publish.target}&#13;&#10;-Dpublish.build.timestamp=${current_date:yyyyMMddHHmm}&#13;&#10;-Dtycho.debug.resolver=false&#13;&#10;${string_prompt:arguments to modify the arguments used for the Tycho build.&#13;&#10;&#13;&#10;&#9;Change -Dpublish.build.type to one of the following valid choices.&#13;&#10;&#9; &#9;nightly&#13;&#10;&#9;&#9;milestone&#13;&#10;&#9;&#9;release&#13;&#10;&#9;&#13;&#10;&#9;Change -Dpublish.clean=true to -Dpublish.clean=false to retain stale builds.&#13;&#10;&#9;&#9;Older nightly and milestone builds will be retained.&#13;&#10;&#13;&#10;&#9;Change -DDdebugPort=8000 to -DdebugPort=8000 to remote debug the test.&#13;&#10;&#9;&#9;The 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;:&#13;&#10;-Dpublish.build.type=nightly &#13;&#10;-Dpublish.clean=true &#13;&#10;-DDdebugPort=8000 &#13;&#10;--offline&#13;&#10;}&#13;&#10;-DX&#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}/releng/org.eclipse.emf.releng"/>
</launchConfiguration>
diff --git a/releng/org.eclipse.emf.releng/pom.xml b/releng/org.eclipse.emf.releng/pom.xml
index 6f7d74260..704040f8f 100644
--- a/releng/org.eclipse.emf.releng/pom.xml
+++ b/releng/org.eclipse.emf.releng/pom.xml
@@ -6,7 +6,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho.scmUrl>scm:git:https://git.eclipse.org/r/p/emf/org.eclipse.emf.git</tycho.scmUrl>
- <tycho-version>1.6.0</tycho-version>
+ <tycho-version>1.7.0</tycho-version>
<os-jvm-flags />
</properties>
@@ -25,7 +25,7 @@
<repositories>
<repository>
<id>eclipse-2020-03</id>
- <url>http://download.eclipse.org/releases/2020-03</url>
+ <url>http://download.eclipse.org/releases/2020-06</url>
<layout>p2</layout>
</repository>
</repositories>
diff --git a/releng/org.eclipse.emf.releng/publish/Build EMF Maven Publish.launch b/releng/org.eclipse.emf.releng/publish/Build EMF Maven Publish.launch
index d7a15066d..61100a478 100644
--- a/releng/org.eclipse.emf.releng/publish/Build EMF Maven Publish.launch
+++ b/releng/org.eclipse.emf.releng/publish/Build EMF Maven Publish.launch
@@ -11,6 +11,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="-DX&#13;&#10;${string_prompt:arguments to modify the arguments used for the Maven build.:-Dversion.emf=2.18}&#13;&#10;--fail-at-end&#13;&#10;clean&#13;&#10;resources:resources&#13;&#10;verify"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-DX&#13;&#10;${string_prompt:arguments to modify the arguments used for the Maven build.:-Dversion.emf=2.22}&#13;&#10;--fail-at-end&#13;&#10;clean&#13;&#10;resources:resources&#13;&#10;verify"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${emf.git.clone.location}/releng/org.eclipse.emf.releng/publish"/>
</launchConfiguration>
diff --git a/releng/org.eclipse.emf.releng/publish/pom.xml b/releng/org.eclipse.emf.releng/publish/pom.xml
index c57840d0f..9a285532f 100644
--- a/releng/org.eclipse.emf.releng/publish/pom.xml
+++ b/releng/org.eclipse.emf.releng/publish/pom.xml
@@ -5,8 +5,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.tycho>1.2.0</version.tycho>
- <version.emf>2.13</version.emf>
+ <version.tycho>1.7.0</version.tycho>
+ <version.emf>2.22</version.emf>
<p2.emf>https://download.eclipse.org/modeling/emf/emf/builds/release/${version.emf}</p2.emf>
</properties>
@@ -63,7 +63,7 @@
<repository>
<id>cbi-aggregator</id>
<layout>p2</layout>
- <url>https://download.eclipse.org/cbi/updates/aggregator/headless/4.8/I20180518-0759</url>
+ <url>https://download.eclipse.org/cbi/updates/aggregator/headless/4.13/I20200625-1232</url>
</repository>
</repositories>
<executionEnvironment>JavaSE-11</executionEnvironment>

Back to the top