Extract the commons-cli from the embedded runtime and use it as a bundle

Author: laeubi

m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml

@@ -19,7 +19,7 @@
 	</parent>
 
 	<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
-	<version>3.8.700-SNAPSHOT</version>
+	<version>3.8.701-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>M2E Embedded Maven Runtime (includes Incubating components)</name>
@@ -61,6 +61,12 @@
 		<dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-embedder</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-cli</groupId>
+					<artifactId>commons-cli</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven</groupId>
@@ -174,7 +180,8 @@
 								org.slf4j.spi;version="[1.7.31,3.0.0)",\
 								org.slf4j.helpers;version="[1.7.31,3.0.0)",\
 								javax.inject;version="1.0.0",\
-								javax.annotation;version="[1.2.0,2.0.0)"
+								javax.annotation;version="[1.2.0,2.0.0)", \
+								org.apache.commons.cli;version="[1.4.0,2.0.0)"
 							Require-Bundle: \
 								com.google.guava
 						]]></bnd>

pom.xml

@@ -102,7 +102,7 @@
 		<dependency>
 			<groupId>org.eclipse.m2e</groupId>
 			<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
-			<version>3.8.700-SNAPSHOT</version>
+			<version>3.8.701-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 

target-platform/target-platform.target

@@ -97,6 +97,12 @@
 					<version>31.1-jre</version>
 					<type>jar</type>
 				</dependency>
+				<dependency>
+					<groupId>commons-cli</groupId>
+					<artifactId>commons-cli</artifactId>
+					<version>1.4</version>
+					<type>jar</type>
+				</dependency>
 				<dependency>
 					<groupId>io.takari.m2e.workspace</groupId>
 					<artifactId>org.eclipse.m2e.workspace.cli</artifactId>