using spring security for user management

[cdmlib.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index d063e104578b475fd60330b8fd888f192fd8d478..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>
@@ -157,7 +157,7 @@
                        <!-- your SVN account id please! -->
                        <id>f.revilla</id>
                        <name>
-                               Francisco Revilla       
+                               Francisco Revilla
                        </name>
                        <email>f.revilla [at] bgbm.org</email>
                        <organization>
@@ -370,17 +370,17 @@
                                        <htmlStylesheet>resources/css/html.css</htmlStylesheet>
                                        <xincludeSupported>true</xincludeSupported>
                                        <!--<htmlCustomization>src/docbkx/resources/xsl/html_chunk.xsl</htmlCustomization>-->
-                                       <!-- if anyone can get the xsl-fo customization to work properly, then by all 
-               means use it
-            <foCustomization>src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
-          -->
+                                       <!-- if anyone can get the xsl-fo customization to work properly, then by all
+                                               means use it
+                                               <foCustomization>src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
+                                       -->
                                        <entities>
                                                <entity>
                                                        <name>version</name>
                                                        <value>${project.version}</value>
                                                </entity>
                                        </entities>
-                                       <!--We want the final documentation and the required resources to end up in 
+                                       <!--We want the final documentation and the required resources to end up in
               the right place-->
                                        <postProcess>
                                                <copy todir="target/site/reference">
@@ -429,7 +429,8 @@
         <configuration>
           <allowTimestampedSnapshots>true</allowTimestampedSnapshots>
           <autoVersionSubmodules>true</autoVersionSubmodules>
-          <preparationGoals>clean install</preparationGoals> 
+          <preparationGoals>clean verify install</preparationGoals>
+                 <goals>deploy</goals><!-- skipping site-deploy by explicitly configuring the goal here -->
           <tagBase>http://dev.e-taxonomy.eu/svn/tags/cdmlib</tagBase>
         </configuration>
       </plugin>
@@ -509,7 +510,7 @@
                                        </executions>
                                -->
                        </plugin>
-                       <!--                    
+                       <!--
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-project-info-reports-plugin</artifactId>
@@ -551,14 +552,14 @@
                        </plugin>
                        -->
                        <!-- The changelog plug-in generates a nice report describing which files have been changed and by whom -->
-                       <!-- 
+                       <!--
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>
                                <artifactId>changelog-maven-plugin</artifactId>
                        </plugin>
                        -->
                </plugins>
-          
+
        </reporting>
        <!--     DISTRIBUTION MANAGEMENT -->
        <distributionManagement>
@@ -1102,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>
@@ -1124,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>