From e770e7c81720c79c2521f2aca9d72378f52f84da Mon Sep 17 00:00:00 2001
From: Julian Hochstetter <julian.hochstetter@mni.thm.de>
Date: Fri, 7 Sep 2012 14:14:27 +0200
Subject: [PATCH] introduce spring version property add spring-test and junit
add jetty plugin which allows mvn jetty:run
---
pom.xml | 54 +++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 37 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 42d2c64e2..8716fb950 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,6 +5,9 @@
<artifactId>arsnova-war</artifactId>
<version>2.0.0-SNAPSHOT</version>
<packaging>war</packaging>
+ <properties>
+ <spring.version>3.0.7.RELEASE</spring.version>
+ </properties>
<repositories>
<repository>
<id>thmrepo</id>
@@ -16,7 +19,7 @@
<name>THM Maven Mirror</name>
<url>http://maven.mni.thm.de/content/groups/public</url>
</repository>
- </repositories>
+ </repositories>
<dependencies>
<dependency>
<groupId>de.thm.arsnova</groupId>
@@ -33,22 +36,22 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
- <version>3.0.7.RELEASE</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-cas-client</artifactId>
- <version>3.0.7.RELEASE</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
- <version>3.0.7.RELEASE</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-openid</artifactId>
- <version>3.0.7.RELEASE</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.social</groupId>
@@ -63,7 +66,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>3.0.7.RELEASE</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>jstl</groupId>
@@ -92,21 +95,32 @@
<version>1.6.6</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- </dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
<dependency>
<groupId>couchdb4j</groupId>
- <artifactId>couchdb4j</artifactId>
- <version>0.3.0-i386-1</version>
+ <artifactId>couchdb4j</artifactId>
+ <version>0.3.0-i386-1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -119,6 +133,12 @@
<target>1.6</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>7.6.5.v20120716</version>
+ </plugin>
</plugins>
</build>
+
</project>
--
GitLab