You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2023/07/20 10:32:21 UTC
[syncope] branch 3_0_X updated: Upgrading Spring Boot, Swagger UI, MySQL JDBC driver and PDFBox
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/3_0_X by this push:
new 0b8a7074cc Upgrading Spring Boot, Swagger UI, MySQL JDBC driver and PDFBox
0b8a7074cc is described below
commit 0b8a7074cc2f80fb4220c14d03cbaf7eb2ce6d39
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu Jul 20 12:32:13 2023 +0200
Upgrading Spring Boot, Swagger UI, MySQL JDBC driver and PDFBox
---
.../html/form/preview/BinaryPDFPreviewer.java | 21 ++++++++-------------
pom.xml | 8 ++++----
2 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/preview/BinaryPDFPreviewer.java b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/preview/BinaryPDFPreviewer.java
index b701a03664..1dc1b599d8 100644
--- a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/preview/BinaryPDFPreviewer.java
+++ b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/preview/BinaryPDFPreviewer.java
@@ -21,14 +21,11 @@ package org.apache.syncope.client.ui.commons.markup.html.form.preview;
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 class BinaryPDFPreviewer extends BinaryPreviewer {
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 class BinaryPDFPreviewer extends BinaryPreviewer {
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 @@ public class BinaryPDFPreviewer extends BinaryPreviewer {
return thumbnail;
}
- private BufferedImage getScaledImageInstance() {
+ protected BufferedImage getScaledImageInstance() {
int originalWidth = image.getWidth();
int originalHeight = image.getHeight();
diff --git a/pom.xml b/pom.xml
index cabdb1ff2c..681a8949af 100644
--- 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>