From eaa0a66288027de65549727d47e7ba0b18dc7c40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Spo=CC=88nemann?= Date: Wed, 1 Feb 2017 11:20:39 +0100 Subject: [PATCH 1/2] [build] Increased version number to 2.11.1-SNAPSHOT --- gradle/bootstrap-setup.gradle | 2 +- gradle/versions.gradle | 4 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.ide/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext.util/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.xtext/META-INF/MANIFEST.MF | 2 +- releng/p2/category.xml | 44 +++++++-------- releng/p2/pom.xml | 2 +- releng/pom.xml | 54 ++++++++++--------- releng/releng-target/pom.xml | 2 +- releng/releng-target/xtext-core.target.target | 2 +- 18 files changed, 69 insertions(+), 65 deletions(-) diff --git a/gradle/bootstrap-setup.gradle b/gradle/bootstrap-setup.gradle index 7781ef1ce..ebbbe2c60 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.RC1' +def bootstrapXtendVersion = '2.11.0' configurations { xtendCompiler { diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 48fc09ab7..2eebf7a3d 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' +version = '2.11.1-SNAPSHOT' ext.versions = [ 'xtext': version, - 'xtext_bootstrap': '2.11.0.RC1', + 'xtext_bootstrap': '2.11.0', 'gradle_plugins': '0.1.0', 'xtext_gradle_plugin': '1.0.15', 'lsp4j': '[0.1.0,0.2)', diff --git a/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF index de99ffd7a..c9afbe592 100644 --- a/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Xtext IDE Tests Bundle-SymbolicName: org.eclipse.xtext.ide.tests;singleton:=true -Bundle-Version: 2.11.0.qualifier +Bundle-Version: 2.11.1.qualifier Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF index 8a73d79d7..2433d99c8 100644 --- a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Xtext IDE Core Bundle-SymbolicName: org.eclipse.xtext.ide;singleton:=true -Bundle-Version: 2.11.0.qualifier +Bundle-Version: 2.11.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Vendor: Eclipse Xtext diff --git a/org.eclipse.xtext.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.testing/META-INF/MANIFEST.MF index a89d3cb9a..ae97cffdb 100644 --- a/org.eclipse.xtext.testing/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testing/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Xtext Testing Infrastructure Bundle-SymbolicName: org.eclipse.xtext.testing;singleton:=true -Bundle-Version: 2.11.0.qualifier +Bundle-Version: 2.11.1.qualifier Bundle-ClassPath: . Bundle-Vendor: Eclipse Xtext Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF index 2fa088981..4688d5beb 100644 --- a/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Common Xtext Testlanguages for UI and Runtime - IDE Features Bundle-SymbolicName: org.eclipse.xtext.testlanguages.ide;singleton:=true -Bundle-Version: 2.11.0.qualifier +Bundle-Version: 2.11.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Xtext Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF index 4d90e089d..adc32867c 100644 --- a/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Common Xtext Testlanguages for UI and Runtime - Runtime Bundle-Vendor: Eclipse Xtext -Bundle-Version: 2.11.0.qualifier +Bundle-Version: 2.11.1.qualifier Bundle-SymbolicName: org.eclipse.xtext.testlanguages; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, diff --git a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF index fbb35d898..44729701b 100644 --- a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.xtext.tests;singleton:=true -Bundle-Version: 2.11.0.qualifier +Bundle-Version: 2.11.1.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.xtext.util/META-INF/MANIFEST.MF b/org.eclipse.xtext.util/META-INF/MANIFEST.MF index fba0b214f..47a8b2d45 100644 --- a/org.eclipse.xtext.util/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.util/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Xtext Utility Bundle-SymbolicName: org.eclipse.xtext.util -Bundle-Version: 2.11.0.qualifier +Bundle-Version: 2.11.1.qualifier Maven-Version: unspecified Bundle-Vendor: Eclipse Xtext Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF index 7c823f95a..e1e466500 100644 --- a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.xtext.xtext.generator;singleton:=true -Bundle-Version: 2.11.0.qualifier +Bundle-Version: 2.11.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Name: Xtext Generator 2 Bundle-Vendor: Eclipse Xtext diff --git a/org.eclipse.xtext.xtext.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ide/META-INF/MANIFEST.MF index 75bdc896f..c92661605 100644 --- a/org.eclipse.xtext.xtext.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ide/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Xtext Language IDE Support Bundle-SymbolicName: org.eclipse.xtext.xtext.ide;singleton:=true -Bundle-Version: 2.11.0.qualifier +Bundle-Version: 2.11.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Vendor: Eclipse Xtext -Require-Bundle: org.eclipse.xtext.ide;bundle-version="2.11.0" +Require-Bundle: org.eclipse.xtext.ide;bundle-version="2.11.1" Import-Package: org.apache.log4j;version="1.2.15" Export-Package: org.eclipse.xtext.xtext.ide;x-friends:="org.eclipse.xtext.xtext.ui", org.eclipse.xtext.xtext.ide.contentassist.antlr;x-friends:="org.eclipse.xtext.xtext.ui", diff --git a/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF index 0961a3c33..0a148cb2c 100644 --- a/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Xtext Wizard Bundle-SymbolicName: org.eclipse.xtext.xtext.wizard -Bundle-Version: 2.11.0.qualifier +Bundle-Version: 2.11.1.qualifier Bundle-Vendor: Eclipse Xtext Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.xtext.xtext.wizard;x-friends:="org.eclipse.xtext.xtext.ui,org.eclipse.xtext.xtext.ui.tests", diff --git a/org.eclipse.xtext/META-INF/MANIFEST.MF b/org.eclipse.xtext/META-INF/MANIFEST.MF index 57f585e47..d9b2d40e2 100644 --- a/org.eclipse.xtext/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Xtext Bundle-SymbolicName: org.eclipse.xtext;singleton:=true -Bundle-Version: 2.11.0.qualifier +Bundle-Version: 2.11.1.qualifier Bundle-ClassPath: . Bundle-Vendor: Eclipse Xtext Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/releng/p2/category.xml b/releng/p2/category.xml index 1fd600813..db3cd69e3 100644 --- a/releng/p2/category.xml +++ b/releng/p2/category.xml @@ -1,69 +1,69 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/releng/p2/pom.xml b/releng/p2/pom.xml index 90baee050..a2f3bfaa3 100644 --- a/releng/p2/pom.xml +++ b/releng/p2/pom.xml @@ -8,7 +8,7 @@ org.eclipse.xtext xtext-core.releng - 2.11.0-SNAPSHOT + 2.11.1-SNAPSHOT .. diff --git a/releng/pom.xml b/releng/pom.xml index 980c2ba87..a6bbe0eb7 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -4,7 +4,7 @@ org.eclipse.xtext xtext-core.releng - 2.11.0-SNAPSHOT + 2.11.1-SNAPSHOT pom @@ -26,7 +26,11 @@ maven - http://services.typefox.io/open-source/jenkins/job/xtext-lib/job/release_2.11.0/lastStableBuild/artifact/build/maven-repository/ + http://services.typefox.io/open-source/jenkins/job/lsp4j/job/release_0.1.1/lastStableBuild/artifact/build/maven-repository/ + + + maven2 + http://services.typefox.io/open-source/jenkins/job/xtext-lib/job/maintenance_2.11/lastStableBuild/artifact/build/maven-repository/ @@ -34,122 +38,122 @@ org.eclipse.xtext org.eclipse.xtext - 2.11.0 + 2.11.1-SNAPSHOT org.eclipse.xtext org.eclipse.xtext - 2.11.0 + 2.11.1-SNAPSHOT sources org.eclipse.xtext org.eclipse.xtext.ide - 2.11.0 + 2.11.1-SNAPSHOT org.eclipse.xtext org.eclipse.xtext.ide - 2.11.0 + 2.11.1-SNAPSHOT sources org.eclipse.xtext org.eclipse.xtext.ide.tests - 2.11.0 + 2.11.1-SNAPSHOT org.eclipse.xtext org.eclipse.xtext.ide.tests - 2.11.0 + 2.11.1-SNAPSHOT sources org.eclipse.xtext org.eclipse.xtext.testing - 2.11.0 + 2.11.1-SNAPSHOT org.eclipse.xtext org.eclipse.xtext.testing - 2.11.0 + 2.11.1-SNAPSHOT sources org.eclipse.xtext org.eclipse.xtext.testlanguages - 2.11.0 + 2.11.1-SNAPSHOT org.eclipse.xtext org.eclipse.xtext.testlanguages - 2.11.0 + 2.11.1-SNAPSHOT sources org.eclipse.xtext org.eclipse.xtext.testlanguages.ide - 2.11.0 + 2.11.1-SNAPSHOT org.eclipse.xtext org.eclipse.xtext.testlanguages.ide - 2.11.0 + 2.11.1-SNAPSHOT sources org.eclipse.xtext org.eclipse.xtext.tests - 2.11.0 + 2.11.1-SNAPSHOT org.eclipse.xtext org.eclipse.xtext.tests - 2.11.0 + 2.11.1-SNAPSHOT sources org.eclipse.xtext org.eclipse.xtext.util - 2.11.0 + 2.11.1-SNAPSHOT org.eclipse.xtext org.eclipse.xtext.util - 2.11.0 + 2.11.1-SNAPSHOT sources org.eclipse.xtext org.eclipse.xtext.xtext.generator - 2.11.0 + 2.11.1-SNAPSHOT org.eclipse.xtext org.eclipse.xtext.xtext.generator - 2.11.0 + 2.11.1-SNAPSHOT sources org.eclipse.xtext org.eclipse.xtext.xtext.ide - 2.11.0 + 2.11.1-SNAPSHOT org.eclipse.xtext org.eclipse.xtext.xtext.ide - 2.11.0 + 2.11.1-SNAPSHOT sources org.eclipse.xtext org.eclipse.xtext.xtext.wizard - 2.11.0 + 2.11.1-SNAPSHOT org.eclipse.xtext org.eclipse.xtext.xtext.wizard - 2.11.0 + 2.11.1-SNAPSHOT sources @@ -177,7 +181,7 @@ org.eclipse.xtext xtext-core.target - 2.11.0-SNAPSHOT + 2.11.1-SNAPSHOT diff --git a/releng/releng-target/pom.xml b/releng/releng-target/pom.xml index 214eb1a02..5358b8ed5 100644 --- a/releng/releng-target/pom.xml +++ b/releng/releng-target/pom.xml @@ -8,7 +8,7 @@ org.eclipse.xtext xtext-core.releng - 2.11.0-SNAPSHOT + 2.11.1-SNAPSHOT .. diff --git a/releng/releng-target/xtext-core.target.target b/releng/releng-target/xtext-core.target.target index 5488b5d07..e2798dfaf 100644 --- a/releng/releng-target/xtext-core.target.target +++ b/releng/releng-target/xtext-core.target.target @@ -3,7 +3,7 @@ - + From 406cc6c7bda7ca3393c333917a4e161e66da07e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Spo=CC=88nemann?= Date: Wed, 1 Feb 2017 11:34:36 +0100 Subject: [PATCH 2/2] [build] Reverted target platform version --- releng/releng-target/xtext-core.target.target | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releng/releng-target/xtext-core.target.target b/releng/releng-target/xtext-core.target.target index e2798dfaf..5488b5d07 100644 --- a/releng/releng-target/xtext-core.target.target +++ b/releng/releng-target/xtext-core.target.target @@ -3,7 +3,7 @@ - +