Updating develop poms to hotfix version to avoid merge conflicts
authorCherian Mathew <c.mathew@bgbm.org>
Fri, 5 Jun 2015 16:16:57 +0000 (18:16 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Fri, 5 Jun 2015 16:16:57 +0000 (18:16 +0200)
12 files changed:
eu.etaxonomy.taxeditor.application/pom.xml
eu.etaxonomy.taxeditor.bulkeditor/pom.xml
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/pom.xml
eu.etaxonomy.taxeditor.feature.platform/pom.xml
eu.etaxonomy.taxeditor.feature/pom.xml
eu.etaxonomy.taxeditor.help/pom.xml
eu.etaxonomy.taxeditor.navigation/pom.xml
eu.etaxonomy.taxeditor.printpublisher/pom.xml
eu.etaxonomy.taxeditor.store/pom.xml
eu.etaxonomy.taxeditor/pom.xml
pom.xml

index 2ef5065a8bb8cedbb33454357b9919cd09dc1744..015590ea9db114224d6ff4ce5380d95593e108c3 100644 (file)
@@ -1,10 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
 
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.6.1-SNAPSHOT</version>
+    <version>3.6.1</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 4a050c44dc5995c65d41fe13978ce7efa01b73bd..f4bce774650a6ae2b7ffc18771770edeeae65744 100644 (file)
@@ -1,10 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
 
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.6.1-SNAPSHOT</version>
+               <version>3.6.1</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
@@ -12,7 +11,7 @@
        <packaging>eclipse-plugin</packaging>
 
        <name>Bulkeditor Bundle</name>
        <packaging>eclipse-plugin</packaging>
 
        <name>Bulkeditor Bundle</name>
-       <description></description>
+       <description />
        <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorBulkeditorBundle</url>
 
 </project>
        <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorBulkeditorBundle</url>
 
 </project>
index f6025565ab58df3eea1dfd4cbc2a14f242e6c1d9..7ebc5c5e32ce0f22f1e36eb3f834d3fc1104ab59 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-  <parent>\r
-    <groupId>eu.etaxonomy</groupId>\r
-    <artifactId>taxeditor-parent</artifactId>\r
-    <version>3.6.1-SNAPSHOT</version>\r
-  </parent>\r
-  <modelVersion>4.0.0</modelVersion>\r
-  <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
-  <packaging>eclipse-plugin</packaging>\r
-  <name>CDM Library Dependencies Plugin</name>\r
-  <description>CDM Library and dependencies as a plugin</description>\r
-  <build>\r
-    <plugins>      \r
-      <plugin>\r
-       <groupId>org.apache.maven.plugins</groupId>\r
-       <artifactId>maven-dependency-plugin</artifactId>\r
-       <version>2.4</version>\r
-       <executions>\r
-         <execution>\r
-           <id>copy-dependencies</id>\r
-           <phase>validate</phase>\r
-           <goals>\r
-             <goal>copy-dependencies</goal>\r
-           </goals>\r
-           <configuration>\r
-             <includeArtifactIds>cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io</includeArtifactIds>\r
-             <outputDirectory>lib</outputDirectory>\r
-             <overWriteReleases>true</overWriteReleases>\r
-             <overWriteSnapshots>true</overWriteSnapshots>\r
-             <excludeTransitive>true</excludeTransitive>             \r
-           </configuration>\r
-         </execution>\r
-         <execution>\r
-           <id>copy-dependencies-sources</id>\r
-           <phase>validate</phase>\r
-           <goals>\r
-             <goal>copy-dependencies</goal>\r
-           </goals>\r
-           <configuration>\r
-             <classifier>sources</classifier>\r
-             <includeArtifactIds>cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io</includeArtifactIds>\r
-             <outputDirectory>lib</outputDirectory>\r
-             <overWriteReleases>true</overWriteReleases>\r
-             <overWriteSnapshots>true</overWriteSnapshots>\r
-             <excludeTransitive>true</excludeTransitive>\r
-             <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>\r
-           </configuration>\r
-         </execution>\r
-       </executions>\r
-      </plugin>\r
-      <plugin>\r
-       <groupId>org.apache.maven.plugins</groupId>\r
-       <artifactId>maven-antrun-plugin</artifactId>\r
-       <version>1.7</version>\r
-       <executions>\r
-         <execution>\r
-           <id>remove-existing-jars</id>\r
-           <phase>clean</phase>\r
-           <goals>\r
-             <goal>run</goal>\r
-           </goals>\r
-           <configuration>\r
-             <target>\r
-               <echo>Remove all cdmlib jars</echo>\r
-               <delete>\r
-                 <fileset dir="./lib" includes="cdmlib-*"/>\r
-               </delete>\r
-             </target> \r
-           </configuration>\r
-         </execution>\r
-         <execution>\r
-           <id>update-snapshot-jar-names</id>\r
-           <phase>validate</phase>\r
-           <goals>\r
-             <goal>run</goal>\r
-           </goals>\r
-           <configuration>           \r
-             <target>\r
-               <echo>Update cdmlib jars to SNAPSHOT when build with timestamp</echo>\r
-               <move todir="./lib">\r
-                 <fileset dir="./lib" />\r
-                 <mapper type="regexp"\r
-                         from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\.jar)" to="\1SNAPSHOT\2" />\r
-               </move>                           \r
-               <move todir="./lib">\r
-                 <fileset dir="./lib" />\r
-                 <mapper type="regexp"\r
-                         from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\-sources\.jar)" to="\1SNAPSHOT\2" />\r
-               </move>                           \r
-             </target> \r
-           </configuration>\r
-         </execution>\r
-       </executions>\r
-      </plugin>\r
-    </plugins>\r
-  </build>\r
-  <dependencies>\r
-    <dependency>\r
-      <groupId>identificationKeyAPI</groupId>\r
-      <artifactId>identificationKeyAPI</artifactId>\r
-      <version>1.0-SNAPSHOT</version>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>eu.etaxonomy</groupId>\r
-      <artifactId>cdmlib-commons</artifactId>\r
-      <version>${cdmlib.version}</version>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>eu.etaxonomy</groupId>\r
-      <artifactId>cdmlib-model</artifactId>\r
-      <version>${cdmlib.version}</version>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>eu.etaxonomy</groupId>\r
-      <artifactId>cdmlib-persistence</artifactId>\r
-      <version>${cdmlib.version}</version>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>eu.etaxonomy</groupId>\r
-      <artifactId>cdmlib-remote</artifactId>\r
-      <version>${cdmlib.version}</version>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>eu.etaxonomy</groupId>\r
-      <artifactId>cdmlib-print</artifactId>\r
-      <version>${cdmlib.version}</version>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>eu.etaxonomy</groupId>\r
-      <artifactId>cdmlib-services</artifactId>\r
-      <version>${cdmlib.version}</version>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>eu.etaxonomy</groupId>\r
-      <artifactId>cdmlib-io</artifactId>\r
-      <version>${cdmlib.version}</version>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>eu.etaxonomy</groupId>\r
-      <artifactId>cdmlib-ext</artifactId>\r
-      <version>${cdmlib.version}</version>\r
-    </dependency>\r
-       <dependency>\r
-      <groupId>org.aspectj</groupId>\r
-      <artifactId>aspectjrt</artifactId>\r
-         <version>1.7.1</version>\r
-       </dependency>\r
-         <dependency>\r
-         <groupId>org.aspectj</groupId>\r
-         <artifactId>aspectjweaver</artifactId>\r
-         <version>1.7.1</version>\r
-        </dependency>\r
-        \r
-    <!--  for ikey-plus \r
-        TODO this should not be needed but the utils class contained  in this jar \r
-        seems to be loaded as bean by spring\r
-    -->\r
-  </dependencies>\r
-</project>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>eu.etaxonomy</groupId>
+    <artifactId>taxeditor-parent</artifactId>
+    <version>3.6.1</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <name>CDM Library Dependencies Plugin</name>
+  <description>CDM Library and dependencies as a plugin</description>
+  <build>
+    <plugins>      
+      <plugin>
+       <groupId>org.apache.maven.plugins</groupId>
+       <artifactId>maven-dependency-plugin</artifactId>
+       <version>2.4</version>
+       <executions>
+         <execution>
+           <id>copy-dependencies</id>
+           <phase>validate</phase>
+           <goals>
+             <goal>copy-dependencies</goal>
+           </goals>
+           <configuration>
+             <includeArtifactIds>cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io</includeArtifactIds>
+             <outputDirectory>lib</outputDirectory>
+             <overWriteReleases>true</overWriteReleases>
+             <overWriteSnapshots>true</overWriteSnapshots>
+             <excludeTransitive>true</excludeTransitive>             
+           </configuration>
+         </execution>
+         <execution>
+           <id>copy-dependencies-sources</id>
+           <phase>validate</phase>
+           <goals>
+             <goal>copy-dependencies</goal>
+           </goals>
+           <configuration>
+             <classifier>sources</classifier>
+             <includeArtifactIds>cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io</includeArtifactIds>
+             <outputDirectory>lib</outputDirectory>
+             <overWriteReleases>true</overWriteReleases>
+             <overWriteSnapshots>true</overWriteSnapshots>
+             <excludeTransitive>true</excludeTransitive>
+             <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
+           </configuration>
+         </execution>
+       </executions>
+      </plugin>
+      <plugin>
+       <groupId>org.apache.maven.plugins</groupId>
+       <artifactId>maven-antrun-plugin</artifactId>
+       <version>1.7</version>
+       <executions>
+         <execution>
+           <id>remove-existing-jars</id>
+           <phase>clean</phase>
+           <goals>
+             <goal>run</goal>
+           </goals>
+           <configuration>
+             <target>
+               <echo>Remove all cdmlib jars</echo>
+               <delete>
+                 <fileset dir="./lib" includes="cdmlib-*" />
+               </delete>
+             </target> 
+           </configuration>
+         </execution>
+         <execution>
+           <id>update-snapshot-jar-names</id>
+           <phase>validate</phase>
+           <goals>
+             <goal>run</goal>
+           </goals>
+           <configuration>           
+             <target>
+               <echo>Update cdmlib jars to SNAPSHOT when build with timestamp</echo>
+               <move todir="./lib">
+                 <fileset dir="./lib" />
+                 <mapper type="regexp" from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\.jar)" to="\1SNAPSHOT\2" />
+               </move>                           
+               <move todir="./lib">
+                 <fileset dir="./lib" />
+                 <mapper type="regexp" from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\-sources\.jar)" to="\1SNAPSHOT\2" />
+               </move>                           
+             </target> 
+           </configuration>
+         </execution>
+       </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>identificationKeyAPI</groupId>
+      <artifactId>identificationKeyAPI</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-commons</artifactId>
+      <version>${cdmlib.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-model</artifactId>
+      <version>${cdmlib.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-persistence</artifactId>
+      <version>${cdmlib.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-remote</artifactId>
+      <version>${cdmlib.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-print</artifactId>
+      <version>${cdmlib.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-services</artifactId>
+      <version>${cdmlib.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-io</artifactId>
+      <version>${cdmlib.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-ext</artifactId>
+      <version>${cdmlib.version}</version>
+    </dependency>
+       <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+         <version>1.7.1</version>
+       </dependency>
+         <dependency>
+         <groupId>org.aspectj</groupId>
+         <artifactId>aspectjweaver</artifactId>
+         <version>1.7.1</version>
+        </dependency>
+        
+    <!--  for ikey-plus 
+        TODO this should not be needed but the utils class contained  in this jar 
+        seems to be loaded as bean by spring
+    -->
+  </dependencies>
+</project>
index 1ac27443476ae7ec993e0fa06340c94164f82ea8..040ab38666d80375e9fb48d284b1acd681214f56 100644 (file)
@@ -1,10 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
   
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-    <version>3.6.1-SNAPSHOT</version>
+    <version>3.6.1</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
@@ -12,7 +11,7 @@
   <packaging>eclipse-plugin</packaging>
   
   <name>Editor Bundle</name>
   <packaging>eclipse-plugin</packaging>
   
   <name>Editor Bundle</name>
-  <description></description>
+  <description />
   <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorEditorBundle</url>
   
 </project>
   <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorEditorBundle</url>
   
 </project>
index 6d0a3e0fd53adf01470589e144e09dc8e6ed39bd..4faf304ae2b4d08a260c848d8546133cd151d407 100644 (file)
@@ -3,13 +3,13 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.6.1-SNAPSHOT</version>
+               <version>3.6.1</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
        <packaging>eclipse-feature</packaging>
        
        <name>Taxonomic Editor Platform Dependencies</name>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
        <packaging>eclipse-feature</packaging>
        
        <name>Taxonomic Editor Platform Dependencies</name>
-       <description/>
+       <description />
        <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorEditorBundle</url>
 </project>
        <url>http://dev.e-taxonomy.eu/trac/wiki/TaxonomicEditorEditorBundle</url>
 </project>
index d573f8d1ecd3142a72b201217467bdb484ac519e..4c92868f7c67073f0dd580f948585aa6a92b97fc 100644 (file)
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.6.1-SNAPSHOT</version>
+    <version>3.6.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
index 94399ed793a213055226eb0343e673a8b5bbc1a4..74747fcd9409623f1ca59b9c214e56785963446b 100644 (file)
@@ -1,10 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
 
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.6.1-SNAPSHOT</version>
+               <version>3.6.1</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 8b83544de1d63305f5d1f7170791a8ad31b4bbc3..ed81dc650dc9c62b17c38a33b7f2c4f4a6a9ea66 100644 (file)
@@ -1,10 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
 
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.6.1-SNAPSHOT</version>
+               <version>3.6.1</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 70bae0d1baa894309660995f67b987a32465e04f..a9a8afc66a258ec3d9fa76ed7c4a2635ff2ad2cc 100644 (file)
@@ -1,10 +1,9 @@
 <?xml version="1.0"?>
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>3.6.1-SNAPSHOT</version>
+               <version>3.6.1</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
@@ -13,7 +12,7 @@
        <packaging>eclipse-plugin</packaging>
        
        <name>Printpublisher Bundle</name>
        <packaging>eclipse-plugin</packaging>
        
        <name>Printpublisher Bundle</name>
-       <description></description>
+       <description />
        <url>http://wp5.e-taxonomy.eu/printpublisher</url>
 
 </project>
        <url>http://wp5.e-taxonomy.eu/printpublisher</url>
 
 </project>
index 418d60a1a57ae6cb125fae89becd3104aa8d692b..9c15669e4e4d43383d1e5fd405e278e89d308a90 100644 (file)
@@ -1,10 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
 
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>3.6.1-SNAPSHOT</version>
+       <version>3.6.1</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index f47b6522748578ba74323b31a8629bebc96a46a3..35012906475e60ff04e513d5c77ab949704e42cf 100644 (file)
@@ -1,9 +1,8 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.6.1-SNAPSHOT</version>
+    <version>3.6.1</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index fe14b1771183c15d86bb651b8f33f7b2947f5f90..8726503b8456114ccf4315542d327ca671187ee3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>3.6.1-SNAPSHOT</version>
+  <version>3.6.1</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy
@@ -82,7 +82,7 @@
         <role>Java Developer</role>
         <role>Architect</role>
       </roles>
         <role>Java Developer</role>
         <role>Architect</role>
       </roles>
-      <url/>
+      <url />
     </developer>
     <developer>
       <!-- your SVN account id please! -->
     </developer>
     <developer>
       <!-- your SVN account id please! -->
         <role>Java Developer</role>
         <role>Architect</role>
       </roles>
         <role>Java Developer</role>
         <role>Architect</role>
       </roles>
-      <url/>
+      <url />
     </developer>
   </developers>
   <issueManagement>
     </developer>
   </developers>
   <issueManagement>