sync trunk

[cdmlib.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index b122f0d2942c368c34b24f771d56106669fedfc0..415084d582bf1eff4ae02052243c66ce6e421061 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>cdmlib-parent</artifactId>
-       <version>3.0.5-SNAPSHOT</version>
+       <version>3.0.6-SNAPSHOT</version>
        <name>CDM Library</name>
        <description>The Java implementation of the Common Data Model (CDM), the data model for EDIT's internet platform for cybertaxonomy.</description>
        <url>http://wp5.e-taxonomy.eu/cdmlib/</url>
@@ -430,7 +430,7 @@
           <allowTimestampedSnapshots>true</allowTimestampedSnapshots>
           <autoVersionSubmodules>true</autoVersionSubmodules>
           <preparationGoals>clean verify install</preparationGoals>
-                 <preparationGoals>deploy</preparationGoals><!-- skipping site-deploy by explicitly configuring the goal here -->
+                 <goals>deploy</goals><!-- skipping site-deploy by explicitly configuring the goal here -->
           <tagBase>http://dev.e-taxonomy.eu/svn/tags/cdmlib</tagBase>
         </configuration>
       </plugin>
@@ -1103,8 +1103,8 @@
                        <dependency>
                                <groupId>org.springframework.security</groupId>
                                <artifactId>spring-security-core</artifactId>
-                               <version>3.0.0.RELEASE</version>
-                               <exclusions>
+                               <version>3.0.5.RELEASE</version>
+                               <!--<exclusions>
                                        <exclusion>
                                                <groupId>org.springframework</groupId>
                                                <artifactId>spring-context</artifactId>
@@ -1125,7 +1125,12 @@
                                                <groupId>org.springframework</groupId>
                                                <artifactId>spring-support</artifactId>
                                        </exclusion>
-                               </exclusions>
+                               </exclusions>-->
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework.security</groupId>
+                               <artifactId>spring-security-context</artifactId>
+                               <version>3.0.5.RELEASE</version>
                        </dependency>
                        <!-- ******* SERVLET/JSP/JSF ******* -->
                        <dependency>