Rebase the Jaspersoft classic fork onto OpenPDF 1.4.2 (1.4.2.jaspersoft.1)

.github/workflows/maven.yml

@@ -10,14 +10,14 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-latest
-    name: Build with Java 8
+    name: Build with Java 11
     steps:
       - uses: actions/checkout@v4
 
       - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 8
+          java-version: 11
 
       - name: Check maven version
         run: mvn -v; echo "** ls **"; pwd && ls -l

.java-version

@@ -1 +1 @@
-1.8
+11

changelogs/1.3.37.md

@@ -2,4 +2,4 @@
 
 ## Changes
 
-* OpenPDF 1.3.37 requires Java 11.
+* OpenPDF 1.3.37 requires Java 11.

openpdf-fonts-extra/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.github.librepdf</groupId>
     <artifactId>openpdf-parent</artifactId>
-    <version>1.3.43.jaspersoft.2</version>
+    <version>1.4.2.jaspersoft.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>openpdf-fonts-extra</artifactId>

openpdf/pom.xml

@@ -1,102 +1,103 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>com.github.librepdf</groupId>
-        <artifactId>openpdf-parent</artifactId>
-        <version>1.3.43.jaspersoft.2</version>
-    </parent>
+  <parent>
+    <groupId>com.github.librepdf</groupId>
+    <artifactId>openpdf-parent</artifactId>
+    <version>1.4.2.jaspersoft.1-SNAPSHOT</version>
+  </parent>
 
-    <artifactId>openpdf</artifactId>
+  <artifactId>openpdf</artifactId>
 
-    <properties>
-        <java-module-name>com.github.librepdf.openpdf</java-module-name>
-    </properties>
+  <properties>
+    <java-module-name>com.github.librepdf.openpdf</java-module-name>
+  </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.ibm.icu</groupId>
-            <artifactId>icu4j</artifactId>
-            <version>74.2</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk18on</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk18on</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>fop</artifactId>
-            <optional>true</optional>
-        </dependency>
+  <dependencies>
+    <dependency>
+      <groupId>com.ibm.icu</groupId>
+      <artifactId>icu4j</artifactId>
+      <version>74.2</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk18on</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk18on</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.xmlgraphics</groupId>
+      <artifactId>fop</artifactId>
+      <optional>true</optional>
+    </dependency>
 
-        <!-- Test Deps -->
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>4.11.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.verapdf</groupId>
-            <artifactId>validation-model</artifactId>
-            <version>1.24.1</version>
-            <optional>true</optional>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+    <!-- Test Deps -->
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>5.10.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.verapdf</groupId>
+      <artifactId>validation-model</artifactId>
+      <version>1.24.1</version>
+      <optional>true</optional>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources-filtered</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <!-- unpack bundle, so humans can see the manifest without unpacking the jar -->
-                    <unpackBundle>true</unpackBundle>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>src/main/resources-filtered</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <!-- unpack bundle, so humans can see the manifest without unpacking the jar -->
+          <unpackBundle>true</unpackBundle>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

openpdf/src/main/java/com/lowagie/text/Annotation.java

@@ -578,17 +578,6 @@ public String content() {
         return s;
     }
 
-    /**
-     * Gets the content of this <CODE>Annotation</CODE>.
-     *
-     * @return a reference
-     * @deprecated use {@link #getAttributes()}
-     */
-    @Deprecated
-    public HashMap attributes() {
-        return (HashMap) annotationAttributes;
-    }
-
     /**
      * Gets the content of this <CODE>Annotation</CODE>.
      *

openpdf/src/main/java/com/lowagie/text/Cell.java

@@ -277,30 +277,6 @@ public int getHorizontalAlignment() {
         return horizontalAlignment;
     }
 
-    /**
-     * Sets the horizontal alignment.
-     *
-     * @param value the new value
-     * @deprecated Setting alignment through unconstrained types is non-obvious and error-prone, use
-     * {@link Cell#setHorizontalAlignment(HorizontalAlignment)} instead
-     */
-    @Deprecated
-    public void setHorizontalAlignment(int value) {
-        horizontalAlignment = value;
-    }
-
-    /**
-     * Sets the alignment of this cell. This methods allows you to set the alignment as a String.
-     *
-     * @param alignment the new alignment as a <CODE>String</CODE>
-     * @deprecated Setting alignment through unconstrained types is non-obvious and error-prone, use
-     * {@link Cell#setHorizontalAlignment(HorizontalAlignment)} instead
-     */
-    @Deprecated
-    public void setHorizontalAlignment(String alignment) {
-        setHorizontalAlignment(ElementTags.alignmentValue(alignment));
-    }
-
     @Override
     public void setHorizontalAlignment(final HorizontalAlignment alignment) {
         if (alignment == null) {
@@ -319,30 +295,6 @@ public int getVerticalAlignment() {
         return verticalAlignment;
     }
 
-    /**
-     * Sets the vertical alignment.
-     *
-     * @param value the new value
-     * @deprecated Setting alignment through unconstrained types is non-obvious and error-prone, use
-     * {@link Cell#setVerticalAlignment(VerticalAlignment)} instead
-     */
-    @Deprecated
-    public void setVerticalAlignment(int value) {
-        verticalAlignment = value;
-    }
-
-    /**
-     * Sets the alignment of this paragraph.
-     *
-     * @param alignment the new alignment as a <CODE>String</CODE>
-     * @deprecated Setting alignment through unconstrained types is non-obvious and error-prone, use
-     * {@link Cell#setVerticalAlignment(VerticalAlignment)} instead
-     */
-    @Deprecated
-    public void setVerticalAlignment(String alignment) {
-        setVerticalAlignment(ElementTags.alignmentValue(alignment));
-    }
-
     @Override
     public void setVerticalAlignment(final VerticalAlignment alignment) {
         if (alignment == null) {

openpdf/src/main/java/com/lowagie/text/Chunk.java

@@ -298,6 +298,8 @@ public Chunk(Image image, float offsetX, float offsetY) {
                 offsetY, Boolean.FALSE});
     }
 
+    // the attributes are ordered as they appear in the book 'iText in Action'
+
     /**
      * Creates a separator Chunk. Note that separator chunks can't be used in combination with tab chunks!
      *
@@ -320,8 +322,6 @@ public Chunk(DrawInterface separator, boolean vertical) {
         setAttribute(SEPARATOR, new Object[]{separator, vertical});
     }
 
-    // the attributes are ordered as they appear in the book 'iText in Action'
-
     /**
      * Creates a tab Chunk. Note that separator chunks can't be used in combination with tab chunks!
      *
@@ -482,31 +482,6 @@ public boolean hasAttributes() {
         return attributes != null;
     }
 
-    /**
-     * Gets the attributes for this <CODE>Chunk</CODE>.
-     * <p>
-     * It may be null.
-     *
-     * @return the attributes for this <CODE>Chunk</CODE>
-     * @deprecated use {@link #getChunkAttributes()}
-     */
-    @Deprecated
-    public HashMap getAttributes() {
-        return (HashMap) attributes;
-    }
-
-    /**
-     * Sets the attributes all at once.
-     *
-     * @param attributes the attributes of a Chunk
-     * @deprecated use {@link #setChunkAttributes(Map)}
-     */
-    @Deprecated
-    @SuppressWarnings("unchecked")
-    public void setAttributes(HashMap attributes) {
-        this.attributes = attributes;
-    }
-
     /**
      * Gets the attributes for this <CODE>Chunk</CODE>.
      * <p>

openpdf/src/main/java/com/lowagie/text/ImageLoader.java

@@ -161,11 +161,7 @@ public static Image getBmpImage(byte[] imageData) {
     }
 
     /**
-     * Creates an Image from an array of tiff image bytes. For JRE < 9, `ImageIO.read()` requires a supporting library
-     * in the classpath to read tiffs. Options are: - https://github.com/jai-imageio/jai-imageio-core -
-     * https://github.com/haraldk/TwelveMonkeys
-     * <p>
-     * see: https://openjdk.java.net/jeps/262
+     * Creates an Image from an array of tiff image bytes.
      *
      * @param imageData bytes of the tiff image
      * @return an objet of type <code>Image</code>