From: Dan Timoney Date: Tue, 14 Jan 2020 02:49:19 +0000 (+0000) Subject: Merge "Update versions of dependencies" X-Git-Tag: 1.5.1~4 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9209a391b8e0d2257374bd2ebb02f3254f2f3dec;hp=230b27ce705dec5c27e245e67df5b3897f9560e4;p=ccsdk%2Fparent.git Merge "Update versions of dependencies" --- diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index 56aeb0b0..b8794ea9 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -33,7 +33,7 @@ ch.vorburger.mariaDB4j mariaDB4j - 2.2.3 + 2.4.0 test @@ -44,10 +44,15 @@ com.fasterxml.jackson jackson-bom - 2.9.8 + 2.10.1 pom import + + com.google.protobuf + protobuf-java + 3.6.1 + com.google.protobuf protobuf-java-util @@ -56,7 +61,7 @@ com.jayway.jsonpath json-path - 2.3.0 + 2.4.0 commons-lang @@ -71,17 +76,17 @@ io.grpc grpc-netty - 1.17.1 + 1.21.1 io.grpc grpc-protobuf - 1.17.1 + 1.21.1 io.grpc grpc-stub - 1.17.1 + 1.21.1 io.grpc @@ -91,12 +96,12 @@ io.swagger swagger-annotations - 1.5.22 + 1.6.0 io.swagger swagger-core - 1.5.22 + 1.6.0 javax @@ -117,7 +122,7 @@ org.apache.commons commons-text - 1.1 + 1.6 org.apache.derby @@ -128,12 +133,12 @@ org.apache.httpcomponents httpcore - 4.4.10 + 4.4.12 org.apache.httpcomponents httpclient - 4.5.6 + 4.5.10 org.apache.tomcat @@ -153,35 +158,30 @@ org.glassfish.jersey jersey-bom - 2.25.1 + 2.29.1 pom import - - com.google.protobuf - protobuf-java - 3.6.1 - org.jsoup jsoup - 1.8.3 + 1.12.1 test org.mariadb.jdbc mariadb-java-client - 2.1.1 + 2.4.4 org.slf4j jcl-over-slf4j - 1.7.25 + 1.7.29 org.testng testng - 6.11 + 6.14.3 diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index bbb96170..33f1cd1a 100644 --- a/dependencies-odl-bom/pom.xml +++ b/dependencies-odl-bom/pom.xml @@ -93,7 +93,7 @@ ch.vorburger.mariaDB4j mariaDB4j - 2.2.3 + 2.4.0 test @@ -106,6 +106,7 @@ hppc 0.7.1 + com.fasterxml.jackson jackson-bom @@ -121,13 +122,13 @@ com.github.tomakehurst wiremock - 2.7.1 + 2.25.1 test com.google.code.gson gson - 2.8.5 + 2.8.6 com.google.protobuf @@ -137,7 +138,7 @@ com.jayway.jsonpath json-path - 2.3.0 + 2.4.0 com.ning @@ -159,6 +160,7 @@ jsr166e 1.1.0 + commons-collections commons-collections @@ -169,11 +171,13 @@ commons-cli 1.3.1 + commons-io commons-io 2.6 + commons-logging commons-logging @@ -184,31 +188,33 @@ dom4j 1.6.1 + io.netty netty-bom 4.1.34.Final pom + io.grpc grpc-netty - 1.17.1 + 1.21.1 io.grpc grpc-protobuf - 1.17.1 + 1.21.1 io.grpc grpc-stub - 1.17.1 + 1.21.1 io.grpc grpc-testing - 1.17.1 + 1.21.1 jakarta-regexp @@ -220,6 +226,7 @@ javaee-api 7.0 + javax.servlet javax.servlet-api @@ -230,6 +237,7 @@ servlet-api 2.5 + joda-time joda-time @@ -246,11 +254,13 @@ commons-io 1.3.2 + org.apache.commons commons-lang3 3.8.1 + org.apache.commons commons-text @@ -265,13 +275,15 @@ org.apache.httpcomponents httpcore - 4.4.10 + 4.4.12 org.apache.httpcomponents httpclient - 4.5.6 + 4.5.10 + + org.apache.lucene lucene-analyzers-common @@ -345,8 +357,9 @@ org.apache.sling org.apache.sling.testing.osgi-mock - 2.3.2 + 2.3.10 + org.apache.sshd sshd-core @@ -370,23 +383,27 @@ org.codehaus.jettison jettison - 1.3.8 + 1.4.0 + org.eclipse.jetty jetty-servlet 9.4.12.v20180830 + org.eclipse.jetty jetty-servlets 9.4.12.v20180830 + org.eclipse.jetty.websocket websocket-api 9.4.12.v20180830 + org.eclipse.jetty.websocket websocket-servlet @@ -407,6 +424,7 @@ delete-by-query 2.2.0 + org.glassfish.jersey jersey-bom @@ -422,7 +440,7 @@ org.java-websocket Java-WebSocket - 1.3.8 + 1.4.0 org.joda @@ -438,40 +456,40 @@ org.jsoup jsoup - 1.8.3 + 1.12.1 test org.mariadb.jdbc mariadb-java-client - 2.1.1 + 2.4.4 org.powermock powermock-api-mockito2 - 1.6.6 + 1.7.4 org.powermock powermock-module-junit4 - 1.6.6 + 1.7.4 org.slf4j jcl-over-slf4j - 1.7.25 + 1.7.29 org.springframework spring-framework-bom - 4.3.24.RELEASE + 4.3.25.RELEASE pom import org.testng testng - 6.11 + 6.14.3 org.yaml diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 5bb2dea4..8c1e434c 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -170,14 +170,14 @@ 1.0.0 - 4.4.10 - 4.5.6 + 4.4.12 + 4.5.10 10.14.2.0 1.0.0 - 1.17.1 - 2.1.1 - 2.2.3 - 6.11 + 1.21.1 + 2.4.4 + 2.4.0 + 6.14.3 9.0.27 9.4.12.v20180830 true diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index e8673c62..d1dc5738 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -170,14 +170,14 @@ 1.0.0 - 4.4.10 - 4.5.6 + 4.4.12 + 4.5.10 10.14.2.0 1.0.0 - 1.17.1 - 2.1.1 - 2.2.3 - 6.11 + 1.21.1 + 2.4.4 + 2.4.0 + 6.14.3 9.0.27 9.4.12.v20180830 true diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index 0536d779..1ce404e6 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -170,14 +170,14 @@ 1.0.0 - 4.4.10 - 4.5.6 + 4.4.12 + 4.5.10 10.14.2.0 1.0.0 - 1.17.1 - 2.1.1 - 2.2.3 - 6.11 + 1.21.1 + 2.4.4 + 2.4.0 + 6.14.3 9.0.27 9.4.12.v20180830 true diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index da23632d..164e3b12 100644 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@ -170,14 +170,14 @@ 1.0.0 - 4.4.10 - 4.5.6 + 4.4.12 + 4.5.10 10.14.2.0 1.0.0 - 1.17.1 - 2.1.1 - 2.2.3 - 6.11 + 1.21.1 + 2.4.4 + 2.4.0 + 6.14.3 9.0.27 9.4.12.v20180830 true diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 5b2d9277..40420744 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -170,14 +170,14 @@ 1.0.0 - 4.4.10 - 4.5.6 + 4.4.12 + 4.5.10 10.14.2.0 1.0.0 - 1.17.1 - 2.1.1 - 2.2.3 - 6.11 + 1.21.1 + 2.4.4 + 2.4.0 + 6.14.3 9.0.27 9.4.12.v20180830 true diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index d907e309..b3f9a87c 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -170,14 +170,14 @@ 1.0.0 - 4.4.10 - 4.5.6 + 4.4.12 + 4.5.10 10.14.2.0 1.0.0 - 1.17.1 - 2.1.1 - 2.2.3 - 6.11 + 1.21.1 + 2.4.4 + 2.4.0 + 6.14.3 9.0.27 9.4.12.v20180830 true diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index a727d778..651874d8 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -170,14 +170,14 @@ 1.0.0 - 4.4.10 - 4.5.6 + 4.4.12 + 4.5.10 10.14.2.0 1.0.0 - 1.17.1 - 2.1.1 - 2.2.3 - 6.11 + 1.21.1 + 2.4.4 + 2.4.0 + 6.14.3 9.0.27 9.4.12.v20180830 true diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index 30b76494..d663031b 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -170,14 +170,14 @@ 1.0.0 - 4.4.10 - 4.5.6 + 4.4.12 + 4.5.10 10.14.2.0 1.0.0 - 1.17.1 - 2.1.1 - 2.2.3 - 6.11 + 1.21.1 + 2.4.4 + 2.4.0 + 6.14.3 9.0.27 9.4.12.v20180830 true diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index 0246a827..809676c7 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -170,14 +170,14 @@ 1.0.0 - 4.4.10 - 4.5.6 + 4.4.12 + 4.5.10 10.14.2.0 1.0.0 - 1.17.1 - 2.1.1 - 2.2.3 - 6.11 + 1.21.1 + 2.4.4 + 2.4.0 + 6.14.3 9.0.27 9.4.12.v20180830 true diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index 10387b2f..63c1c50f 100755 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -97,7 +97,7 @@ ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} - 2.1.1 + 2.4.4 direct-dependencies.txt diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index 2dd82600..c1034b94 100755 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -109,8 +109,8 @@ 0.5.0 1.9.3 - 4.4.10 - 4.5.6 + 4.4.12 + 4.5.10 10.14.2.0 1.0.0 1.25.0 @@ -121,8 +121,8 @@ 1.3.8 4.12 1.2.3 - 2.1.1 - 2.2.3 + 2.4.4 + 2.4.0 1.7.25 6.11 9.0.27