PDFBOX-5699: move most of the dependencies from parent to subprojects

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1914172 13f79535-47bb-0310-9956-ffa450edef68
apache · Nov 28, 2023 · f308e7b · f308e7b
1 parent 3c15341
commit f308e7b
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 57 deletions.
diff --git a/app/pom.xml b/app/pom.xml
@@ -42,21 +42,25 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk18on</artifactId>
+      <version>${bouncycastle.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk18on</artifactId>
+      <version>${bouncycastle.version}</version>
       <scope>provided</scope>
     </dependency>
      <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
+      <version>${commons-io.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.pdfbox</groupId>
       <artifactId>jbig2-imageio</artifactId>
+      <version>${jbig2.version}</version>
       <scope>provided</scope>
     </dependency> 
   </dependencies>
@@ -75,7 +79,7 @@
             <Bundle-DocURL>${project.url}</Bundle-DocURL>
             <Import-Package>!org.junit.jupiter,javax.*;resolution:=optional,org.apache.avalon.framework.logger;resolution:=optional,org.apache.log;resolution:=optional,*</Import-Package>
             <Main-Class>org.apache.pdfbox.tools.PDFBox</Main-Class>
-          </instructions>
+            </instructions>
         </configuration>
       </plugin>
     </plugins>

diff --git a/debugger-app/pom.xml b/debugger-app/pom.xml
@@ -47,16 +47,19 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk18on</artifactId>
+      <version>${bouncycastle.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk18on</artifactId>
+      <version>${bouncycastle.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.pdfbox</groupId>
       <artifactId>jbig2-imageio</artifactId>
+      <version>${jbig2.version}</version>
       <scope>provided</scope>
     </dependency> 
   </dependencies>

diff --git a/debugger/pom.xml b/debugger/pom.xml
@@ -46,6 +46,7 @@
     <dependency>
       <groupId>info.picocli</groupId>
       <artifactId>picocli</artifactId>
+      <version>${picocli.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
@@ -59,6 +60,7 @@
     <dependency>
         <groupId>org.apache.pdfbox</groupId>
         <artifactId>jbig2-imageio</artifactId>
+        <version>${jbig2.version}</version>
         <scope>test</scope>
     </dependency>
     <!-- For legal reasons (incompatible license), these two dependencies 
@@ -67,11 +69,13 @@
     <dependency>
         <groupId>com.github.jai-imageio</groupId>
         <artifactId>jai-imageio-core</artifactId>
+        <version>${jai.version}</version>
         <scope>test</scope>
     </dependency>    
     <dependency>
         <groupId>com.github.jai-imageio</groupId>
         <artifactId>jai-imageio-jpeg2000</artifactId>
+        <version>${jai.version}</version>
         <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -45,10 +45,12 @@
       <dependency>
         <groupId>org.bouncycastle</groupId>
         <artifactId>bcprov-jdk18on</artifactId>
+        <version>${bouncycastle.version}</version>
     </dependency>
     <dependency>
         <groupId>org.bouncycastle</groupId>
         <artifactId>bcpkix-jdk18on</artifactId>
+        <version>${bouncycastle.version}</version>
     </dependency>
     <dependency>
         <groupId>${project.groupId}</groupId>
@@ -78,6 +80,8 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

diff --git a/fontbox/pom.xml b/fontbox/pom.xml
@@ -55,6 +55,8 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

diff --git a/io/pom.xml b/io/pom.xml
@@ -50,6 +50,8 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -57,7 +57,11 @@
 
         <bouncycastle.version>1.77</bouncycastle.version>
         <log4j2.version>2.22.0</log4j2.version>
-
+        <junit.version>5.10.1</junit.version>
+        <jbig2.version>3.0.4</jbig2.version>
+        <jai.version>1.4.0</jai.version>
+        <commons-io.version>2.15.0</commons-io.version>
+        <picocli.version>4.7.5</picocli.version>
         <!-- This is a default value to avoid problems when running single tests
              see also https://stackoverflow.com/a/28695766/535646 
              https://maven.apache.org/surefire/maven-surefire-plugin/faq.html#late-property-evaluation
@@ -67,12 +71,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-	            <groupId>org.junit.jupiter</groupId>
-	            <artifactId>junit-jupiter</artifactId>
-	            <version>5.10.1</version>
-	            <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-api</artifactId>
@@ -84,50 +82,6 @@
                 <version>${log4j2.version}</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>2.15.0</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.bouncycastle</groupId>
-                <artifactId>bcprov-jdk18on</artifactId>
-                <version>${bouncycastle.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.bouncycastle</groupId>
-                <artifactId>bcpkix-jdk18on</artifactId>
-                <version>${bouncycastle.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.pdfbox</groupId>
-                <artifactId>jbig2-imageio</artifactId>
-                <version>3.0.4</version>
-                <scope>test</scope>
-            </dependency>
-
-            <!-- For legal reasons (incompatible license), these two dependencies
-            are to be used only in the tests and may not be distributed.
-            See also LEGAL-195 -->
-            <dependency>
-                <groupId>com.github.jai-imageio</groupId>
-                <artifactId>jai-imageio-core</artifactId>
-                <version>1.4.0</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.github.jai-imageio</groupId>
-                <artifactId>jai-imageio-jpeg2000</artifactId>
-                <version>1.4.0</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>info.picocli</groupId>
-                <artifactId>picocli</artifactId>
-                <version>4.7.5</version>
-            </dependency>
             <!-- not used directly, updated to have less output from versions plugin -->
             <dependency>
                 <groupId>org.apache.maven.plugin-tools</groupId>
@@ -279,7 +233,7 @@
 				   <execution>
 				      <id>attach-sources</id>
 				      <goals>
-				        <goal>jar</goal>
+				        <goal>jar-no-fork</goal>
 				      </goals>
 				   </execution>
 				</executions>

diff --git a/pdfbox/pom.xml b/pdfbox/pom.xml
@@ -54,18 +54,22 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk18on</artifactId>
+            <version>${bouncycastle.version}</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-jdk18on</artifactId>
+            <version>${bouncycastle.version}</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
 	      <groupId>org.junit.jupiter</groupId>
 	      <artifactId>junit-jupiter</artifactId>
+          <version>${junit.version}</version>
+          <scope>test</scope>
 	    </dependency>
         <dependency>
             <groupId>com.googlecode.java-diff-utils</groupId>
@@ -76,6 +80,7 @@
         <dependency>
             <groupId>org.apache.pdfbox</groupId>
             <artifactId>jbig2-imageio</artifactId>
+            <version>${jbig2.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -90,11 +95,13 @@
         <dependency>
             <groupId>com.github.jai-imageio</groupId>
             <artifactId>jai-imageio-core</artifactId>
+            <version>${jai.version}</version>
             <scope>test</scope>
         </dependency>    
         <dependency>
             <groupId>com.github.jai-imageio</groupId>
             <artifactId>jai-imageio-jpeg2000</artifactId>
+            <version>${jai.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/tools/pom.xml b/tools/pom.xml
@@ -55,32 +55,38 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <scope>compile</scope>
+      <version>${commons-io.version}</version>
     </dependency>
     <dependency>
       <groupId>info.picocli</groupId>
       <artifactId>picocli</artifactId>
+      <version>${picocli.version}</version>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
-        <groupId>org.apache.pdfbox</groupId>
-        <artifactId>jbig2-imageio</artifactId>
-        <scope>test</scope>
+      <groupId>org.apache.pdfbox</groupId>
+      <artifactId>jbig2-imageio</artifactId>
+      <version>${jbig2.version}</version>
+      <scope>test</scope>
     </dependency>
     <!-- For legal reasons (incompatible license), these two dependencies 
         are to be used only in the tests and may not be distributed. 
         See also LEGAL-195 -->
     <dependency>
         <groupId>com.github.jai-imageio</groupId>
         <artifactId>jai-imageio-core</artifactId>
+        <version>${jai.version}</version>
         <scope>test</scope>
     </dependency>    
     <dependency>
         <groupId>com.github.jai-imageio</groupId>
         <artifactId>jai-imageio-jpeg2000</artifactId>
+        <version>${jai.version}</version>
         <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/xmpbox/pom.xml b/xmpbox/pom.xml
@@ -33,6 +33,8 @@
 	    <dependency>
 	      <groupId>org.junit.jupiter</groupId>
 	      <artifactId>junit-jupiter</artifactId>
+          <version>${junit.version}</version>
+          <scope>test</scope>
 	    </dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>