This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 8e1e0e4 [OPENMEETINGS-1928] wicketstuff and tika are updated
8e1e0e4 is described below
commit 8e1e0e4bdd01309511253f784b4d3f5e10c412ce
Author: Maxim Solodovnik <[email protected]>
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 468a2d8..8a1283b 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.request.resource.JavaScriptResourceReference;
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 457e60f..0c90f33 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-server.version>1.0.10-M9</red5-server.version>
<red5-client.version>1.0.10-M9</red5-client.version>
<spring.version>5.0.9.RELEASE</spring.version>
@@ -106,7 +106,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>
<license.excludedScopes>test</license.excludedScopes>
<bcprov-jdk15on.version>1.60</bcprov-jdk15on.version>