Merge pull request #452 from xtext/cd-bump-asm-971

bump asm 971 + regen projects
xtext · Oct 17, 2024 · 59a1e50 · 59a1e50
2 parents a53ea18 + a2830fc
commit 59a1e50
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 145 deletions.
diff --git a/domainmodel/2.37.0/org.eclipse.xtext.example.domainmodel.releng/feature/pom.xml b/domainmodel/2.37.0/org.eclipse.xtext.example.domainmodel.releng/feature/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>

diff --git a/domainmodel/2.37.0/org.eclipse.xtext.example.domainmodel.releng/pom.xml b/domainmodel/2.37.0/org.eclipse.xtext.example.domainmodel.releng/pom.xml
@@ -18,8 +18,8 @@
 	</dependencyManagement>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<!-- although this example and the Xtext dependencies work and compile with 
-		Java 8 you need to execute the Maven build with Java 11 as parts of Eclipse 
+		<!-- although this example and the Xtext dependencies work and compile with
+		Java 8 you need to execute the Maven build with Java 11 as parts of Eclipse
 		2020-09+ require Java 11 -->
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
@@ -174,60 +174,7 @@
 					<version>3.3.0</version>
 				</plugin>
 				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											org.apache.maven.plugins
-										</groupId>
-										<artifactId>
-											maven-resources-plugin
-										</artifactId>
-										<versionRange>
-											[2.4.3,)
-										</versionRange>
-										<goals>
-											<goal>resources</goal>
-											<goal>testResources</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											org.codehaus.mojo
-										</groupId>
-										<artifactId>
-											build-helper-maven-plugin
-										</artifactId>
-										<versionRange>
-											[1.9.1,)
-										</versionRange>
-										<goals>
-											<goal>add-resource</goal>
-											<goal>add-source</goal>
-											<goal>add-test-resource</goal>
-											<goal>add-test-source</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-				<plugin>
-					<!-- 
+					<!--
 						Can be removed after first generator execution
 						https://bugs.eclipse.org/bugs/show_bug.cgi?id=480097
 					-->
@@ -263,7 +210,7 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</repository>
-		<!-- This must be disabled explicitly, otherwise it is enabled by https://github.com/mojohaus/mojo-parent 
+		<!-- This must be disabled explicitly, otherwise it is enabled by https://github.com/mojohaus/mojo-parent
 			which is taken from exec-maven-plugin from at least version 1.6.0 -->
 		<repository>
 			<id>ossrh-snapshots</id>
@@ -276,7 +223,7 @@
 			</snapshots>
 			<url>http://oss.sonatype.org/content/repositories/snapshots</url>
 		</repository>
-		<!-- This is enabled by /org/sonatype/oss/oss-parent/7 used as parent by 
+		<!-- This is enabled by /org/sonatype/oss/oss-parent/7 used as parent by
 			org/xtext/antlr-generator/3.2.1 -->
 		<repository>
 			<id>sonatype-nexus-snapshots</id>

diff --git a/domainmodel/2.37.0/org.eclipse.xtext.example.domainmodel.releng/repository/pom.xml b/domainmodel/2.37.0/org.eclipse.xtext.example.domainmodel.releng/repository/pom.xml
@@ -1,5 +1,5 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>

diff --git a/domainmodel/2.37.0/org.eclipse.xtext.example.domainmodel.tests/META-INF/MANIFEST.MF b/domainmodel/2.37.0/org.eclipse.xtext.example.domainmodel.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.xtext.example.domainmodel,
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
  org.eclipse.xtext.xbase.testing,
- org.objectweb.asm;bundle-version="[9.7.0,9.8.0)";resolution:=optional
+ org.objectweb.asm;bundle-version="[9.7.1,9.8.0)";resolution:=optional
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.xtext.example.domainmodel.tests;x-internal=true
 Import-Package: org.hamcrest.core,

diff --git a/domainmodel/2.37.0/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF b/domainmodel/2.37.0/org.eclipse.xtext.example.domainmodel/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  org.eclipse.xtext.common.types,
  org.eclipse.xtext.xbase,
  org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
- org.objectweb.asm;bundle-version="[9.7.0,9.8.0)";resolution:=optional
+ org.objectweb.asm;bundle-version="[9.7.1,9.8.0)";resolution:=optional
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.xtext.example.domainmodel,
  org.eclipse.xtext.example.domainmodel.domainmodel,

diff --git a/domainmodel/2.37.0/org.eclipse.xtext.example.domainmodel/build.properties b/domainmodel/2.37.0/org.eclipse.xtext.example.domainmodel/build.properties
@@ -7,13 +7,4 @@ bin.includes = model/generated/,\
                plugin.xml,\
                about.html,\
                model/
-additional.bundles = org.eclipse.xtext.xbase,\
-                     org.eclipse.xtext.common.types,\
-                     org.eclipse.xtext.xtext.generator,\
-                     org.eclipse.emf.codegen.ecore,\
-                     org.eclipse.emf.mwe.utils,\
-                     org.eclipse.emf.mwe2.launch,\
-                     org.eclipse.emf.mwe2.lib,\
-                     org.objectweb.asm,\
-                     org.apache.commons.commons-logging,\
-                     org.apache.log4j
+additional.bundles = org.eclipse.xtext.xtext.generator.dependencies
diff --git a/domainmodel/2.37.0/org.eclipse.xtext.example.domainmodel/pom.xml b/domainmodel/2.37.0/org.eclipse.xtext.example.domainmodel/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<artifactId>org.eclipse.xtext.example.domainmodel</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	
+
 	<properties>
 		<mwe2Version>2.19.0</mwe2Version>
 	</properties>
@@ -22,6 +22,7 @@
 				<version>3.0.0</version>
 				<executions>
 					<execution>
+						<?m2e ignore?>
 						<id>mwe2Launcher</id>
 						<phase>generate-sources</phase>
 						<goals>
@@ -52,7 +53,7 @@
 				<groupId>org.eclipse.xtend</groupId>
 				<artifactId>xtend-maven-plugin</artifactId>
 			</plugin>
-	
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-clean-plugin</artifactId>
@@ -95,40 +96,6 @@
 				</configuration>
 			</plugin>
 		</plugins>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											org.codehaus.mojo
-										</groupId>
-										<artifactId>
-											exec-maven-plugin
-										</artifactId>
-										<versionRange>
-											[1.2.1,)
-										</versionRange>
-										<goals>
-											<goal>java</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore></ignore>
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 	</build>
 
 </project>
diff --git a/...ngs-tycho/2.37.0-J11/org.xtext.example.mydsl.target/org.xtext.example.mydsl.target.target b/...ngs-tycho/2.37.0-J11/org.xtext.example.mydsl.target/org.xtext.example.mydsl.target.target
@@ -39,7 +39,7 @@
 			<unit id="junit-platform-suite-commons" version="0.0.0"/>
 			<unit id="junit-vintage-engine" version="0.0.0"/>
 			<unit id="org.opentest4j" version="0.0.0"/>
-			<unit id="org.objectweb.asm" version="9.7.0"/>
+			<unit id="org.objectweb.asm" version="9.7.1"/>
 			<unit id="io.github.classgraph.classgraph" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12"/>
 		</location>

diff --git a/greetings-tycho/2.37.0-J11/org.xtext.example.mydsl/build.properties b/greetings-tycho/2.37.0-J11/org.xtext.example.mydsl/build.properties
@@ -6,13 +6,4 @@ bin.includes = .,\
                plugin.xml
 bin.excludes = **/*.mwe2,\
                **/*.xtend
-additional.bundles = org.eclipse.xtext.xbase,\
-                     org.eclipse.xtext.common.types,\
-                     org.eclipse.xtext.xtext.generator,\
-                     org.eclipse.emf.codegen.ecore,\
-                     org.eclipse.emf.mwe.utils,\
-                     org.eclipse.emf.mwe2.launch,\
-                     org.eclipse.emf.mwe2.lib,\
-                     org.objectweb.asm,\
-                     org.apache.commons.commons-logging,\
-                     org.apache.log4j
+additional.bundles = org.eclipse.xtext.xtext.generator.dependencies
diff --git a/...ngs-tycho/2.37.0-J21/org.xtext.example.mydsl.target/org.xtext.example.mydsl.target.target b/...ngs-tycho/2.37.0-J21/org.xtext.example.mydsl.target/org.xtext.example.mydsl.target.target
@@ -39,7 +39,7 @@
 			<unit id="junit-platform-suite-commons" version="0.0.0"/>
 			<unit id="junit-vintage-engine" version="0.0.0"/>
 			<unit id="org.opentest4j" version="0.0.0"/>
-			<unit id="org.objectweb.asm" version="9.7.0"/>
+			<unit id="org.objectweb.asm" version="9.7.1"/>
 			<unit id="io.github.classgraph.classgraph" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12"/>
 		</location>

diff --git a/greetings-tycho/2.37.0-J21/org.xtext.example.mydsl/build.properties b/greetings-tycho/2.37.0-J21/org.xtext.example.mydsl/build.properties
@@ -6,13 +6,4 @@ bin.includes = .,\
                plugin.xml
 bin.excludes = **/*.mwe2,\
                **/*.xtend
-additional.bundles = org.eclipse.xtext.xbase,\
-                     org.eclipse.xtext.common.types,\
-                     org.eclipse.xtext.xtext.generator,\
-                     org.eclipse.emf.codegen.ecore,\
-                     org.eclipse.emf.mwe.utils,\
-                     org.eclipse.emf.mwe2.launch,\
-                     org.eclipse.emf.mwe2.lib,\
-                     org.objectweb.asm,\
-                     org.apache.commons.commons-logging,\
-                     org.apache.log4j
+additional.bundles = org.eclipse.xtext.xtext.generator.dependencies
diff --git a/greetings-tycho/2.37.0/org.xtext.example.mydsl.target/org.xtext.example.mydsl.target.target b/greetings-tycho/2.37.0/org.xtext.example.mydsl.target/org.xtext.example.mydsl.target.target
@@ -39,7 +39,7 @@
 			<unit id="junit-platform-suite-commons" version="0.0.0"/>
 			<unit id="junit-vintage-engine" version="0.0.0"/>
 			<unit id="org.opentest4j" version="0.0.0"/>
-			<unit id="org.objectweb.asm" version="9.7.0"/>
+			<unit id="org.objectweb.asm" version="9.7.1"/>
 			<unit id="io.github.classgraph.classgraph" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12"/>
 		</location>

diff --git a/greetings-tycho/2.37.0/org.xtext.example.mydsl/build.properties b/greetings-tycho/2.37.0/org.xtext.example.mydsl/build.properties
@@ -6,13 +6,4 @@ bin.includes = .,\
                plugin.xml
 bin.excludes = **/*.mwe2,\
                **/*.xtend
-additional.bundles = org.eclipse.xtext.xbase,\
-                     org.eclipse.xtext.common.types,\
-                     org.eclipse.xtext.xtext.generator,\
-                     org.eclipse.emf.codegen.ecore,\
-                     org.eclipse.emf.mwe.utils,\
-                     org.eclipse.emf.mwe2.launch,\
-                     org.eclipse.emf.mwe2.lib,\
-                     org.objectweb.asm,\
-                     org.apache.commons.commons-logging,\
-                     org.apache.log4j
+additional.bundles = org.eclipse.xtext.xtext.generator.dependencies
diff --git a/...rg.eclipse.xtext.integrationtests.target/org.eclipse.xtext.integrationtests.target.target b/...rg.eclipse.xtext.integrationtests.target/org.eclipse.xtext.integrationtests.target.target
@@ -52,10 +52,10 @@
 		<unit id="junit-platform-runner" version="0.0.0"/>
 		<unit id="org.opentest4j" version="1.3.0"/>
 		<unit id="org.opentest4j.source" version="1.3.0"/>
-		<unit id="org.objectweb.asm" version="9.7.0"/>
-		<unit id="org.objectweb.asm.source" version="9.7.0"/>
-		<unit id="org.objectweb.asm.tree" version="9.7.0"/>
-		<unit id="org.objectweb.asm.tree.source" version="9.7.0"/>
+		<unit id="org.objectweb.asm" version="9.7.1"/>
+		<unit id="org.objectweb.asm.source" version="9.7.1"/>
+		<unit id="org.objectweb.asm.tree" version="9.7.1"/>
+		<unit id="org.objectweb.asm.tree.source" version="9.7.1"/>
 		<unit id="slf4j.api" version="0.0.0" />
 		<unit id="slf4j.simple" version="0.0.0" />
 		<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12"/>

diff --git a/integrationtests/org.eclipse.xtext.swtbot.testing/META-INF/MANIFEST.MF b/integrationtests/org.eclipse.xtext.swtbot.testing/META-INF/MANIFEST.MF
@@ -28,10 +28,12 @@ Require-Bundle: org.eclipse.swtbot.eclipse.core;bundle-version="2.1.1",
  org.eclipse.xtext.xtext.ui,
  org.eclipse.xtext.xtext.ui.examples,
  org.eclipse.xtext.xbase,
+ org.eclipse.xtext.jdt.facade,
  org.eclipse.xtext.purexbase.ui,
  org.eclipse.xtend.ide,
  org.eclipse.xtend.examples,
  org.eclipse.xtext.xtext.generator,
+ org.eclipse.xtext.xtext.generator.dependencies,
  org.eclipse.m2e.core.ui,
  org.eclipse.m2e.launching,
  org.eclipse.emf.mwe.utils,