Merge pull request #437 from eclipse/fix-multi-release

Added support for multi release
eclipse · Sep 24, 2020 · bdd2099 · bdd2099
2 parents 8f9ebbc + 32b0bd6
commit bdd2099
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/cli-scanner/pom.xml b/cli-scanner/pom.xml
@@ -151,7 +151,6 @@
 										<Implementation-Title>${project.name}</Implementation-Title>
 										<Implementation-Version>${project.version}</Implementation-Version>
 			                            				<Implementation-Vendor-Id>${project.groupId}</Implementation-Vendor-Id>
-										<Multi-Release>true</Multi-Release>
 									</manifestEntries>
 								</transformer>
 							</transformers>

diff --git a/kb-importer/pom.xml b/kb-importer/pom.xml
@@ -115,7 +115,6 @@
 									<manifestEntries>
 										<Main-Class>org.eclipse.steady.kb.Main</Main-Class>
 										<Implementation-Version>${project.version}</Implementation-Version>
-									        <Multi-Release>true</Multi-Release>
 									</manifestEntries>
 								</transformer>
 							</transformers>

diff --git a/patch-analyzer/pom.xml b/patch-analyzer/pom.xml
@@ -105,7 +105,6 @@
 									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
 									<manifestEntries>
 										<Main-Class>org.eclipse.steady.patcha.PatchAnalyzer</Main-Class>
-										<Multi-Release>true</Multi-Release>
 									</manifestEntries>
 								</transformer>
 							</transformers>

diff --git a/patch-lib-analyzer/pom.xml b/patch-lib-analyzer/pom.xml
@@ -84,7 +84,6 @@
 						</manifest>
 						<manifestEntries>
 							<Main-Class>org.eclipse.steady.patcheval.Main</Main-Class>
-							<Multi-Release>true</Multi-Release>
 						</manifestEntries>
 						<addMavenDescriptor>false</addMavenDescriptor>
 					</archive>

diff --git a/pom.xml b/pom.xml
@@ -387,7 +387,18 @@
 
 	<build>
 		<plugins>
-
+			<!-- Add support for multi release jar. This change is done for log4j, as new log4j supports multi release jar --> 
+			<plugin>
+			    <groupId>org.apache.maven.plugins</groupId>
+			    <artifactId>maven-jar-plugin</artifactId>
+			    <configuration>
+				<archive>
+				    <manifestEntries>
+					<Multi-Release>true</Multi-Release>
+				    </manifestEntries>
+				</archive>
+			    </configuration>
+			</plugin>
 			<!-- Show whether there are newer versions available, run fully-qualified
 				with 'mvn -DallowMajorUpdates=false -DprocessDependencyManagement=false org.codehaus.mojo:versions-maven-plugin:2.7:display-dependency-updates' -->
 			<plugin>