From b51f99b326cbcd5dd85ab1dd795bdbf8838ff81d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Spo=CC=88nemann?= Date: Mon, 16 Jan 2017 15:01:28 +0100 Subject: [PATCH 1/3] Increased version number for milestone 2.11.0.RC1 --- gradle/bootstrap-setup.gradle | 2 +- gradle/upstream-repositories.gradle | 2 +- gradle/versions.gradle | 2 +- releng/pom.xml | 50 +++++++++++++---------------- 4 files changed, 26 insertions(+), 30 deletions(-) diff --git a/gradle/bootstrap-setup.gradle b/gradle/bootstrap-setup.gradle index daf065a94..bf84a51c0 100644 --- a/gradle/bootstrap-setup.gradle +++ b/gradle/bootstrap-setup.gradle @@ -12,7 +12,7 @@ repositories { } // The Xtend compiler version to use -def bootstrapXtendVersion = versions.xtext +def bootstrapXtendVersion = '2.11.0-SNAPSHOT' configurations { xtendCompiler { diff --git a/gradle/upstream-repositories.gradle b/gradle/upstream-repositories.gradle index 1e6cf64fa..0d69ae271 100644 --- a/gradle/upstream-repositories.gradle +++ b/gradle/upstream-repositories.gradle @@ -6,7 +6,7 @@ */ if (!hasProperty('upstreamBranch')) - ext.upstreamBranch = 'master' + ext.upstreamBranch = 'milestone_2.11.0.RC1' def jenkinsPipelineRepo = { jobName -> "http://services.typefox.io/open-source/jenkins/job/$jobName/job/$upstreamBranch/lastStableBuild/artifact/build/maven-repository/" } repositories { diff --git a/gradle/versions.gradle b/gradle/versions.gradle index c0dfb3ff9..fde49ed94 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -2,7 +2,7 @@ * Base project version and versions of common dependencies. */ -version = '2.11.0-SNAPSHOT' +version = '2.11.0.RC1' ext.versions = [ 'xtext': version, diff --git a/releng/pom.xml b/releng/pom.xml index 4a58a3f6d..ebad74b06 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -26,11 +26,7 @@ maven - http://services.typefox.io/open-source/jenkins/job/lsp4j/job/master/lastStableBuild/artifact/build/maven-repository/ - - - maven2 - http://services.typefox.io/open-source/jenkins/job/xtext-lib/job/master/lastStableBuild/artifact/build/maven-repository/ + http://services.typefox.io/open-source/jenkins/job/xtext-lib/job/milestone_2.11.0.RC1/lastStableBuild/artifact/build/maven-repository/ @@ -38,122 +34,122 @@ org.eclipse.xtext org.eclipse.xtext - 2.11.0-SNAPSHOT + 2.11.0.RC1 org.eclipse.xtext org.eclipse.xtext - 2.11.0-SNAPSHOT + 2.11.0.RC1 sources org.eclipse.xtext org.eclipse.xtext.ide - 2.11.0-SNAPSHOT + 2.11.0.RC1 org.eclipse.xtext org.eclipse.xtext.ide - 2.11.0-SNAPSHOT + 2.11.0.RC1 sources org.eclipse.xtext org.eclipse.xtext.ide.tests - 2.11.0-SNAPSHOT + 2.11.0.RC1 org.eclipse.xtext org.eclipse.xtext.ide.tests - 2.11.0-SNAPSHOT + 2.11.0.RC1 sources org.eclipse.xtext org.eclipse.xtext.testing - 2.11.0-SNAPSHOT + 2.11.0.RC1 org.eclipse.xtext org.eclipse.xtext.testing - 2.11.0-SNAPSHOT + 2.11.0.RC1 sources org.eclipse.xtext org.eclipse.xtext.testlanguages - 2.11.0-SNAPSHOT + 2.11.0.RC1 org.eclipse.xtext org.eclipse.xtext.testlanguages - 2.11.0-SNAPSHOT + 2.11.0.RC1 sources org.eclipse.xtext org.eclipse.xtext.testlanguages.ide - 2.11.0-SNAPSHOT + 2.11.0.RC1 org.eclipse.xtext org.eclipse.xtext.testlanguages.ide - 2.11.0-SNAPSHOT + 2.11.0.RC1 sources org.eclipse.xtext org.eclipse.xtext.tests - 2.11.0-SNAPSHOT + 2.11.0.RC1 org.eclipse.xtext org.eclipse.xtext.tests - 2.11.0-SNAPSHOT + 2.11.0.RC1 sources org.eclipse.xtext org.eclipse.xtext.util - 2.11.0-SNAPSHOT + 2.11.0.RC1 org.eclipse.xtext org.eclipse.xtext.util - 2.11.0-SNAPSHOT + 2.11.0.RC1 sources org.eclipse.xtext org.eclipse.xtext.xtext.generator - 2.11.0-SNAPSHOT + 2.11.0.RC1 org.eclipse.xtext org.eclipse.xtext.xtext.generator - 2.11.0-SNAPSHOT + 2.11.0.RC1 sources org.eclipse.xtext org.eclipse.xtext.xtext.ide - 2.11.0-SNAPSHOT + 2.11.0.RC1 org.eclipse.xtext org.eclipse.xtext.xtext.ide - 2.11.0-SNAPSHOT + 2.11.0.RC1 sources org.eclipse.xtext org.eclipse.xtext.xtext.wizard - 2.11.0-SNAPSHOT + 2.11.0.RC1 org.eclipse.xtext org.eclipse.xtext.xtext.wizard - 2.11.0-SNAPSHOT + 2.11.0.RC1 sources From 64c9c3351b37d0102ced89263778db4424b5c144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Spo=CC=88nemann?= Date: Wed, 18 Jan 2017 11:41:47 +0100 Subject: [PATCH 2/3] Increased version number for release 2.11.0 --- gradle/bootstrap-setup.gradle | 2 +- gradle/upstream-repositories.gradle | 2 +- gradle/versions.gradle | 4 +-- releng/pom.xml | 46 ++++++++++++++--------------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/gradle/bootstrap-setup.gradle b/gradle/bootstrap-setup.gradle index bf84a51c0..7781ef1ce 100644 --- a/gradle/bootstrap-setup.gradle +++ b/gradle/bootstrap-setup.gradle @@ -12,7 +12,7 @@ repositories { } // The Xtend compiler version to use -def bootstrapXtendVersion = '2.11.0-SNAPSHOT' +def bootstrapXtendVersion = '2.11.0.RC1' configurations { xtendCompiler { diff --git a/gradle/upstream-repositories.gradle b/gradle/upstream-repositories.gradle index 0d69ae271..276c48a72 100644 --- a/gradle/upstream-repositories.gradle +++ b/gradle/upstream-repositories.gradle @@ -6,7 +6,7 @@ */ if (!hasProperty('upstreamBranch')) - ext.upstreamBranch = 'milestone_2.11.0.RC1' + ext.upstreamBranch = 'release_2.11.0' def jenkinsPipelineRepo = { jobName -> "http://services.typefox.io/open-source/jenkins/job/$jobName/job/$upstreamBranch/lastStableBuild/artifact/build/maven-repository/" } repositories { diff --git a/gradle/versions.gradle b/gradle/versions.gradle index fde49ed94..48fc09ab7 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -2,11 +2,11 @@ * Base project version and versions of common dependencies. */ -version = '2.11.0.RC1' +version = '2.11.0' ext.versions = [ 'xtext': version, - 'xtext_bootstrap': '2.11.0.beta2', + 'xtext_bootstrap': '2.11.0.RC1', 'gradle_plugins': '0.1.0', 'xtext_gradle_plugin': '1.0.15', 'lsp4j': '[0.1.0,0.2)', diff --git a/releng/pom.xml b/releng/pom.xml index ebad74b06..980c2ba87 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -26,7 +26,7 @@ maven - http://services.typefox.io/open-source/jenkins/job/xtext-lib/job/milestone_2.11.0.RC1/lastStableBuild/artifact/build/maven-repository/ + http://services.typefox.io/open-source/jenkins/job/xtext-lib/job/release_2.11.0/lastStableBuild/artifact/build/maven-repository/ @@ -34,122 +34,122 @@ org.eclipse.xtext org.eclipse.xtext - 2.11.0.RC1 + 2.11.0 org.eclipse.xtext org.eclipse.xtext - 2.11.0.RC1 + 2.11.0 sources org.eclipse.xtext org.eclipse.xtext.ide - 2.11.0.RC1 + 2.11.0 org.eclipse.xtext org.eclipse.xtext.ide - 2.11.0.RC1 + 2.11.0 sources org.eclipse.xtext org.eclipse.xtext.ide.tests - 2.11.0.RC1 + 2.11.0 org.eclipse.xtext org.eclipse.xtext.ide.tests - 2.11.0.RC1 + 2.11.0 sources org.eclipse.xtext org.eclipse.xtext.testing - 2.11.0.RC1 + 2.11.0 org.eclipse.xtext org.eclipse.xtext.testing - 2.11.0.RC1 + 2.11.0 sources org.eclipse.xtext org.eclipse.xtext.testlanguages - 2.11.0.RC1 + 2.11.0 org.eclipse.xtext org.eclipse.xtext.testlanguages - 2.11.0.RC1 + 2.11.0 sources org.eclipse.xtext org.eclipse.xtext.testlanguages.ide - 2.11.0.RC1 + 2.11.0 org.eclipse.xtext org.eclipse.xtext.testlanguages.ide - 2.11.0.RC1 + 2.11.0 sources org.eclipse.xtext org.eclipse.xtext.tests - 2.11.0.RC1 + 2.11.0 org.eclipse.xtext org.eclipse.xtext.tests - 2.11.0.RC1 + 2.11.0 sources org.eclipse.xtext org.eclipse.xtext.util - 2.11.0.RC1 + 2.11.0 org.eclipse.xtext org.eclipse.xtext.util - 2.11.0.RC1 + 2.11.0 sources org.eclipse.xtext org.eclipse.xtext.xtext.generator - 2.11.0.RC1 + 2.11.0 org.eclipse.xtext org.eclipse.xtext.xtext.generator - 2.11.0.RC1 + 2.11.0 sources org.eclipse.xtext org.eclipse.xtext.xtext.ide - 2.11.0.RC1 + 2.11.0 org.eclipse.xtext org.eclipse.xtext.xtext.ide - 2.11.0.RC1 + 2.11.0 sources org.eclipse.xtext org.eclipse.xtext.xtext.wizard - 2.11.0.RC1 + 2.11.0 org.eclipse.xtext org.eclipse.xtext.xtext.wizard - 2.11.0.RC1 + 2.11.0 sources From 1b140cbcacb0fcb0e43339ca108c5d61f2a390dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Spo=CC=88nemann?= Date: Wed, 18 Jan 2017 16:20:18 +0100 Subject: [PATCH 3/3] [build] Implemented more intelligent upstream branch selection --- gradle/upstream-repositories.gradle | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/gradle/upstream-repositories.gradle b/gradle/upstream-repositories.gradle index 276c48a72..b34d94db7 100644 --- a/gradle/upstream-repositories.gradle +++ b/gradle/upstream-repositories.gradle @@ -2,11 +2,22 @@ * The build uses either public snapshots or branch-specific repositories on the Jenkins * build server as upstream repositories. Use the argument '-PuseJenkinsSnapshots=true' * to enable the Jenkins repositories. In this case you can select an upstream branch - * with the argument '-PupstreamBranch='. + * with the argument '-PupstreamBranch='. Without that argument, the + * upstream branch is selected automatically based on the version string. */ -if (!hasProperty('upstreamBranch')) - ext.upstreamBranch = 'release_2.11.0' +if (!hasProperty('upstreamBranch')) { + def versionSplit = version.split('\\.') + if (versionSplit.length == 4) + ext.upstreamBranch = 'milestone_' + version + else if (versionSplit[2] == '0-SNAPSHOT') + ext.upstreamBranch = 'master' + else if (versionSplit[2].endsWith('-SNAPSHOT')) + ext.upstreamBranch = 'maintenance_' + version.substring(0, version.lastIndexOf('.')) + else + ext.upstreamBranch = 'release_' + version +} + def jenkinsPipelineRepo = { jobName -> "http://services.typefox.io/open-source/jenkins/job/$jobName/job/$upstreamBranch/lastStableBuild/artifact/build/maven-repository/" } repositories {