From 43b586a565cc93259d225e881a9a12b2503794a7 Mon Sep 17 00:00:00 2001 From: CezarLeahu <35226487+CezarLeahu@users.noreply.github.com> Date: Mon, 24 Jun 2019 17:41:51 +0300 Subject: [PATCH] ATS-443 : Dependency updates (#59) --- .../src/license/THIRD-PARTY.properties | 13 +++-- .../src/license/THIRD-PARTY.properties | 13 +++-- .../src/license/THIRD-PARTY.properties | 13 +++-- .../src/license/THIRD-PARTY.properties | 14 +++--- alfresco-docker-transform-misc/pom.xml | 1 - .../src/license/THIRD-PARTY.properties | 13 +++-- pom.xml | 50 +++++++++++++++++-- 7 files changed, 95 insertions(+), 22 deletions(-) diff --git a/alfresco-docker-alfresco-pdf-renderer/src/license/THIRD-PARTY.properties b/alfresco-docker-alfresco-pdf-renderer/src/license/THIRD-PARTY.properties index 994f8ec9..1c9f0703 100644 --- 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 diff --git a/alfresco-docker-imagemagick/src/license/THIRD-PARTY.properties b/alfresco-docker-imagemagick/src/license/THIRD-PARTY.properties index c238a682..28289f6e 100644 --- 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 diff --git a/alfresco-docker-libreoffice/src/license/THIRD-PARTY.properties b/alfresco-docker-libreoffice/src/license/THIRD-PARTY.properties index 5f080000..3266375a 100644 --- 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 diff --git a/alfresco-docker-tika/src/license/THIRD-PARTY.properties b/alfresco-docker-tika/src/license/THIRD-PARTY.properties index 7931bbe8..d522096b 100644 --- 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 diff --git a/alfresco-docker-transform-misc/pom.xml b/alfresco-docker-transform-misc/pom.xml index 4f84e697..7ba44fc3 100644 --- a/alfresco-docker-transform-misc/pom.xml +++ b/alfresco-docker-transform-misc/pom.xml @@ -65,7 +65,6 @@ org.apache.commons commons-compress - 1.18 diff --git a/alfresco-docker-transform-misc/src/license/THIRD-PARTY.properties b/alfresco-docker-transform-misc/src/license/THIRD-PARTY.properties index 360e13ae..d886e03b 100644 --- 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 diff --git a/pom.xml b/pom.xml index a8c3c556..7e82ed8a 100644 --- a/pom.xml +++ b/pom.xml @@ -18,13 +18,14 @@ 1.8 latest 2.0.15 - 7.3 - 8.8 + 7.17 + 8.39 3.0.1.1 ${project.version} 1.0.2.3 5.15.9 2.9.9 + 3.2.9 @@ -76,10 +77,30 @@ ${dependency.alfresco-transform-model.version} + + org.apache.cxf + cxf-core + ${dependency.cxf.version} + + + org.apache.cxf + cxf-rt-rs-client + ${dependency.cxf.version} + + + org.apache.cxf + cxf-rt-frontend-jaxws + ${dependency.cxf.version} + org.apache.cxf cxf-rt-transports-http - 3.3.2 + ${dependency.cxf.version} + + + org.apache.cxf + cxf-rt-ws-policy + ${dependency.cxf.version} @@ -118,6 +139,29 @@ activemq-client ${dependency.activemq.version} + + + com.google.guava + guava + 28.0-jre + + + + com.github.junrar + junrar + 1.0.1 + + + org.apache.commons + commons-compress + 1.18 + + + + org.jsoup + jsoup + 1.12.1 +