Rsf 14

.gitignore

@@ -0,0 +1,31 @@
+/.classpath
+/.project
+/.settings
+api/.classpath
+api/.project
+api/.settings
+api/bin
+api/m2-target
+api/target
+/bin
+impl/.classpath
+impl/.project
+impl/.settings
+impl/bin
+impl/m2-target
+impl/target
+/m2-target
+pack/.classpath
+pack/.project
+pack/.settings
+pack/bin
+pack/m2-target
+pack/target
+/target
+tool/.classpath
+tool/.project
+tool/.settings
+tool/bin
+tool/m2-target
+tool/src/webapp/content/js/facebox/facebox_og.js
+tool/target

pom.xml

@@ -15,6 +15,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jservletutil.version>1.2.6-SNAPSHOT</jservletutil.version>
     <project.scm.id>rsf-github</project.scm.id>
+    <kernel.spring.version>3.2.13.RELEASE</kernel.spring.version>
   </properties>
   <organization>
     <name>CARET, University of Cambridge</name>
@@ -78,14 +79,14 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>2.3</version>
+      <version>2.4</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>3.1.2.RELEASE</version>
+      <version>${kernel.spring.version}</version>
       <type>jar</type>
       <exclusions>
         <exclusion>
@@ -98,7 +99,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.1.2.RELEASE</version>
+      <version>${kernel.spring.version}</version>
       <type>jar</type>
       <exclusions>
         <exclusion>
@@ -128,12 +129,12 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
+      <version>1.2</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>3.1.2.RELEASE</version>
+      <version>${kernel.spring.version}</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>