Changeset 6755 for vlo/branches/vlo-3.3-oeaw/vlo-web-app/pom.xml

Timestamp:

11/09/15 13:36:42 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

merged with trunk 3.4

File:

• vlo/branches/vlo-3.3-oeaw/vlo-web-app/pom.xml (modified) (2 diffs)

vlo/branches/vlo-3.3-oeaw/vlo-web-app/pom.xml

@@ -7 +7 @@
         <groupId>eu.clarin.cmdi</groupId>
         <artifactId>vlo</artifactId>
-        <version>3.3-SNAPSHOT</version>
+        <version>3.4-SNAPSHOT</version>
     </parent>
     
@@ -14 +14 @@
     <artifactId>vlo-web-app</artifactId>
     <packaging>war</packaging>
-    <version>3.3-SNAPSHOT</version>
+    <version>3.4-SNAPSHOT</version>
     <name>VLO Web Application</name>
     <description></description>
 
     <properties>
-        <wicket.version>6.19.0</wicket.version>
-        <spring.version>3.2.13.RELEASE</spring.version>
+        <wicket.version>7.0.0</wicket.version>
+        <spring.version>4.2.0.RELEASE</spring.version>
         <jetty.version>8.1.17.v20150415</jetty.version>
         <!-- selects the appender for the log4j root logger -->