Author: solomax
Date: Tue Nov 8 13:33:17 2016
New Revision: 1768691
URL: http://svn.apache.org/viewvc?rev=1768691&view=rev
Log:
[OPENMEETINGS-1467] wicket version is updated
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml
openmeetings/application/branches/3.1.x/pom.xml
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml?rev=1768691&r1=1768690&r2=1768691&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml Tue Nov 8
13:33:17 2016
@@ -383,7 +383,7 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket-javax</artifactId>
- <version>${wicket.version}</version>
+ <version>${wicketws.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
@@ -437,17 +437,6 @@
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
- <artifactId>wicketstuff-whiteboard</artifactId>
- <version>${wickets.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.wicket</groupId>
-
<artifactId>wicket-native-websocket-tomcat</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-select2</artifactId>
<version>${wickets.version}</version>
</dependency>
Modified: openmeetings/application/branches/3.1.x/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/pom.xml?rev=1768691&r1=1768690&r2=1768691&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/pom.xml Tue Nov 8 13:33:17 2016
@@ -40,9 +40,10 @@
<maven.javadoc.version>2.10.3</maven.javadoc.version>
<maven.surefire.version>2.19.1</maven.surefire.version>
<maven-site.version>3.5.1</maven-site.version>
- <wicket.version>7.4.0</wicket.version>
+ <wicket.version>7.5.0</wicket.version>
<wicketju.version>7.4.0</wicketju.version>
- <wickets.version>7.4.0</wickets.version>
+ <wickets.version>7.5.0</wickets.version>
+ <wicketws.version>7.4.0</wicketws.version>
<red5-server.version>1.0.8-M13</red5-server.version>
<red5-client.version>1.0.8-M13</red5-client.version>
<spring.version>4.3.3.RELEASE</spring.version>
@@ -763,6 +764,7 @@
<target>1.8</target>
<optimize>true</optimize>
<debug>true</debug>
+ <encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
