use maven-bundle-plugin with extensions=true

To avoid classloading problems and API incompatibility when running in a Tycho build. see #2914
eclipse-xtext · Jan 19, 2024 · 3203ee5 · 3203ee5
1 parent a1c6d7d
commit 3203ee5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 30 deletions.
diff --git a/org.eclipse.xtext.web.servlet/pom.xml b/org.eclipse.xtext.web.servlet/pom.xml
@@ -43,16 +43,6 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>5.1.8</version>
-				<executions>
-					<execution>
-						<id>bundle-manifest</id>
-						<phase>process-classes</phase>
-						<goals>
-							<goal>manifest</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/org.eclipse.xtext.web/pom.xml b/org.eclipse.xtext.web/pom.xml
@@ -166,16 +166,6 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>5.1.8</version>
-				<executions>
-					<execution>
-						<id>bundle-manifest</id>
-						<phase>process-classes</phase>
-						<goals>
-							<goal>manifest</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

diff --git a/org.eclipse.xtext.xbase.web/pom.xml b/org.eclipse.xtext.xbase.web/pom.xml
@@ -83,16 +83,6 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>5.1.8</version>
-				<executions>
-					<execution>
-						<id>bundle-manifest</id>
-						<phase>process-classes</phase>
-						<goals>
-							<goal>manifest</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

diff --git a/pom.xml b/pom.xml
@@ -549,6 +549,24 @@
 						</filesets>
 					</configuration>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.felix</groupId>
+					<artifactId>maven-bundle-plugin</artifactId>
+					<!-- extensions is crucial to avoid classloading problems
+						and API incompatibility when running in a Tycho build.
+						see https://github.com/eclipse/xtext/issues/2914 -->
+					<extensions>true</extensions>
+					<version>5.1.9</version>
+					<executions>
+						<execution>
+							<id>bundle-manifest</id>
+							<phase>process-classes</phase>
+							<goals>
+								<goal>manifest</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>