More adjustments for bogus xtext.logging version

Signed-off-by: Sebastian Zarnekow <sebastian.zarnekow@gmail.com>
eclipse-xtext · Jan 7, 2024 · 4730b8b · 4730b8b
1 parent a31ce7e
commit 4730b8b
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 17 deletions.
diff --git a/org.eclipse.xtext.logging/pom.xml b/org.eclipse.xtext.logging/pom.xml
@@ -9,13 +9,6 @@
 	</parent>
 	<packaging>eclipse-plugin</packaging>
 	<artifactId>org.eclipse.xtext.logging</artifactId>
-	<version>1.2.24-SNAPSHOT</version>
-
-	<properties>
-		<!-- redefines the property for versions of artifacts not in this Git repository,
-			so that it takes the same snapshot version of this project's parent'. -->
-		<xtext-dev-bom-version>${project.parent.version}</xtext-dev-bom-version>
-	</properties>
 
 	<build>
 		<plugins>

diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml
@@ -115,7 +115,7 @@
 							<requirement>
 								<type>eclipse-plugin</type>
 								<id>org.eclipse.xtext.logging</id>
-								<versionRange>1.2.24</versionRange>
+								<versionRange>${xtextVersion}</versionRange>
 							</requirement>
 							<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
 								platform is Luna or later. (backward compatible with kepler and previous

diff --git a/...e.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml b/...e.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml
@@ -79,7 +79,7 @@
 							<requirement>
 								<type>eclipse-plugin</type>
 								<id>org.eclipse.xtext.logging</id>
-								<versionRange>1.2.24</versionRange>
+								<versionRange>${xtextVersion}</versionRange>
 							</requirement>
 							<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
 								platform is Luna or later. (backward compatible with kepler and previous

diff --git a/...t.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml b/...t.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml
@@ -79,7 +79,7 @@
 							<requirement>
 								<type>eclipse-plugin</type>
 								<id>org.eclipse.xtext.logging</id>
-								<versionRange>1.2.24</versionRange>
+								<versionRange>${xtextVersion}</versionRange>
 							</requirement>
 							<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
 								platform is Luna or later. (backward compatible with kepler and previous

diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml
@@ -82,7 +82,7 @@
 							<requirement>
 								<type>eclipse-plugin</type>
 								<id>org.eclipse.xtext.logging</id>
-								<versionRange>1.2.24</versionRange>
+								<versionRange>${xtextVersion}</versionRange>
 							</requirement>
 							<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
 								platform is Luna or later. (backward compatible with kepler and previous

diff --git a/...lipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/pom.xml b/...lipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/pom.xml
@@ -82,7 +82,7 @@
 							<requirement>
 								<type>eclipse-plugin</type>
 								<id>org.eclipse.xtext.logging</id>
-								<versionRange>1.2.24</versionRange>
+								<versionRange>${xtextVersion}</versionRange>
 							</requirement>
 							<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
 								platform is Luna or later. (backward compatible with kepler and previous

diff --git a/...eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml b/...eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml
@@ -117,7 +117,7 @@
 							<requirement>
 								<type>eclipse-plugin</type>
 								<id>org.eclipse.xtext.logging</id>
-								<versionRange>1.2.24</versionRange>
+								<versionRange>${xtextVersion}</versionRange>
 							</requirement>
 							<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
 								platform is Luna or later. (backward compatible with kepler and previous

diff --git a/...e.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/pom.xml b/...e.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/pom.xml
@@ -117,7 +117,7 @@
 							<requirement>
 								<type>eclipse-plugin</type>
 								<id>org.eclipse.xtext.logging</id>
-								<versionRange>1.2.24</versionRange>
+								<versionRange>${xtextVersion}</versionRange>
 							</requirement>
 							<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
 								platform is Luna or later. (backward compatible with kepler and previous

diff --git a/...ext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/pom.xml b/...ext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/pom.xml
@@ -104,7 +104,7 @@
 							<requirement>
 								<type>eclipse-plugin</type>
 								<id>org.eclipse.xtext.logging</id>
-								<versionRange>1.2.24</versionRange>
+								<versionRange>${xtextVersion}</versionRange>
 							</requirement>
 						</extraRequirements>
 					</dependency-resolution>

diff --git a/...lipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend b/...lipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend
@@ -327,7 +327,7 @@ class ParentProjectDescriptor extends ProjectDescriptor {
 											<requirement>
 												<type>eclipse-plugin</type>
 												<id>org.eclipse.xtext.logging</id>
-												<versionRange>1.2.24</versionRange>
+												<versionRange>${xtextVersion}</versionRange>
 											</requirement>
 											<!-- to get the org.eclipse.osgi.compatibility.state plugin if the target
 												platform is Luna or later. (backward compatible with kepler and previous

diff --git a/....xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java b/....xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java
@@ -1002,7 +1002,7 @@ public PomFile pom() {
           _builder.newLine();
           _builder.append("\t");
           _builder.append("\t\t\t\t\t\t");
-          _builder.append("<versionRange>1.2.24</versionRange>");
+          _builder.append("<versionRange>${xtextVersion}</versionRange>");
           _builder.newLine();
           _builder.append("\t");
           _builder.append("\t\t\t\t\t");