You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2021/04/11 12:34:13 UTC

svn commit: r1888622 - in /pdfbox/trunk: fontbox/pom.xml pdfbox/pom.xml xmpbox/pom.xml

Author: lehmi
Date: Sun Apr 11 12:34:13 2021
New Revision: 1888622

URL: http://svn.apache.org/viewvc?rev=1888622&view=rev
Log:
PDFBOX-5159: move the configuration of Automatic-Module-Name from maven-jar-plugin to maven-bundle-plugin

Modified:
    pdfbox/trunk/fontbox/pom.xml
    pdfbox/trunk/pdfbox/pom.xml
    pdfbox/trunk/xmpbox/pom.xml

Modified: pdfbox/trunk/fontbox/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/pom.xml?rev=1888622&r1=1888621&r2=1888622&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/pom.xml (original)
+++ pdfbox/trunk/fontbox/pom.xml Sun Apr 11 12:34:13 2021
@@ -54,6 +54,11 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
+        <configuration>
+            <instructions>
+                <Automatic-Module-Name>org.apache.fontbox</Automatic-Module-Name>
+            </instructions>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.rat</groupId>
@@ -66,18 +71,6 @@
             </excludes>
         </configuration>
       </plugin>
-      <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <configuration>
-              <archive>
-                  <manifestEntries>
-                      <Automatic-Module-Name>org.apache.fontbox</Automatic-Module-Name>
-                  </manifestEntries>
-              </archive>
-          </configuration>
-      </plugin>
-
       <!-- download test files from JIRA and keep them in repository cache -->
       <plugin>
           <groupId>com.googlecode.maven-download-plugin</groupId>

Modified: pdfbox/trunk/pdfbox/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/pom.xml?rev=1888622&r1=1888621&r2=1888622&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/pom.xml (original)
+++ pdfbox/trunk/pdfbox/pom.xml Sun Apr 11 12:34:13 2021
@@ -131,6 +131,7 @@
                             META-INF=target/maven-shared-archive-resources/META-INF,
                             org/apache/pdfbox/resources=target/classes/org/apache/pdfbox/resources
                         </Include-Resource>
+                        <Automatic-Module-Name>org.apache.pdfbox</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>
@@ -179,18 +180,6 @@
                     <serverId>pdfbox-site</serverId>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Automatic-Module-Name>org.apache.pdfbox</Automatic-Module-Name>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-
             <!-- PDFBOX-3974: download test files from JIRA and keep them in repository cache -->
             <plugin>
                 <groupId>com.googlecode.maven-download-plugin</groupId>

Modified: pdfbox/trunk/xmpbox/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/pom.xml?rev=1888622&r1=1888621&r2=1888622&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/pom.xml (original)
+++ pdfbox/trunk/xmpbox/pom.xml Sun Apr 11 12:34:13 2021
@@ -48,6 +48,11 @@
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
 				<extensions>true</extensions>
+				<configuration>
+		          <instructions>
+		              <Automatic-Module-Name>org.apache.xmpbox</Automatic-Module-Name>
+		          </instructions>
+                </configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -57,17 +62,6 @@
 					<configLocation>../pdfbox-checkstyle-5.xml</configLocation>
 				</configuration>
 			</plugin>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-jar-plugin</artifactId>
-                            <configuration>
-                                <archive>
-                                    <manifestEntries>
-                                        <Automatic-Module-Name>org.apache.xmpbox</Automatic-Module-Name>
-                                    </manifestEntries>
-                                </archive>
-                            </configuration>
-                        </plugin>
 		</plugins>
 	</build>