debian/changelog

+libsejda-java (3.2.66-1) unstable; urgency=medium
+
+  * New upstream version 3.2.66.
+
+ -- Markus Koschany <apo@debian.org>  Sat, 22 Dec 2018 12:32:07 +0100
+
 libsejda-java (3.2.56-1) unstable; urgency=medium
 
   * New upstream version 3.2.56.

pom.xml

@@ -6,7 +6,7 @@
 	<artifactId>sejda-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>sejda</name>
-	<version>3.2.56</version>
+	<version>3.2.66</version>
 	<description>An extendible and configurable PDF manipulation layer library. A ready to use java library to perform PDF documents manipulation without having to deal with the low level API. Sejda offers many "ready to go" manipulations implemented using the SAMBox but it can be extended to use other implementations.</description>
 
 	<organization>
@@ -32,7 +32,7 @@
 		<connection>scm:git:git@github.com:torakiki/sejda.git</connection>
 		<developerConnection>scm:git:git@github.com:torakiki/sejda.git</developerConnection>
 		<url>scm:git:git@github.com:torakiki/sejda.git</url>
-		<tag>v3.2.56</tag>
+		<tag>v3.2.66</tag>
 	</scm>
 
 	<developers>
@@ -338,7 +338,7 @@
 		<jdepend.version>2.9.1</jdepend.version>
 		<hibernate-validator.version>4.2.0.Final</hibernate-validator.version>
 		<hamcrest.version>1.3</hamcrest.version>
-		<sambox.version>1.1.41</sambox.version>
+		<sambox.version>1.1.46</sambox.version>
 		<bouncycastle.version>1.56</bouncycastle.version>
 		<twelvemonkeys.version>3.3.1</twelvemonkeys.version>
 		<apache.poi.version>3.15</apache.poi.version>

sejda-console/.classpath

@@ -15,11 +15,13 @@
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>

sejda-console/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.sejda</groupId>
 		<artifactId>sejda-parent</artifactId>
-		<version>3.2.56</version>
+		<version>3.2.66</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -183,6 +183,13 @@
 						</goals>
 					</execution>
 				</executions>
+				<configuration>
+					<archive>
+						<manifestEntries>
+							<Automatic-Module-Name>org.sejda.cli</Automatic-Module-Name>
+						</manifestEntries>
+					</archive>
+				</configuration>
 			</plugin>
 			<!-- plugin that assembles an executable form for the application -->
 			<plugin>

sejda-console/src/test/java/org/sejda/cli/CommandLineTestBuilder.java

@@ -191,7 +191,7 @@ public class CommandLineTestBuilder {
     }
 
     public <T> T invokeSejdaConsole() {
-        return (T) new CommandLineExecuteTestHelper(true)
+        return new CommandLineExecuteTestHelper(true)
                 .invokeConsoleAndReturnTaskParameters(this.toCommandLineString());
     }
 }

sejda-conversion/pom.xml

@@ -10,10 +10,26 @@
 	<parent>
 		<groupId>org.sejda</groupId>
 		<artifactId>sejda-parent</artifactId>
-		<version>3.2.56</version>
+		<version>3.2.66</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestEntries>
+							<Automatic-Module-Name>org.sejda.conversion</Automatic-Module-Name>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	
 	<dependencies>
 		<dependency>
 			<groupId>org.sejda</groupId>

sejda-conversion/src/main/java/org/sejda/conversion/PdfFileSourceListAdapter.java

@@ -43,6 +43,7 @@ import javax.xml.xpath.XPathFactory;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.sejda.common.XMLUtils;
 import org.sejda.conversion.exception.ConversionException;
 import org.sejda.model.exception.SejdaRuntimeException;
 import org.sejda.model.input.PdfFileSource;
@@ -245,9 +246,11 @@ class XmlFileSourceListParser extends AbstractPdfInputFilesSource {
 
     protected List<String> doParseFileNames(File file) throws IOException, SAXException, ParserConfigurationException,
             XPathException {
-        DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilderFactory domFactory = XMLUtils.getDocumentBuilderFactory();
         domFactory.setNamespaceAware(true);
+
         DocumentBuilder builder = domFactory.newDocumentBuilder();
+        builder.setErrorHandler(XMLUtils.ERROR_HANDLER);
         Document doc = builder.parse(file);
 
         List<String> result = new ArrayList<>();

sejda-core/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.sejda</groupId>
 		<artifactId>sejda-parent</artifactId>
-		<version>3.2.56</version>
+		<version>3.2.66</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -41,6 +41,13 @@
 						</goals>
 					</execution>
 				</executions>
+				<configuration>
+					<archive>
+						<manifestEntries>
+							<Automatic-Module-Name>org.sejda.core</Automatic-Module-Name>
+						</manifestEntries>
+					</archive>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

sejda-core/src/main/java/org/sejda/core/context/XmlConfigurationStrategy.java

@@ -41,6 +41,7 @@ import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
 import org.apache.commons.io.IOUtils;
+import org.sejda.common.XMLUtils;
 import org.sejda.core.Sejda;
 import org.sejda.core.notification.strategy.AsyncNotificationStrategy;
 import org.sejda.core.notification.strategy.NotificationStrategy;
@@ -92,10 +93,12 @@ final class XmlConfigurationStrategy implements ConfigurationStrategy {
     }
 
     private void initializeFromInputStream(InputStream input) throws ConfigurationException {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         try {
+            DocumentBuilderFactory factory = XMLUtils.getDocumentBuilderFactory();
             initializeSchemaValidation(factory);
+
             DocumentBuilder builder = factory.newDocumentBuilder();
+            builder.setErrorHandler(XMLUtils.ERROR_HANDLER);
             Document document = builder.parse(input);
 
             notificationStrategy = getNotificationStrategy(document);

sejda-core/src/test/java/org/sejda/core/service/BaseTaskTest.java

@@ -196,6 +196,11 @@ public abstract class BaseTaskTest<T extends TaskParameters> implements Testable
         org.sejda.core.service.TestUtils.assertPageText(page, text);
     }
 
+    public void assertPageTextExactLines(PDPage page, String text) {
+        org.sejda.core.service.TestUtils.assertPageTextExactLines(page, text);
+    }
+
+
     public void assertPageTextContains(PDPage page, String text) {
         org.sejda.core.service.TestUtils.assertPageTextContains(page, text);
     }

sejda-core/src/test/java/org/sejda/core/service/PdfToExcelTaskTest.java

@@ -21,7 +21,12 @@ package org.sejda.core.service;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -105,7 +110,7 @@ public abstract class PdfToExcelTaskTest extends BaseTaskTest<PdfToExcelParamete
             List<String> row = new ArrayList<>();
             for(String s: record){
                 row.add(s);
-            };
+            }
             results.add(row);
         }
 

sejda-core/src/test/java/org/sejda/core/service/TestUtils.java

@@ -23,7 +23,7 @@ import org.sejda.sambox.pdmodel.common.PDPageLabelRange;
 import org.sejda.sambox.pdmodel.common.PDPageLabels;
 import org.sejda.sambox.pdmodel.common.PDRectangle;
 import org.sejda.sambox.pdmodel.interactive.annotation.PDAnnotationLink;
-import org.sejda.sambox.pdmodel.interactive.documentnavigation.destination.PDPageFitWidthDestination;
+import org.sejda.sambox.pdmodel.interactive.documentnavigation.destination.PDPageDestination;
 import org.sejda.sambox.text.PDFTextStripperByArea;
 
 import java.awt.*;
@@ -120,7 +120,7 @@ public class TestUtils {
     }
 
     public static void assertPageDestination(PDAnnotationLink link, PDPage expectedPage) throws IOException {
-        PDPage actualPage = ((PDPageFitWidthDestination)link.getDestination()).getPage();
+        PDPage actualPage = ((PDPageDestination)link.getDestination()).getPage();
         assertEquals(expectedPage, actualPage);
     }
 

sejda-distribution/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.sejda</groupId>
 		<artifactId>sejda-parent</artifactId>
-		<version>3.2.56</version>
+		<version>3.2.66</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

sejda-docs/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.sejda</groupId>
 		<artifactId>sejda-parent</artifactId>
-		<version>3.2.56</version>
+		<version>3.2.66</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

sejda-fonts/fonts/sans/README.txt

@@ -12,7 +12,6 @@ files = [
     # list to maximize the amount of meta data retained in the final merged font.
     'NotoSans-Regular.ttf',
     'NotoSansBengali-Regular.ttf',
-    'NotoKufiArabic-Regular.ttf',
     'NotoNaskhArabic-Regular.ttf',
     'NotoSansBengali-Regular.ttf',
     'NotoSansDevanagari-Regular.ttf',

sejda-fonts/pom.xml

@@ -10,10 +10,26 @@
 	<parent>
 		<groupId>org.sejda</groupId>
 		<artifactId>sejda-parent</artifactId>
-		<version>3.2.56</version>
+		<version>3.2.66</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestEntries>
+							<Automatic-Module-Name>org.sejda.fonts</Automatic-Module-Name>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	
 	<dependencies>
 		<dependency>
 			<groupId>org.sejda</groupId>

sejda-image-writers/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.sejda</groupId>
 		<artifactId>sejda-parent</artifactId>
-		<version>3.2.56</version>
+		<version>3.2.66</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -15,6 +15,22 @@
 
 	<name>sejda image writers</name>
 	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestEntries>
+							<Automatic-Module-Name>org.sejda.core.writer</Automatic-Module-Name>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	
 	<dependencies>
 		<dependency>
 			<groupId>org.sejda</groupId>