Upgrading Spring Boot, Swagger UI, MySQL JDBC driver and PDFBox

apache · Jul 20, 2023 · 0b8a707 · 0b8a707
1 parent 73de3cf
commit 0b8a707
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 17 deletions.
diff --git a/...ava/org/apache/syncope/client/ui/commons/markup/html/form/preview/BinaryPDFPreviewer.java b/...ava/org/apache/syncope/client/ui/commons/markup/html/form/preview/BinaryPDFPreviewer.java
@@ -21,14 +21,11 @@
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
 import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.Serializable;
 import java.time.Instant;
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.cos.COSObject;
-import org.apache.pdfbox.io.MemoryUsageSetting;
 import org.apache.pdfbox.pdmodel.DefaultResourceCache;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.graphics.PDXObject;
@@ -63,15 +60,13 @@ public BinaryPDFPreviewer(final String mimeType) {
     public Component preview(final byte[] uploadedBytes) {
         firstPage = null;
 
-        try (InputStream bais = new ByteArrayInputStream(uploadedBytes);
-             PDDocument document = Loader.loadPDF(bais, MemoryUsageSetting.setupTempFileOnly())) {
-
+        try (PDDocument document = Loader.loadPDF(uploadedBytes)) {
             document.setResourceCache(new DefaultResourceCache() {
 
                 @Override
-                public void put(final COSObject indirect, final PDXObject xobject) throws IOException {
+                public void put(final COSObject indirect, final PDXObject xobject) {
+                    // no cache
                 }
-
             });
             if (document.isEncrypted()) {
                 LOG.info("Document is encrypted, no preview is possible");
@@ -96,15 +91,15 @@ public void put(final COSObject indirect, final PDXObject xobject) throws IOExce
         return this.addOrReplace(previewContainer);
     }
 
-    private static class ThumbnailImageResource extends DynamicImageResource implements Serializable {
+    protected static class ThumbnailImageResource extends DynamicImageResource implements Serializable {
 
         private static final long serialVersionUID = 923201517955737928L;
 
-        private final transient BufferedImage image;
+        protected final transient BufferedImage image;
 
-        private transient byte[] thumbnail;
+        protected transient byte[] thumbnail;
 
-        ThumbnailImageResource(final BufferedImage image) {
+        protected ThumbnailImageResource(final BufferedImage image) {
             this.image = image;
         }
 
@@ -117,7 +112,7 @@ protected byte[] getImageData(final IResource.Attributes attributes) {
             return thumbnail;
         }
 
-        private BufferedImage getScaledImageInstance() {
+        protected BufferedImage getScaledImageInstance() {
             int originalWidth = image.getWidth();
             int originalHeight = image.getHeight();
 

diff --git a/pom.xml b/pom.xml
@@ -413,7 +413,7 @@ under the License.
     <bouncycastle.version>1.70</bouncycastle.version>
     <nimbus-jose-jwt.version>9.31</nimbus-jose-jwt.version>
 
-    <spring-boot.version>2.7.13</spring-boot.version>
+    <spring-boot.version>2.7.14</spring-boot.version>
     <spring-cloud-gateway.version>3.1.8</spring-cloud-gateway.version>
 
     <openjpa.version>3.2.2</openjpa.version>
@@ -445,7 +445,7 @@ under the License.
     <h2.version>2.2.220</h2.version>
 
     <swagger-core.version>2.2.15</swagger-core.version>
-    <swagger-ui.version>5.1.0</swagger-ui.version>
+    <swagger-ui.version>5.1.3</swagger-ui.version>
 
     <jquery-slimscroll.version>1.3.8</jquery-slimscroll.version>
     <jquery-cookie.version>1.4.1-1</jquery-cookie.version>
@@ -503,7 +503,7 @@ under the License.
     <docker.mariadb.version>11</docker.mariadb.version>
 
     <jdbc.postgresql.version>42.6.0</jdbc.postgresql.version>
-    <jdbc.mysql.version>8.0.33</jdbc.mysql.version>
+    <jdbc.mysql.version>8.1.0</jdbc.mysql.version>
     <jdbc.mariadb.version>3.1.4</jdbc.mariadb.version>
     <jdbc.mssql.version>12.2.0.jre</jdbc.mssql.version>
     <jdbc.oracle.version>23.2.0.0</jdbc.oracle.version>
@@ -1228,7 +1228,7 @@ under the License.
       <dependency>
         <groupId>org.apache.pdfbox</groupId>
         <artifactId>pdfbox</artifactId>
-        <version>3.0.0-alpha3</version>
+        <version>3.0.0-beta1</version>
       </dependency>
 
       <dependency>