fix for mvn release:prepare

[cdmlib.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index beae38009e414a04d0611a904e8957fc46c8ecbc..1fb4a12002c3201291a574220babea47d19f3bc0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
        <modelVersion>4.0.0</modelVersion>\r
        <groupId>eu.etaxonomy</groupId>\r
        <artifactId>cdmlib-parent</artifactId>\r
-       <version>2.5</version>\r
+       <version>3.0.3-SNAPSHOT</version>\r
        <name>CDM Library</name>\r
        <description>The Java implementation of the Common Data Model (CDM), the data model for EDIT's internet platform for cybertaxonomy.</description>\r
        <url>http://wp5.e-taxonomy.eu/cdmlib/</url>\r
@@ -377,7 +377,7 @@
                                        <entities>\r
                                                <entity>\r
                                                        <name>version</name>\r
-                                                       <value>${pom.version}</value>\r
+                                                       <value>${project.version}</value>\r
                                                </entity>\r
                                        </entities>\r
                                        <!--We want the final documentation and the required resources to end up in \r
@@ -410,7 +410,7 @@
                                        <excludes/>\r
                                        <url>scpexe://160.45.63.151</url>\r
                                        <serverId>wp5.e-taxonomy.eu</serverId>\r
-                                       <toDir>var/www/wp5.e-taxonomy.eu/cdmlib/reference/${pom.version}</toDir>\r
+                                       <toDir>var/www/wp5.e-taxonomy.eu/cdmlib/reference/${project.version}</toDir>\r
                                </configuration>\r
                                <executions>\r
                                        <execution>\r
@@ -422,13 +422,24 @@
                                        </execution>\r
                                </executions>\r
                        </plugin>\r
+      <plugin>\r
+        <groupId>org.apache.maven.plugins</groupId>\r
+        <artifactId>maven-release-plugin</artifactId>\r
+        <version>2.1</version>\r
+        <configuration>\r
+          <allowTimestampedSnapshots>true</allowTimestampedSnapshots>\r
+          <autoVersionSubmodules>true</autoVersionSubmodules>\r
+          <preparationGoals>clean install</preparationGoals> \r
+          <tag>cdmlib/${project.version}</tag>\r
+        </configuration>\r
+      </plugin>\r
                </plugins>\r
                <!--  -->\r
                <extensions>\r
                        <extension>\r
                                <groupId>org.apache.maven.wagon</groupId>\r
                                <artifactId>wagon-scm</artifactId>\r
-                               <version>1.0-alpha-5</version>\r
+                               <version>1.0-beta-6</version>\r
                        </extension>\r
                        <extension>\r
                                <groupId>org.apache.maven.wagon</groupId>\r
@@ -440,13 +451,6 @@
                                <artifactId>wagon-ssh-external</artifactId>\r
                                <version>1.0-beta-6</version>\r
                        </extension>\r
-                       <!--\r
-                               <extension>\r
-                               <groupId>org.apache.maven.wagon</groupId>\r
-                               <artifactId>wagon-ssh-external</artifactId>\r
-                               <version>1.0-alpha-5</version>\r
-                               </extension>\r
-                       -->\r
                        <extension>\r
                                <groupId>org.apache.maven.scm</groupId>\r
                                <artifactId>maven-scm-manager-plexus</artifactId>\r
@@ -554,6 +558,7 @@
                        </plugin>\r
                        -->\r
                </plugins>\r
+          \r
        </reporting>\r
        <!--     DISTRIBUTION MANAGEMENT -->\r
        <distributionManagement>\r
@@ -743,7 +748,7 @@
                        <dependency>\r
                                <groupId>org.eclipse</groupId>\r
                                <artifactId>osgi</artifactId>\r
-                               <version>3.2.1-R32x_v20060919</version>\r
+                               <version>3.6.0</version>\r
                        </dependency>\r
                        <dependency>\r
                                <groupId>cglib</groupId>\r