ATS-443 : Dependency updates (#59)

2025-05-19 17:14:47 +00:00 · 2019-06-24 17:41:51 +03:00 · 2019-06-24 17:41:51 +03:00 · 43b586a565
commit 43b586a565
parent ff0f659ded
7 changed files with 95 additions and 22 deletions
--- a/alfresco-docker-alfresco-pdf-renderer/src/license/THIRD-PARTY.properties
+++ b/alfresco-docker-alfresco-pdf-renderer/src/license/THIRD-PARTY.properties
@ -2,28 +2,35 @@
 #-------------------------------------------------------------------------------
 # Already used licenses in project :
 # - Apache 2
+# - Apache 2.0
 # - Apache License 2.0
 # - Apache License, Version 2.0
 # - Apache License, version 2.0
+# - BSD
 # - CDDL + GPLv2 with classpath exception
+# - CDDL 1.1
 # - CDDL+GPL License
+# - CDDL/GPLv2+CE
+# - Eclipse Distribution License - v 1.0
 # - Eclipse Public License - v 1.0
 # - GNU Lesser General Public License
 # - GNU Lesser General Public License v2.1
+# - GPL2 w/ CPE
 # - MIT License
+# - MIT license
 # - Public Domain, per Creative Commons CC0
 # - The Apache License, Version 2.0
 # - The Apache Software License, Version 2.0
 # - The JSON License
+# - The MIT License
 # - The SAX License
 # - The W3C License
 #-------------------------------------------------------------------------------
 # Please fill the missing licenses for dependencies :
 #
 #
-#Wed Jun 19 15:25:06 EEST 2019
-javax.servlet--servlet-api--2.5=CDDL License
-javax.transaction--jta--1.0.1b=Sun Binary Code License Agreement
+#Fri Jun 21 12:08:50 EEST 2019
+javax.transaction--jta--1.1=Sun Binary Code License Agreement
 commons-httpclient--commons-httpclient--3.1-HTTPCLIENT-1265=Apache License 2.0
 org.codehaus.guessencoding--guessencoding--1.4=Apache License 2.0
 dom4j--dom4j--1.6.1=BSD
--- a/alfresco-docker-imagemagick/src/license/THIRD-PARTY.properties
+++ b/alfresco-docker-imagemagick/src/license/THIRD-PARTY.properties
@ -2,28 +2,35 @@
 #-------------------------------------------------------------------------------
 # Already used licenses in project :
 # - Apache 2
+# - Apache 2.0
 # - Apache License 2.0
 # - Apache License, Version 2.0
 # - Apache License, version 2.0
+# - BSD
 # - CDDL + GPLv2 with classpath exception
+# - CDDL 1.1
 # - CDDL+GPL License
+# - CDDL/GPLv2+CE
+# - Eclipse Distribution License - v 1.0
 # - Eclipse Public License - v 1.0
 # - GNU Lesser General Public License
 # - GNU Lesser General Public License v2.1
+# - GPL2 w/ CPE
 # - MIT License
+# - MIT license
 # - Public Domain, per Creative Commons CC0
 # - The Apache License, Version 2.0
 # - The Apache Software License, Version 2.0
 # - The JSON License
+# - The MIT License
 # - The SAX License
 # - The W3C License
 #-------------------------------------------------------------------------------
 # Please fill the missing licenses for dependencies :
 #
 #
-#Wed Jun 19 15:25:21 EEST 2019
-javax.servlet--servlet-api--2.5=CDDL License
-javax.transaction--jta--1.0.1b=Sun Binary Code License Agreement
+#Fri Jun 21 12:09:05 EEST 2019
+javax.transaction--jta--1.1=Sun Binary Code License Agreement
 commons-httpclient--commons-httpclient--3.1-HTTPCLIENT-1265=Apache License 2.0
 org.codehaus.guessencoding--guessencoding--1.4=Apache License 2.0
 dom4j--dom4j--1.6.1=BSD
--- a/alfresco-docker-libreoffice/src/license/THIRD-PARTY.properties
+++ b/alfresco-docker-libreoffice/src/license/THIRD-PARTY.properties
@ -2,28 +2,35 @@
 #-------------------------------------------------------------------------------
 # Already used licenses in project :
 # - Apache 2
+# - Apache 2.0
 # - Apache License 2.0
 # - Apache License, Version 2.0
 # - Apache License, version 2.0
+# - BSD
 # - CDDL + GPLv2 with classpath exception
+# - CDDL 1.1
 # - CDDL+GPL License
+# - CDDL/GPLv2+CE
+# - Eclipse Distribution License - v 1.0
 # - Eclipse Public License - v 1.0
 # - GNU Lesser General Public License
 # - GNU Lesser General Public License v2.1
+# - GPL2 w/ CPE
 # - MIT License
+# - MIT license
 # - Public Domain, per Creative Commons CC0
 # - The Apache License, Version 2.0
 # - The Apache Software License, Version 2.0
 # - The JSON License
+# - The MIT License
 # - The SAX License
 # - The W3C License
 #-------------------------------------------------------------------------------
 # Please fill the missing licenses for dependencies :
 #
 #
-#Wed Jun 19 15:25:36 EEST 2019
-javax.servlet--servlet-api--2.5=CDDL License
-javax.transaction--jta--1.0.1b=Sun Binary Code License Agreement
+#Fri Jun 21 12:09:19 EEST 2019
+javax.transaction--jta--1.1=Sun Binary Code License Agreement
 commons-httpclient--commons-httpclient--3.1-HTTPCLIENT-1265=Apache License 2.0
 org.codehaus.guessencoding--guessencoding--1.4=Apache License 2.0
 dom4j--dom4j--1.6.1=BSD
--- a/alfresco-docker-tika/src/license/THIRD-PARTY.properties
+++ b/alfresco-docker-tika/src/license/THIRD-PARTY.properties
@ -2,6 +2,7 @@
 #-------------------------------------------------------------------------------
 # Already used licenses in project :
 # - (MIT-style) netCDF C library license
+# - Apache 1.1
 # - Apache 2
 # - Apache 2.0
 # - Apache License 2.0
@ -15,7 +16,7 @@
 # - Bouncy Castle Licence
 # - CDDL + GPLv2 with classpath exception
 # - CDDL 1.1
-# - CDDL License
+# - CDDL v1.1 / GPL v2 dual license
 # - CDDL+GPL License
 # - CDDL, v1.0
 # - CDDL/GPLv2+CE
@ -23,6 +24,8 @@
 # - CPL
 # - Common Development and Distribution License (CDDL) v1.0
 # - Dual license consisting of the CDDL v1.1 and GPL v2
+# - EDL 1.0
+# - EPL 2.0
 # - Eclipse Distribution License - v 1.0
 # - Eclipse Public License - v 1.0
 # - GNU General Public Library
@ -33,14 +36,15 @@
 # - LGPL, version 2.1
 # - MIT License
 # - MIT License (MIT)
+# - MIT license
 # - Mozilla Public License 1.1 (MPL 1.1)
 # - New BSD license
 # - OGC copyright
+# - Public
 # - Public Domain
 # - Public Domain, per Creative Commons CC0
 # - Similar to Apache License but with the acknowledgment clause removed
 # - Specification License
-# - Sun Binary Code License Agreement
 # - The Apache License, Version 2.0
 # - The Apache Software License, Version 2.0
 # - The BSD License
@ -49,18 +53,16 @@
 # - The SAX License
 # - The W3C License
 # - UnRar License
-# - http://jaxen.codehaus.org/license.html
 # - lgpl
 #-------------------------------------------------------------------------------
 # Please fill the missing licenses for dependencies :
 #
 #
-#Wed Jun 19 15:51:55 EEST 2019
+#Fri Jun 21 12:08:04 EEST 2019
 org.acegisecurity--acegi-security--0.8.2_patched=Apache License 2.0
-javax.servlet--servlet-api--2.5=CDDL License
-javax.transaction--jta--1.0.1b=Sun Binary Code License Agreement
 net.jcip--jcip-annotations--1.0=Public
 xerces--xercesImpl--2.11.0-alfresco-patched-20180402=Apache License 2.0
+javax.transaction--jta--1.1=Sun Binary Code License Agreement
 commons-httpclient--commons-httpclient--3.1-HTTPCLIENT-1265=Apache License 2.0
 xpp3--xpp3--1.1.3_8=Apache 1.1
 org.codehaus.guessencoding--guessencoding--1.4=Apache License 2.0
--- a/alfresco-docker-transform-misc/pom.xml
+++ b/alfresco-docker-transform-misc/pom.xml
@ -65,7 +65,6 @@
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-compress</artifactId>
-            <version>1.18</version>
        </dependency>

        <!-- TextToPdfContentTransformer -->
--- a/alfresco-docker-transform-misc/src/license/THIRD-PARTY.properties
+++ b/alfresco-docker-transform-misc/src/license/THIRD-PARTY.properties
@ -2,30 +2,37 @@
 #-------------------------------------------------------------------------------
 # Already used licenses in project :
 # - Apache 2
+# - Apache 2.0
 # - Apache License 2.0
 # - Apache License, Version 2.0
 # - Apache License, version 2.0
+# - BSD
 # - BSD License
 # - CDDL + GPLv2 with classpath exception
+# - CDDL 1.1
 # - CDDL+GPL License
+# - CDDL/GPLv2+CE
 # - Common Public License
+# - Eclipse Distribution License - v 1.0
 # - Eclipse Public License - v 1.0
 # - GNU Lesser General Public License
 # - GNU Lesser General Public License v2.1
+# - GPL2 w/ CPE
 # - MIT License
+# - MIT license
 # - Public Domain, per Creative Commons CC0
 # - The Apache License, Version 2.0
 # - The Apache Software License, Version 2.0
 # - The JSON License
+# - The MIT License
 # - The SAX License
 # - The W3C License
 #-------------------------------------------------------------------------------
 # Please fill the missing licenses for dependencies :
 #
 #
-#Wed Jun 19 15:25:51 EEST 2019
-javax.servlet--servlet-api--2.5=CDDL License
-javax.transaction--jta--1.0.1b=Sun Binary Code License Agreement
+#Fri Jun 21 12:09:33 EEST 2019
+javax.transaction--jta--1.1=Sun Binary Code License Agreement
 commons-httpclient--commons-httpclient--3.1-HTTPCLIENT-1265=Apache License 2.0
 org.codehaus.guessencoding--guessencoding--1.4=Apache License 2.0
 dom4j--dom4j--1.6.1=BSD
--- a/pom.xml
+++ b/pom.xml
@ -18,13 +18,14 @@
        <java.version>1.8</java.version>
        <image.tag>latest</image.tag>
        <dependency.pdfbox.version>2.0.15</dependency.pdfbox.version>
-        <dependency.alfresco-core.version>7.3</dependency.alfresco-core.version>
-        <dependency.alfresco-data-model.version>8.8</dependency.alfresco-data-model.version>
+        <dependency.alfresco-core.version>7.17</dependency.alfresco-core.version>
+        <dependency.alfresco-data-model.version>8.39</dependency.alfresco-data-model.version>
        <dependency.alfresco-jodconverter-core.version>3.0.1.1</dependency.alfresco-jodconverter-core.version>
        <env.project_version>${project.version}</env.project_version>
        <dependency.alfresco-transform-model.version>1.0.2.3</dependency.alfresco-transform-model.version>
        <dependency.activemq.version>5.15.9</dependency.activemq.version>
        <dependency.jackson.version>2.9.9</dependency.jackson.version>
+        <dependency.cxf.version>3.2.9</dependency.cxf.version>
    </properties>

    <modules>
@ -76,10 +77,30 @@
                <version>${dependency.alfresco-transform-model.version}</version>
            </dependency>
            <!-- via Data Model / OpenCMIS Client -->
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-core</artifactId>
+                <version>${dependency.cxf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-rs-client</artifactId>
+                <version>${dependency.cxf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-frontend-jaxws</artifactId>
+                <version>${dependency.cxf.version}</version>
+            </dependency>
            <dependency>
                <groupId>org.apache.cxf</groupId>
                <artifactId>cxf-rt-transports-http</artifactId>
-                <version>3.3.2</version>
+                <version>${dependency.cxf.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-ws-policy</artifactId>
+                <version>${dependency.cxf.version}</version>
            </dependency>
            <!-- Jackson -->
            <dependency>
@ -118,6 +139,29 @@
                <artifactId>activemq-client</artifactId>
                <version>${dependency.activemq.version}</version>
            </dependency>
+            <!-- Google Guava -->
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>28.0-jre</version>
+            </dependency>
+            <!-- Junrar & compression -->
+            <dependency>
+                <groupId>com.github.junrar</groupId>
+                <artifactId>junrar</artifactId>
+                <version>1.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-compress</artifactId>
+                <version>1.18</version>
+            </dependency>
+            <!-- Jsoup -->
+            <dependency>
+                <groupId>org.jsoup</groupId>
+                <artifactId>jsoup</artifactId>
+                <version>1.12.1</version>
+            </dependency>
        </dependencies>
    </dependencyManagement>