BGBM BDI Projects / cdmlib.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Bug fixed regarding export of modifiers
[cdmlib.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index d14fceb6d1056a713704ee7b1baad90b6e067a8b..a300cd9768064ff294d5e60028cb93830bacf85e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -20,13 +20,18 @@
                <module>cdmlib-services</module>\r
                <module>cdmlib-ext</module>\r
                <module>cdmlib-remote</module>\r
                <module>cdmlib-services</module>\r
                <module>cdmlib-ext</module>\r
                <module>cdmlib-remote</module>\r
+               <!--module>cdm-server</module-->\r
                <module>cdmlib-io</module>\r
        </modules>\r
   \r
   <properties>\r
     <spring.version>3.0.0.RC1</spring.version>\r
   </properties>\r
                <module>cdmlib-io</module>\r
        </modules>\r
   \r
   <properties>\r
     <spring.version>3.0.0.RC1</spring.version>\r
   </properties>\r
-\r
+  <scm>\r
+    <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/</connection>\r
+    <developerConnection>scm:svn:https://dev.e-taxonomy.eu/svn/trunk/cdmlib/</developerConnection>\r
+    <url>http://dev.e-taxonomy.eu/trac/browser/trunk/cdmlib/</url>\r
+  </scm>\r
                \r
        <mailingLists>\r
                <mailingList>\r
                \r
        <mailingLists>\r
                <mailingList>\r
@@ -270,9 +275,9 @@
                        <artifactId>maven-surefire-plugin</artifactId>\r
                        <configuration>\r
                          <argLine>-Xmx512M</argLine>\r
                        <artifactId>maven-surefire-plugin</artifactId>\r
                        <configuration>\r
                          <argLine>-Xmx512M</argLine>\r
-                                 <includes>\r
-                           <include>**/*Test.java</include>\r
-                         </includes>\r
+            <includes>\r
+                   <include>**/*Test.java</include>\r
+                 </includes>\r
                        <systemProperties>\r
                                <property>\r
                                        <name>hibernate.connection.driver_class</name>\r
                        <systemProperties>\r
                                <property>\r
                                        <name>hibernate.connection.driver_class</name>\r
@@ -290,11 +295,27 @@
                                        <name>hibernate.connection.password</name>\r
                                        <value>${hibernate.connection.password}</value>\r
                                </property>\r
                                        <name>hibernate.connection.password</name>\r
                                        <value>${hibernate.connection.password}</value>\r
                                </property>\r
-                                       \r
                        </systemProperties>\r
                 </configuration>\r
                        </systemProperties>\r
                 </configuration>\r
-               </plugin>\r
-                       <plugin>\r
+             </plugin>\r
+       <plugin>\r
+        <groupId>org.codehaus.mojo</groupId>\r
+        <artifactId>buildnumber-maven-plugin</artifactId>\r
+        <version>1.0-beta-3</version>\r
+        <executions>\r
+          <execution>\r
+            <phase>deploy</phase>\r
+            <goals>\r
+              <goal>create</goal>\r
+            </goals>\r
+          </execution>\r
+        </executions>\r
+        <configuration>\r
+          <doCheck>false</doCheck><!-- Only create the build number if there are no local modifications -->\r
+          <doUpdate>false</doUpdate><!-- automatically update the local svn copy -->\r
+        </configuration>\r
+      </plugin>\r
+       <plugin>\r
                                <groupId>org.apache.maven.plugins</groupId>\r
                                <artifactId>maven-site-plugin</artifactId>\r
                                <!-- \r
                                <groupId>org.apache.maven.plugins</groupId>\r
                                <artifactId>maven-site-plugin</artifactId>\r
                                <!-- \r
@@ -336,7 +357,7 @@
                                        <downloadJavadocs>true</downloadJavadocs>       \r
                                </configuration>\r
                        </plugin>\r
                                        <downloadJavadocs>true</downloadJavadocs>       \r
                                </configuration>\r
                        </plugin>\r
-                  <plugin>\r
+      <plugin>\r
                                <groupId>com.agilejava.docbkx</groupId>\r
                                <artifactId>docbkx-maven-plugin</artifactId>\r
                                <version>2.0.9</version>\r
                                <groupId>com.agilejava.docbkx</groupId>\r
                                <artifactId>docbkx-maven-plugin</artifactId>\r
                                <version>2.0.9</version>\r
@@ -363,18 +384,18 @@
                                        <htmlStylesheet>resources/css/html.css</htmlStylesheet>\r
                                        <xincludeSupported>true</xincludeSupported>\r
                                        <!--<htmlCustomization>src/docbkx/resources/xsl/html_chunk.xsl</htmlCustomization>-->\r
                                        <htmlStylesheet>resources/css/html.css</htmlStylesheet>\r
                                        <xincludeSupported>true</xincludeSupported>\r
                                        <!--<htmlCustomization>src/docbkx/resources/xsl/html_chunk.xsl</htmlCustomization>-->\r
-                              <!-- if anyone can get the xsl-fo customization to work properly, then by all \r
-                                   means use it\r
-                                <foCustomization>src/docbkx/resources/xsl/fopdf.xsl</foCustomization>\r
-                              -->\r
+          <!-- if anyone can get the xsl-fo customization to work properly, then by all \r
+               means use it\r
+            <foCustomization>src/docbkx/resources/xsl/fopdf.xsl</foCustomization>\r
+          -->\r
                                        <entities>\r
                                                <entity>\r
                                                        <name>version</name>\r
                                                        <value>${pom.version}</value>\r
                                                </entity>\r
                                        </entities>\r
                                        <entities>\r
                                                <entity>\r
                                                        <name>version</name>\r
                                                        <value>${pom.version}</value>\r
                                                </entity>\r
                                        </entities>\r
-                              <!--We want the final documentation and the required resources to end up in \r
-                                  the right place-->\r
+          <!--We want the final documentation and the required resources to end up in \r
+              the right place-->\r
                                        <postProcess>\r
                                                <copy todir="target/site/reference">\r
                                                        <fileset dir="target/docbkx">\r
                                        <postProcess>\r
                                                <copy todir="target/site/reference">\r
                                                        <fileset dir="target/docbkx">\r
@@ -512,15 +533,15 @@
        <distributionManagement>\r
                <site>\r
                        <id>edit-wp5</id>\r
        <distributionManagement>\r
                <site>\r
                        <id>edit-wp5</id>\r
-                       <url>\r
-                               scp://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/cdmlib/site\r
+      <url>\r
+                               scp://160.45.63.151/var/www/wp5.e-taxonomy.eu/cdmlib/site\r
                        </url>\r
                </site>\r
         <repository>\r
                        <id>edit-wp5</id>\r
                        <name>Edit Maven Repository</name>\r
                        <url>\r
                        </url>\r
                </site>\r
         <repository>\r
                        <id>edit-wp5</id>\r
                        <name>Edit Maven Repository</name>\r
                        <url>\r
-                                       scp://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/cdmlib/mavenrepo\r
+                                       scp://160.45.63.151/var/www/wp5.e-taxonomy.eu/cdmlib/mavenrepo\r
                        </url>\r
                </repository>\r
        </distributionManagement>\r
                        </url>\r
                </repository>\r
        </distributionManagement>\r
@@ -811,6 +832,26 @@
                                   <groupId>org.springframework</groupId>\r
                                   <artifactId>spring-support</artifactId>\r
                                 </exclusion>\r
                                   <groupId>org.springframework</groupId>\r
                                   <artifactId>spring-support</artifactId>\r
                                 </exclusion>\r
+                                <exclusion>\r
+                                        <groupId>org.springframework</groupId>\r
+                                        <artifactId>spring-beans</artifactId>\r
+                                </exclusion>\r
+                                <exclusion>\r
+                                        <groupId>org.springframework</groupId>\r
+                                        <artifactId>spring-aop</artifactId>\r
+                                </exclusion>\r
+                                <exclusion>\r
+                                        <groupId>org.springframework</groupId>\r
+                                        <artifactId>spring-context</artifactId>\r
+                                </exclusion>\r
+ <exclusion>\r
+                                        <groupId>org.springframework</groupId>\r
+                                        <artifactId>spring-core</artifactId>\r
+                                </exclusion>\r
+ <exclusion>\r
+                                        <groupId>org.springframework</groupId>\r
+                                        <artifactId>spring-jdbc</artifactId>\r
+                                </exclusion>\r
                                </exclusions>\r
                   </dependency>\r
               <dependency>\r
                                </exclusions>\r
                   </dependency>\r
               <dependency>\r
@@ -921,16 +962,21 @@
               <artifactId>hibernate-ehcache</artifactId>\r
               <version>3.4.0-SNAPSHOT</version>\r
             </dependency>\r
               <artifactId>hibernate-ehcache</artifactId>\r
               <version>3.4.0-SNAPSHOT</version>\r
             </dependency>\r
-                       <dependency>\r
+                                               <dependency>\r
               <groupId>org.hibernate</groupId>\r
               <artifactId>hibernate-parent</artifactId>\r
               <version>3.4.0-SNAPSHOT</version>\r
             </dependency>\r
               <groupId>org.hibernate</groupId>\r
               <artifactId>hibernate-parent</artifactId>\r
               <version>3.4.0-SNAPSHOT</version>\r
             </dependency>\r
-                       <dependency>\r
-                               <groupId>javax.servlet</groupId>\r
-                               <artifactId>servlet-api</artifactId>\r
-                               <version>2.5</version>\r
-                       </dependency>\r
+                                               <dependency>\r
+                                                       <groupId>org.hibernate</groupId>\r
+                                                       <artifactId>hibernate-c3p0</artifactId>\r
+                                                       <version>3.4.0-SNAPSHOT</version>\r
+            </dependency>\r
+                                               <dependency>\r
+                                                       <groupId>javax.servlet</groupId>\r
+                                                       <artifactId>servlet-api</artifactId>\r
+                                                       <version>2.5</version>\r
+                                               </dependency>\r
                \r
                        <!-- ******* SPRING ******* -->\r
                        <dependency>\r
                \r
                        <!-- ******* SPRING ******* -->\r
                        <dependency>\r
@@ -1000,8 +1046,8 @@
                 </dependency>\r
                        <dependency>\r
                                <groupId>org.springframework.security</groupId>\r
                 </dependency>\r
                        <dependency>\r
                                <groupId>org.springframework.security</groupId>\r
-                               <artifactId>spring-security-core</artifactId>\r
-                               <version>2.0.4</version>\r
+                               <artifactId>spring-security-core</artifactId>\r
+                               <version>3.0.0.RELEASE</version>\r
                         <exclusions>\r
                           <exclusion>\r
                             <groupId>org.springframework</groupId>\r
                         <exclusions>\r
                           <exclusion>\r
                             <groupId>org.springframework</groupId>\r
@@ -1057,11 +1103,13 @@
                        <version>1.8.0.7</version>\r
                </dependency>\r
 \r
                        <version>1.8.0.7</version>\r
                </dependency>\r
 \r
-               <dependency>\r
+               <!--for sqlserver2008 and sqlserver2005-->\r
+               <dependency>\r
                        <groupId>com.microsoft.sqlserver</groupId>\r
                        <groupId>com.microsoft.sqlserver</groupId>\r
-                       <artifactId>jdbc</artifactId>\r
-                       <version>1.2</version>\r
-               </dependency>\r
+                       <artifactId>jdbc4</artifactId>\r
+                       <version>2.0</version>\r
+               </dependency>\r
+               \r
 <!-- use SQL Server 2005 driver instead (com.microsoft.sqlserver/jdbc)\r
                <dependency>\r
                        <groupId>com.microsoft.jdbcdriver</groupId>\r
 <!-- use SQL Server 2005 driver instead (com.microsoft.sqlserver/jdbc)\r
                <dependency>\r
                        <groupId>com.microsoft.jdbcdriver</groupId>\r