Change to mapfish-print 2.2.0

geonetwork · Jun 9, 2022 · c52a2d9 · c52a2d9
1 parent f91390f
commit c52a2d9
Show file tree

Hide file tree

Showing 6 changed files with 1,840 additions and 15 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -383,8 +383,8 @@
       <exclusions>
         <exclusion>
           <!-- provided by openpdf -->
-          <groupId>com.lowagie</groupId>
-          <artifactId>itext</artifactId>
+          <groupId>com.itextpdf</groupId>
+          <artifactId>itextpdf</artifactId>
         </exclusion>
         <exclusion>
           <groupId>commons-httpclient</groupId>

diff --git a/core/src/main/java/org/fao/geonet/kernel/thumbnail/ThumbnailMaker.java b/core/src/main/java/org/fao/geonet/kernel/thumbnail/ThumbnailMaker.java
@@ -149,7 +149,7 @@ private MapPrinter getMapPrinter() {
     }
 
     public Path generateThumbnail(String jsonConfig, Integer rotationAngle)
-        throws IOException, com.itextpdf.text.DocumentException {
+        throws IOException {
 
         PJsonObject specJson = MapPrinter.parseSpec(jsonConfig);
         if (Log.isDebugEnabled(LOGGER_NAME)) {

diff --git a/pom.xml b/pom.xml
@@ -813,7 +813,7 @@
       <dependency>
         <groupId>org.mapfish.print</groupId>
         <artifactId>print-lib</artifactId>
-        <version>2.1.6</version>
+        <version>2.2-SNAPSHOT</version>
       </dependency>
 
       <!-- Lib utils -->
@@ -912,19 +912,11 @@
         <artifactId>mysql-connector-java</artifactId>
         <version>8.0.20</version>
       </dependency>
-      <!-- Not permitted under oracle licensing rules
-      <dependency>
-        <groupId>ojdbc</groupId>
-        <artifactId>ojdbc</artifactId>
-        <version>14</version>
-      </dependency>
-      -->
-      <!-- Oracle changed policy, this is from maven central -->
-      <!-- Oracle Free Use Terms and Conditions (FUTC) -->
       <dependency>
          <groupId>com.oracle.database.jdbc</groupId>
          <artifactId>ojdbc8</artifactId>
          <version>19.6.0.0</version>
+         <!-- Oracle Free Use Terms and Conditions (FUTC) -->
        </dependency>
       <dependency>
         <groupId>org.codehaus.izpack</groupId>

diff --git a/services/src/main/java/org/fao/geonet/api/records/formatters/FormatterApi.java b/services/src/main/java/org/fao/geonet/api/records/formatters/FormatterApi.java
@@ -527,7 +527,7 @@ private String getXmlFromUrl(ServiceContext context, String lang, String url, We
         return new String(ByteStreams.toByteArray(execute.getBody()), Constants.CHARSET);
     }
 
-    private void writerAsPDF(ServiceContext context, HttpServletResponse response, byte[] bytes, String lang) throws IOException, com.itextpdf.text.DocumentException {
+    private void writerAsPDF(ServiceContext context, HttpServletResponse response, byte[] bytes, String lang) throws IOException, com.lowagie.text.DocumentException {
         final String htmlContent = new String(bytes, Constants.CHARSET);
         try {
             XslUtil.setNoScript();

diff --git a/...ices/src/main/java/org/fao/geonet/api/records/formatters/ImageReplacedElementFactory.java b/...ices/src/main/java/org/fao/geonet/api/records/formatters/ImageReplacedElementFactory.java
@@ -25,7 +25,7 @@
 
 import com.google.common.collect.Sets;
 import com.google.common.io.Files;
-import com.itextpdf.text.Image;
+import com.lowagie.text.Image;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.fao.geonet.api.ApiUtils;