From 5fc11e44f22b68119259fdfcb875241701fddfd9 Mon Sep 17 00:00:00 2001 From: Maxim Solodovnik Date: Sun, 19 Nov 2017 18:12:11 +0700 Subject: [PATCH] Libraries are updated to the most recent versions --- datastores-parent/datastore-cassandra/pom.xml | 2 +- datastores-parent/datastore-hazelcast/pom.xml | 2 +- datastores-parent/datastore-ignite/pom.xml | 2 +- datatables-parent/datatables-examples/pom.xml | 2 +- datatables-parent/datatables/pom.xml | 4 ++-- datatables-parent/pom.xml | 3 +++ .../gae-initializer-example/pom.xml | 2 +- gchart-parent/gchart/pom.xml | 2 +- .../handlers/HtmlResourceHandler.java | 4 ++-- jee-web-parent/pom.xml | 2 +- openlayers3-parent/openlayers3/pom.xml | 5 +++++ openlayers3-parent/pom.xml | 10 ++++----- pom.xml | 22 ++++++++++--------- select2-parent/select2/pom.xml | 2 +- serializer-fast2/pom.xml | 2 +- tinymce3-parent/tinymce3/pom.xml | 2 +- tinymce4-parent/tinymce4/pom.xml | 2 +- 17 files changed, 40 insertions(+), 30 deletions(-) diff --git a/datastores-parent/datastore-cassandra/pom.xml b/datastores-parent/datastore-cassandra/pom.xml index 543c289fbe..6cda5c2346 100644 --- a/datastores-parent/datastore-cassandra/pom.xml +++ b/datastores-parent/datastore-cassandra/pom.xml @@ -31,7 +31,7 @@ com.datastax.cassandra cassandra-driver-core - 3.3.0 + 3.3.1 /home/martin/appengine/appengine-java-sdk-1.9.7 - 1.9.57 + 1.9.59 test diff --git a/gchart-parent/gchart/pom.xml b/gchart-parent/gchart/pom.xml index e3b4a0378d..91f19446f2 100644 --- a/gchart-parent/gchart/pom.xml +++ b/gchart-parent/gchart/pom.xml @@ -63,7 +63,7 @@ net.javacrumbs.json-unit json-unit - 1.25.0 + 1.25.1 test diff --git a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/HtmlResourceHandler.java b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/HtmlResourceHandler.java index 858f18aa35..d6cb876e3b 100644 --- a/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/HtmlResourceHandler.java +++ b/jasperreports-parent/jasperreports/src/main/java/org/wicketstuff/jasperreports/handlers/HtmlResourceHandler.java @@ -20,7 +20,7 @@ import java.io.Serializable; import net.sf.jasperreports.engine.JRAbstractExporter; -import net.sf.jasperreports.engine.export.JRHtmlExporter; +import net.sf.jasperreports.engine.export.HtmlExporter; /** * @author cdeal @@ -34,7 +34,7 @@ public class HtmlResourceHandler implements IJRResourceHandler, Serializable */ public JRAbstractExporter newExporter() { - return new JRHtmlExporter(); + return new HtmlExporter(); } /** diff --git a/jee-web-parent/pom.xml b/jee-web-parent/pom.xml index 9129d27825..a6a9aad2ef 100644 --- a/jee-web-parent/pom.xml +++ b/jee-web-parent/pom.xml @@ -23,7 +23,7 @@ jee-web-examples - 2.1.13 + 2.2.15 diff --git a/openlayers3-parent/openlayers3/pom.xml b/openlayers3-parent/openlayers3/pom.xml index fcd551c36e..868d74d708 100644 --- a/openlayers3-parent/openlayers3/pom.xml +++ b/openlayers3-parent/openlayers3/pom.xml @@ -50,6 +50,11 @@ org.slf4j slf4j-api + + com.google.guava + guava + ${guava.version} + org.slf4j slf4j-log4j12 diff --git a/openlayers3-parent/pom.xml b/openlayers3-parent/pom.xml index a0b406869c..232a7e9b30 100644 --- a/openlayers3-parent/pom.xml +++ b/openlayers3-parent/pom.xml @@ -5,10 +5,10 @@ 4.0.0 - org.wicketstuff - wicketstuff-core - 8.0.0-SNAPSHOT - + org.wicketstuff + wicketstuff-core + 8.0.0-SNAPSHOT + openlayers3-parent pom @@ -35,7 +35,7 @@ de.agilecoders.wicket.webjars wicket-webjars - 0.5.3 + ${wicket-webjars.version} org.webjars diff --git a/pom.xml b/pom.xml index d1783cf140..4de485e0db 100644 --- a/pom.xml +++ b/pom.xml @@ -227,7 +227,7 @@ false false - 5.2.11.Final + 5.2.12.Final 3.22.0-CR2 9.4.7.v20170914 2.1.1 @@ -235,13 +235,15 @@ 1.7.25 1.2.3 1.2.17 - 4.3.11.RELEASE + 4.3.12.RELEASE 3.2.5 2.6 2.12.3 - 2.9.1 + 2.9.2 3.17 - 23.1-jre + 23.4-jre + 2.0.4 + 2.6 @@ -481,13 +483,13 @@ org.easymock easymock - 3.5 + 3.5.1 test org.mockito mockito-core - 2.10.0 + 2.12.0 test @@ -529,7 +531,7 @@ org.apache.commons commons-lang3 - 3.6 + 3.7 @@ -584,7 +586,7 @@ org.hibernate hibernate-validator - 6.0.2.Final + 6.0.5.Final @@ -657,7 +659,7 @@ com.google.javascript closure-compiler - v20170910 + v20171112 com.ibatis @@ -687,7 +689,7 @@ net.sf.jasperreports jasperreports - 6.4.1 + 6.4.3 joda-time diff --git a/select2-parent/select2/pom.xml b/select2-parent/select2/pom.xml index d82482504f..2851777b7d 100755 --- a/select2-parent/select2/pom.xml +++ b/select2-parent/select2/pom.xml @@ -53,7 +53,7 @@ de.agilecoders.wicket.webjars wicket-webjars - 2.0.3 + ${wicket-webjars.version} diff --git a/serializer-fast2/pom.xml b/serializer-fast2/pom.xml index 9061a6ecdf..917dac5849 100644 --- a/serializer-fast2/pom.xml +++ b/serializer-fast2/pom.xml @@ -31,7 +31,7 @@ de.ruedigermoeller fst - 2.54 + 2.56 org.eclipse.jetty.aggregate diff --git a/tinymce3-parent/tinymce3/pom.xml b/tinymce3-parent/tinymce3/pom.xml index 1b5d0ffe72..9df1c130e8 100644 --- a/tinymce3-parent/tinymce3/pom.xml +++ b/tinymce3-parent/tinymce3/pom.xml @@ -35,7 +35,7 @@ commons-io commons-io - 2.5 + ${commons-io.version} junit diff --git a/tinymce4-parent/tinymce4/pom.xml b/tinymce4-parent/tinymce4/pom.xml index af5643fd32..1791fa8132 100644 --- a/tinymce4-parent/tinymce4/pom.xml +++ b/tinymce4-parent/tinymce4/pom.xml @@ -36,7 +36,7 @@ commons-io commons-io - 2.5 + ${commons-io.version} junit