From afa6e742ae96e265180840e243274b3ca228d252 Mon Sep 17 00:00:00 2001
From: Tim Ward <timothyjward@apache.org>
Date: Tue, 3 Sep 2019 12:32:38 +0100
Subject: [PATCH] Apply manifest entries to all packages in the jar

Remove the name section so that all packages pick up the metadata in the manifest

Signed-off-by: Tim Ward <timothyjward@apache.org>
---
 pom.xml | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index ce2621e35..fe54286ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,26 +173,16 @@
             <manifest>
               <mainClass>org.bytedeco.javacpp.tools.Builder</mainClass>
             </manifest>
-            <!-- Multi-Release: true goes in the main attributes -->
+            
             <manifestEntries>
+              <Implementation-Title>${project.name}</Implementation-Title>
+              <Implementation-Vendor>Bytedeco</Implementation-Vendor>
+              <Implementation-Version>${project.version}</Implementation-Version>
+              <Specification-Title>${project.name}</Specification-Title>
+              <Specification-Vendor>Bytedeco</Specification-Vendor>
+              <Specification-Version>${project.version}</Specification-Version>
               <Multi-Release>true</Multi-Release>
             </manifestEntries>
-            <!-- 
-              We must use a Manifest Section here so that the
-              maven-jar-plugin merges the manifest metadata
-              correctly rather than jumbling things up
-            -->
-            <manifestSection>
-              <name>org/bytedeco/javacpp/</name>
-              <manifestEntries>
-                <Implementation-Title>${project.name}</Implementation-Title>
-                <Implementation-Vendor>Bytedeco</Implementation-Vendor>
-                <Implementation-Version>${project.version}</Implementation-Version>
-                <Specification-Title>${project.name}</Specification-Title>
-                <Specification-Vendor>Bytedeco</Specification-Vendor>
-                <Specification-Version>${project.version}</Specification-Version>
-              </manifestEntries>
-            </manifestSection>
           </archive>
         </configuration>
       </plugin>