160: Cleaner Xtext generation and dependencies

Task-Url: #160
eclipse · Jun 20, 2022 · b1eba94 · b1eba94
1 parent e8411bb
commit b1eba94
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 46 deletions.
diff --git a/plugins/org.eclipse.xsemantics.dsl/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsemantics.dsl/META-INF/MANIFEST.MF
@@ -6,25 +6,17 @@ Bundle-Version: 1.21.0.qualifier
 Bundle-ClassPath: .
 Bundle-SymbolicName: org.eclipse.xsemantics.dsl;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext;visibility:=reexport,
- org.eclipse.xtext.xbase;visibility:=reexport,
- org.eclipse.emf.codegen.ecore;bundle-version="2.7.0";resolution:=optional,
- org.eclipse.emf.mwe.utils;resolution:=optional,
- org.eclipse.emf.mwe2.launch;resolution:=optional,
+Require-Bundle: org.eclipse.xtext,
+ org.eclipse.xtext.xbase,
+ org.eclipse.equinox.common;bundle-version="3.5.0",
+ org.eclipse.emf.ecore,
+ org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
  org.eclipse.xtext.util,
- org.eclipse.core.runtime;bundle-version="3.5.0",
- org.eclipse.emf.ecore;bundle-version="2.7.0";visibility:=reexport,
- org.eclipse.emf.common;bundle-version="2.7.0",
+ org.eclipse.emf.common,
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  org.eclipse.xtext.common.types,
  org.eclipse.xsemantics.runtime;visibility:=reexport,
- org.eclipse.xtext.xbase.lib;bundle-version="2.14.0";visibility:=reexport,
- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
- org.eclipse.xtext.ecore,
- org.objectweb.asm;bundle-version="9.1.0";visibility:=reexport,
- org.eclipse.xtend.lib;bundle-version="2.13.0",
- org.eclipse.xtext.xtext.generator;bundle-version="2.27.0",
- org.eclipse.emf.mwe2.lib;bundle-version="2.13.0"
+ org.objectweb.asm;bundle-version="9.3.0";visibility:=reexport
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.xsemantics.dsl,

diff --git a/plugins/org.eclipse.xsemantics.dsl/build.properties b/plugins/org.eclipse.xsemantics.dsl/build.properties
@@ -7,6 +7,17 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                model/
-output.. = bin/
 bin.excludes = **/*.xtend,\
                **/*._trace
+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.logging,\
+                     org.apache.log4j,\
+                     com.ibm.icu,\
+                     de.itemis.xtext.antlr
diff --git a/plugins/org.eclipse.xsemantics.dsl/pom.xml b/plugins/org.eclipse.xsemantics.dsl/pom.xml
@@ -38,7 +38,6 @@ Contributors:
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
-				<version>1.4.0</version>
 				<executions>
 					<execution>
 						<id>generateEMFModel</id>
@@ -77,40 +76,11 @@ Contributors:
 						</configuration>
 					</execution>
 				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>org.eclipse.emf</groupId>
-						<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
-						<version>${mwe2Version}</version>
-					</dependency>
-					<dependency>
-						<groupId>org.eclipse.xtext</groupId>
-						<artifactId>org.eclipse.xtext.common.types</artifactId>
-						<version>${xtextVersion}</version>
-					</dependency>
-					<dependency>
-						<groupId>org.eclipse.xtext</groupId>
-						<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
-						<version>${xtextVersion}</version>
-					</dependency>
-					<dependency>
-						<groupId>org.eclipse.xtext</groupId>
-						<artifactId>org.eclipse.xtext.xbase</artifactId>
-						<version>${xtextVersion}</version>
-					</dependency>
-					<dependency>
-						<groupId>org.eclipse.xtext</groupId>
-						<artifactId>xtext-antlr-generator</artifactId>
-						<version>2.1.1</version>
-					</dependency>
-				</dependencies>
 			</plugin>
-
 			<plugin>
 				<groupId>org.eclipse.xtend</groupId>
 				<artifactId>xtend-maven-plugin</artifactId>
 			</plugin>
-
 		</plugins>
 	</build>
 

diff --git a/releng/org.eclipse.xsemantics.parent/pom.xml b/releng/org.eclipse.xsemantics.parent/pom.xml
@@ -366,6 +366,11 @@ Contributors:
 	<build>
 		<pluginManagement>
 			<plugins>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>exec-maven-plugin</artifactId>
+					<version>3.0.0</version>
+				</plugin>
 				<plugin>
 					<groupId>org.eclipse.xtend</groupId>
 					<artifactId>xtend-maven-plugin</artifactId>