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 2020/11/15 15:02:04 UTC

svn commit: r1883443 - in /pdfbox/trunk: app/pom.xml debugger-app/pom.xml examples/pom.xml fontbox/pom.xml parent/pom.xml pdfbox/pom.xml preflight-app/pom.xml preflight/pom.xml tools/pom.xml xmpbox/pom.xml

Author: lehmi
Date: Sun Nov 15 15:02:04 2020
New Revision: 1883443

URL: http://svn.apache.org/viewvc?rev=1883443&view=rev
Log:
PDFBOX-5017: replace the junit4 based plugin with the junit5 based one using the vintage engine to support junit4 style tests

Modified:
    pdfbox/trunk/app/pom.xml
    pdfbox/trunk/debugger-app/pom.xml
    pdfbox/trunk/examples/pom.xml
    pdfbox/trunk/fontbox/pom.xml
    pdfbox/trunk/parent/pom.xml
    pdfbox/trunk/pdfbox/pom.xml
    pdfbox/trunk/preflight-app/pom.xml
    pdfbox/trunk/preflight/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=1883443&r1=1883442&r2=1883443&view=diff
==============================================================================
--- pdfbox/trunk/app/pom.xml (original)
+++ pdfbox/trunk/app/pom.xml Sun Nov 15 15:02:04 2020
@@ -68,7 +68,7 @@
             <Embed-Transitive>true</Embed-Transitive>
             <Embed-Dependency>*;scope=provided;inline=org/apache/**|org/bouncycastle/**|META-INF/services/**</Embed-Dependency>
             <Bundle-DocURL>${project.url}</Bundle-DocURL>
-            <Import-Package>!junit.framework,!junit.textui,javax.*;resolution:=optional,org.apache.avalon.framework.logger;resolution:=optional,org.apache.log;resolution:=optional,*</Import-Package>
+            <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>
         </configuration>

Modified: pdfbox/trunk/debugger-app/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger-app/pom.xml?rev=1883443&r1=1883442&r2=1883443&view=diff
==============================================================================
--- pdfbox/trunk/debugger-app/pom.xml (original)
+++ pdfbox/trunk/debugger-app/pom.xml Sun Nov 15 15:02:04 2020
@@ -68,7 +68,7 @@
             <Embed-Transitive>true</Embed-Transitive>
             <Embed-Dependency>*;scope=provided;inline=org/apache/**|org/bouncycastle/**|META-INF/services/**</Embed-Dependency>
             <Bundle-DocURL>${project.url}</Bundle-DocURL>
-            <Import-Package>!junit.framework,!junit.textui,javax.*;resolution:=optional,org.apache.avalon.framework.logger;resolution:=optional,org.apache.log;resolution:=optional,*</Import-Package>
+            <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.debugger.PDFDebugger</Main-Class>
           </instructions>
         </configuration>

Modified: pdfbox/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/pom.xml?rev=1883443&r1=1883442&r2=1883443&view=diff
==============================================================================
--- pdfbox/trunk/examples/pom.xml (original)
+++ pdfbox/trunk/examples/pom.xml Sun Nov 15 15:02:04 2020
@@ -95,11 +95,14 @@
       <version>1.10.9</version>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
     </dependency>
     <dependency>
+        <groupId>org.junit.vintage</groupId>
+        <artifactId>junit-vintage-engine</artifactId>
+    </dependency>  
+    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
       <version>4.0.1</version>

Modified: pdfbox/trunk/fontbox/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/pom.xml?rev=1883443&r1=1883442&r2=1883443&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/pom.xml (original)
+++ pdfbox/trunk/fontbox/pom.xml Sun Nov 15 15:02:04 2020
@@ -43,9 +43,13 @@
       <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
     </dependency>
+	<dependency>
+	    <groupId>org.junit.vintage</groupId>
+	    <artifactId>junit-vintage-engine</artifactId>
+	</dependency>  
   </dependencies>
 
   <build>

Modified: pdfbox/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/parent/pom.xml?rev=1883443&r1=1883442&r2=1883443&view=diff
==============================================================================
--- pdfbox/trunk/parent/pom.xml (original)
+++ pdfbox/trunk/parent/pom.xml Sun Nov 15 15:02:04 2020
@@ -61,11 +61,17 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.13.1</version>
-                <scope>test</scope>
+	            <groupId>org.junit.jupiter</groupId>
+	            <artifactId>junit-jupiter-api</artifactId>
+	            <version>5.7.0</version>
+	            <scope>test</scope>
             </dependency>
+			<dependency>
+			    <groupId>org.junit.vintage</groupId>
+			    <artifactId>junit-vintage-engine</artifactId>
+			    <version>5.7.0</version>
+			    <scope>test</scope>
+			</dependency>            
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>

Modified: pdfbox/trunk/pdfbox/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/pom.xml?rev=1883443&r1=1883442&r2=1883443&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/pom.xml (original)
+++ pdfbox/trunk/pdfbox/pom.xml Sun Nov 15 15:02:04 2020
@@ -60,11 +60,14 @@
             <artifactId>bcprov-jdk15on</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
+	    <dependency>
+	      <groupId>org.junit.jupiter</groupId>
+	      <artifactId>junit-jupiter-api</artifactId>
+	    </dependency>
+	    <dependency>
+	        <groupId>org.junit.vintage</groupId>
+	        <artifactId>junit-vintage-engine</artifactId>
+	    </dependency>  
         <dependency>
             <groupId>com.googlecode.java-diff-utils</groupId>
             <artifactId>diffutils</artifactId>

Modified: pdfbox/trunk/preflight-app/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight-app/pom.xml?rev=1883443&r1=1883442&r2=1883443&view=diff
==============================================================================
Binary files - no diff available.

Modified: pdfbox/trunk/preflight/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/pom.xml?rev=1883443&r1=1883442&r2=1883443&view=diff
==============================================================================
--- pdfbox/trunk/preflight/pom.xml (original)
+++ pdfbox/trunk/preflight/pom.xml Sun Nov 15 15:02:04 2020
@@ -172,10 +172,14 @@
 			<artifactId>xmpbox</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
+	    <dependency>
+	      <groupId>org.junit.jupiter</groupId>
+	      <artifactId>junit-jupiter-api</artifactId>
+	    </dependency>
+	    <dependency>
+	        <groupId>org.junit.vintage</groupId>
+	        <artifactId>junit-vintage-engine</artifactId>
+	    </dependency>  
 		<!-- TODO find a suitable place to store the isator test pdfs <dependency> 
 			<groupId>org.pdfa</groupId> <artifactId>isartor</artifactId> <version>1.0-20080813</version> 
 			<scope>test</scope> </dependency> -->

Modified: pdfbox/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/pom.xml?rev=1883443&r1=1883442&r2=1883443&view=diff
==============================================================================
--- pdfbox/trunk/tools/pom.xml (original)
+++ pdfbox/trunk/tools/pom.xml Sun Nov 15 15:02:04 2020
@@ -54,11 +54,14 @@
     	<version>1.4</version>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
     </dependency>
     <dependency>
+        <groupId>org.junit.vintage</groupId>
+        <artifactId>junit-vintage-engine</artifactId>
+    </dependency>  
+    <dependency>
         <groupId>org.apache.pdfbox</groupId>
         <artifactId>jbig2-imageio</artifactId>
         <scope>test</scope>

Modified: pdfbox/trunk/xmpbox/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/pom.xml?rev=1883443&r1=1883442&r2=1883443&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/pom.xml (original)
+++ pdfbox/trunk/xmpbox/pom.xml Sun Nov 15 15:02:04 2020
@@ -47,10 +47,14 @@
         </profiles>
 
 	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
+	    <dependency>
+	      <groupId>org.junit.jupiter</groupId>
+	      <artifactId>junit-jupiter-api</artifactId>
+	    </dependency>
+	    <dependency>
+	        <groupId>org.junit.vintage</groupId>
+	        <artifactId>junit-vintage-engine</artifactId>
+	    </dependency>  
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>