[openmeetings] branch master updated: [OPENMEETINGS-1928] wicketstuff and tika are updated

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new a23ca62  [OPENMEETINGS-1928] wicketstuff and tika are updated
a23ca62 is described below

commit a23ca6226ef626b89f6f223751f5c7e6537a696b
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Wed Sep 19 00:34:11 2018 +0700

    [OPENMEETINGS-1928] wicketstuff and tika are updated
---
 .../openmeetings/web/room/poll/PollResultsDialog.java | 19 +++++++++----------
 pom.xml                                               |  4 ++--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
index 7204be6..b573056 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
@@ -46,6 +46,15 @@ import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.wicketstuff.jqplot.behavior.JqPlotBehavior;
 import org.wicketstuff.jqplot.behavior.JqPlotCssResourceReference;
 import org.wicketstuff.jqplot.behavior.JqPlotJavascriptResourceReference;
+import org.wicketstuff.jqplot.lib.Chart;
+import org.wicketstuff.jqplot.lib.ChartConfiguration;
+import org.wicketstuff.jqplot.lib.JqPlotResources;
+import org.wicketstuff.jqplot.lib.JqPlotUtils;
+import org.wicketstuff.jqplot.lib.chart.BarChart;
+import org.wicketstuff.jqplot.lib.chart.PieChart;
+import org.wicketstuff.jqplot.lib.elements.Highlighter;
+import org.wicketstuff.jqplot.lib.elements.Location;
+import org.wicketstuff.jqplot.lib.elements.RendererOptions;
 
 import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog;
 import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
@@ -53,16 +62,6 @@ import 
com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons;
 import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon;
 import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
 
-import br.com.digilabs.jqplot.Chart;
-import br.com.digilabs.jqplot.ChartConfiguration;
-import br.com.digilabs.jqplot.JqPlotResources;
-import br.com.digilabs.jqplot.JqPlotUtils;
-import br.com.digilabs.jqplot.chart.BarChart;
-import br.com.digilabs.jqplot.chart.PieChart;
-import br.com.digilabs.jqplot.elements.Highlighter;
-import br.com.digilabs.jqplot.elements.Location;
-import br.com.digilabs.jqplot.elements.RendererOptions;
-
 /**
  * @author solomax
  *
diff --git a/pom.xml b/pom.xml
index 75b52d3..1b991d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
                <junit.version>4.12</junit.version>
                <wicket.version>8.1.0</wicket.version>
                <wicketju.version>8.0.0</wicketju.version>
-               <wickets.version>8.0.0</wickets.version>
+               <wickets.version>8.1.0</wickets.version>
                <red5-client.version>1.0.10-M9</red5-client.version>
                <spring.version>5.0.9.RELEASE</spring.version>
                <mina.version>2.0.19</mina.version>
@@ -105,7 +105,7 @@
                <xstream.version>1.4.10</xstream.version>
                <api-all.version>2.0.0.AM2</api-all.version>
                <caldav4j.version>0.9.1</caldav4j.version>
-               <tika-parsers.version>1.18</tika-parsers.version>
+               <tika-parsers.version>1.19</tika-parsers.version>
                <commons-text.version>1.4</commons-text.version>
                <slf4j.version>1.7.25</slf4j.version>
                <logback.version>1.2.3</logback.version>