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 2023/11/28 06:58:10 UTC
svn commit: r1914172 - in /pdfbox/trunk: app/pom.xml debugger-app/pom.xml debugger/pom.xml examples/pom.xml fontbox/pom.xml io/pom.xml parent/pom.xml pdfbox/pom.xml tools/pom.xml xmpbox/pom.xml
Author: lehmi
Date: Tue Nov 28 06:58:09 2023
New Revision: 1914172
URL: http://svn.apache.org/viewvc?rev=1914172&view=rev
Log:
PDFBOX-5699: move most of the dependencies from parent to subprojects
Modified:
pdfbox/trunk/app/pom.xml
pdfbox/trunk/debugger-app/pom.xml
pdfbox/trunk/debugger/pom.xml
pdfbox/trunk/examples/pom.xml
pdfbox/trunk/fontbox/pom.xml
pdfbox/trunk/io/pom.xml
pdfbox/trunk/parent/pom.xml
pdfbox/trunk/pdfbox/pom.xml
pdfbox/trunk/tools/pom.xml
pdfbox/trunk/xmpbox/pom.xml
Modified: pdfbox/trunk/app/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/app/pom.xml?rev=1914172&r1=1914171&r2=1914172&view=diff
==============================================================================
--- pdfbox/trunk/app/pom.xml (original)
+++ pdfbox/trunk/app/pom.xml Tue Nov 28 06:58:09 2023
@@ -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>
Modified: pdfbox/trunk/debugger-app/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger-app/pom.xml?rev=1914172&r1=1914171&r2=1914172&view=diff
==============================================================================
--- pdfbox/trunk/debugger-app/pom.xml (original)
+++ pdfbox/trunk/debugger-app/pom.xml Tue Nov 28 06:58:09 2023
@@ -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>
Modified: pdfbox/trunk/debugger/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger/pom.xml?rev=1914172&r1=1914171&r2=1914172&view=diff
==============================================================================
--- pdfbox/trunk/debugger/pom.xml (original)
+++ pdfbox/trunk/debugger/pom.xml Tue Nov 28 06:58:09 2023
@@ -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>
Modified: pdfbox/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/pom.xml?rev=1914172&r1=1914171&r2=1914172&view=diff
==============================================================================
--- pdfbox/trunk/examples/pom.xml (original)
+++ pdfbox/trunk/examples/pom.xml Tue Nov 28 06:58:09 2023
@@ -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>
Modified: pdfbox/trunk/fontbox/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/pom.xml?rev=1914172&r1=1914171&r2=1914172&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/pom.xml (original)
+++ pdfbox/trunk/fontbox/pom.xml Tue Nov 28 06:58:09 2023
@@ -55,6 +55,8 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: pdfbox/trunk/io/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/io/pom.xml?rev=1914172&r1=1914171&r2=1914172&view=diff
==============================================================================
--- pdfbox/trunk/io/pom.xml (original)
+++ pdfbox/trunk/io/pom.xml Tue Nov 28 06:58:09 2023
@@ -50,6 +50,8 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: pdfbox/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/parent/pom.xml?rev=1914172&r1=1914171&r2=1914172&view=diff
==============================================================================
--- pdfbox/trunk/parent/pom.xml (original)
+++ pdfbox/trunk/parent/pom.xml Tue Nov 28 06:58:09 2023
@@ -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
@@ -68,12 +72,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>
<version>${log4j2.version}</version>
@@ -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>
Modified: pdfbox/trunk/pdfbox/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/pom.xml?rev=1914172&r1=1914171&r2=1914172&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/pom.xml (original)
+++ pdfbox/trunk/pdfbox/pom.xml Tue Nov 28 06:58:09 2023
@@ -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>
Modified: pdfbox/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/pom.xml?rev=1914172&r1=1914171&r2=1914172&view=diff
==============================================================================
--- pdfbox/trunk/tools/pom.xml (original)
+++ pdfbox/trunk/tools/pom.xml Tue Nov 28 06:58:09 2023
@@ -55,20 +55,24 @@
<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.
@@ -76,11 +80,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>
Modified: pdfbox/trunk/xmpbox/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/pom.xml?rev=1914172&r1=1914171&r2=1914172&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/pom.xml (original)
+++ pdfbox/trunk/xmpbox/pom.xml Tue Nov 28 06:58:09 2023
@@ -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>