diff options
author | Ed Merks | 2020-08-17 15:08:30 +0000 |
---|---|---|
committer | Ed Merks | 2020-08-17 15:08:30 +0000 |
commit | 711c7b192fd965e827b25296b6cec3fa77a21c56 (patch) | |
tree | 9a4c5d8885bee99ca008659859fdb7e4ad344f3d | |
parent | cbb8cbb9c53acd010b4d28c8452ad216022478d3 (diff) | |
download | org.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.
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} -Demf.commit.id=fe63d690ef8473ea88c97f5a5dbcde5f6ca9e0ce -Dxsd.commit.id=411d33726100f7b27ec81ebaeb0704418753c37a -Dtycho.debug.resolver=true -DX ${string_prompt:arguments to modify the arguments used for the Tycho build. 	Change -Dtarget-platform to one of the following valid choices. 	 	helios 		indigo 		juno 		kepler 		luna 		mars 		neon 		oxygen 		photon 		2018-09 		2018-12 		2019-03 		2019-06 		2019-09 		2019-12 		2020-03 		2020-06 	Change -DskipTests=false to -DskipTests=true to skip the tests. 		The tests take long to run! 	Change -DDdebugPort=8000 to -DdebugPort=8000 to remote debug the tests. 		Each test will block waiting for a remote debugger to attach. 	Remove --offline to build online. 		Online takes longer but it is needed the first time you build! :-Dtarget-platform=2020-06 -DskipTests=false -DDdebugPort=8000 --offline} --fail-at-end clean verify"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.id=${current_date:yyyyMMddHHmm} -Demf.commit.id=fe63d690ef8473ea88c97f5a5dbcde5f6ca9e0ce -Dxsd.commit.id=411d33726100f7b27ec81ebaeb0704418753c37a -Dtycho.debug.resolver=true -DX ${string_prompt:arguments to modify the arguments used for the Tycho build. 	Change -Dtarget-platform to one of the following valid choices. 	 	helios 		indigo 		juno 		kepler 		luna 		mars 		neon 		oxygen 		photon 		2018-09 		2018-12 		2019-03 		2019-06 		2019-09 		2019-12 		2020-03 		2020-06 		2020-09 	Change -DskipTests=false to -DskipTests=true to skip the tests. 		The tests take long to run! 	Change -DDdebugPort=8000 to -DdebugPort=8000 to remote debug the tests. 		Each test will block waiting for a remote debugger to attach. 	Remove --offline to build online. 		Online takes longer but it is needed the first time you build! :-Dtarget-platform=2020-09 -DskipTests=false -DDdebugPort=8000 --offline -DjavaVersion=11} --fail-at-end clean 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} -Demf.commit.id=Unknown -Dxsd.commit.id=Unknown -Dpublish.repository=true -Dpublish.download.root.folder=${maven.build.releng.publish.target} -Dpublish.build.timestamp=${current_date:yyyyMMddHHmm} -Dtycho.debug.resolver=false ${string_prompt:arguments to modify the arguments used for the Tycho build. 	Change -Dpublish.build.type to one of the following valid choices. 	 	nightly 		milestone 		release 	 	Change -Dpublish.clean=true to -Dpublish.clean=false to retain stale builds. 		Older nightly and milestone builds will be retained. 	Change -DDdebugPort=8000 to -DdebugPort=8000 to remote debug the test. 		The test will block waiting for a remote debugger to attach. 	Remove --offline to build online. 		Online takes longer but it is needed the first time you build! : -Dpublish.build.type=milestone -Dpublish.clean=true -DDdebugPort=8000 --offline } -DX --fail-at-end clean verify"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild.id=${current_date:yyyyMMddHHmm} -Demf.commit.id=Unknown -Dxsd.commit.id=Unknown -Dpublish.repository=true -Dpublish.download.root.folder=${maven.build.releng.publish.target} -Dpublish.build.timestamp=${current_date:yyyyMMddHHmm} -Dtycho.debug.resolver=false ${string_prompt:arguments to modify the arguments used for the Tycho build. 	Change -Dpublish.build.type to one of the following valid choices. 	 	nightly 		milestone 		release 	 	Change -Dpublish.clean=true to -Dpublish.clean=false to retain stale builds. 		Older nightly and milestone builds will be retained. 	Change -DDdebugPort=8000 to -DdebugPort=8000 to remote debug the test. 		The test will block waiting for a remote debugger to attach. 	Remove --offline to build online. 		Online takes longer but it is needed the first time you build! : -Dpublish.build.type=nightly -Dpublish.clean=true -DDdebugPort=8000 --offline } -DX --fail-at-end clean 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 ${string_prompt:arguments to modify the arguments used for the Maven build.:-Dversion.emf=2.18} --fail-at-end clean resources:resources verify"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-DX ${string_prompt:arguments to modify the arguments used for the Maven build.:-Dversion.emf=2.22} --fail-at-end clean resources:resources 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> |