diff --git a/gradle/bootstrap-setup.gradle b/gradle/bootstrap-setup.gradle index daf065a94..e12f92d23 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 = versions.xtext_bootstrap configurations { xtendCompiler { diff --git a/gradle/versions.gradle b/gradle/versions.gradle index c0dfb3ff9..f0d6496f2 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-SNAPSHOT' +version = '2.12.0-SNAPSHOT' 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/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF index de99ffd7a..7bacdd6ab 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.12.0.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..ef174435d 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.12.0.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..494da41e3 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.12.0.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..f77cb1269 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.12.0.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..e77175b21 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.12.0.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..70b91dc82 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.12.0.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..a80baf42c 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.12.0.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..fa64aef9d 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.12.0.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..700de05dc 100644 --- a/org.eclipse.xtext.xtext.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.ide/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ 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.12.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-Vendor: Eclipse Xtext diff --git a/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF index 0961a3c33..43f157f8b 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.12.0.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..5599b849d 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.12.0.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..437967307 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..db6fee3aa 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.12.0-SNAPSHOT .. diff --git a/releng/pom.xml b/releng/pom.xml index 4a58a3f6d..55e714e81 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -4,7 +4,7 @@ org.eclipse.xtext xtext-core.releng - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT pom @@ -26,10 +26,6 @@ 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/ @@ -38,122 +34,122 @@ org.eclipse.xtext org.eclipse.xtext - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT org.eclipse.xtext org.eclipse.xtext - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT sources org.eclipse.xtext org.eclipse.xtext.ide - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT org.eclipse.xtext org.eclipse.xtext.ide - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT sources org.eclipse.xtext org.eclipse.xtext.ide.tests - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT org.eclipse.xtext org.eclipse.xtext.ide.tests - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT sources org.eclipse.xtext org.eclipse.xtext.testing - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT org.eclipse.xtext org.eclipse.xtext.testing - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT sources org.eclipse.xtext org.eclipse.xtext.testlanguages - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT org.eclipse.xtext org.eclipse.xtext.testlanguages - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT sources org.eclipse.xtext org.eclipse.xtext.testlanguages.ide - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT org.eclipse.xtext org.eclipse.xtext.testlanguages.ide - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT sources org.eclipse.xtext org.eclipse.xtext.tests - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT org.eclipse.xtext org.eclipse.xtext.tests - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT sources org.eclipse.xtext org.eclipse.xtext.util - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT org.eclipse.xtext org.eclipse.xtext.util - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT sources org.eclipse.xtext org.eclipse.xtext.xtext.generator - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT org.eclipse.xtext org.eclipse.xtext.xtext.generator - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT sources org.eclipse.xtext org.eclipse.xtext.xtext.ide - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT org.eclipse.xtext org.eclipse.xtext.xtext.ide - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT sources org.eclipse.xtext org.eclipse.xtext.xtext.wizard - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT org.eclipse.xtext org.eclipse.xtext.xtext.wizard - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT sources @@ -181,7 +177,7 @@ org.eclipse.xtext xtext-core.target - 2.11.0-SNAPSHOT + 2.12.0-SNAPSHOT diff --git a/releng/releng-target/pom.xml b/releng/releng-target/pom.xml index 214eb1a02..6e149c49e 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.12.0-SNAPSHOT .. diff --git a/releng/releng-target/xtext-core.target.target b/releng/releng-target/xtext-core.target.target index 5488b5d07..b15b69bd8 100644 --- a/releng/releng-target/xtext-core.target.target +++ b/releng/releng-target/xtext-core.target.target @@ -3,7 +3,7 @@ - +