merge-update from trunk

[taxeditor.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 0dd81a70e2d540368d96c1f58312b43d2fda869b..d439a64f4cc43a40d7d1f8b285d3e48f2fa64472 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,17 +6,19 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>3.0.12-SNAPSHOT</version>
+  <version>3.2.3.201308261400</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for cybertaxonomy</description>
   <url>http://wp5.e-taxonomy.eu</url>
   <inceptionYear>2007</inceptionYear>
   <packaging>pom</packaging>
   <properties>
+    <java.codelevel>1.6</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>3.0.12-SNAPSHOT</cdmlib.version><!-- TODO can we use project.version ????? -->
+    <cdmlib.version>3.3.0-SNAPSHOT</cdmlib.version>
+    <!-- TODO can we use project.version ????? -->
     <tycho.version>0.14.0</tycho.version>
-    <taxeditor.version>3.0.12-SNAPSHOT</taxeditor.version>
+    <taxeditor.version>3.2.3</taxeditor.version>
   </properties>
   <modules>
     <module>eu.etaxonomy.taxeditor.cdmlib</module>
@@ -60,11 +62,29 @@
   <developers>
     <developer>
       <!-- your SVN account id please! -->
-      <id>n.hoffmann</id>
+      <id>a.kohlbecker</id>
       <name>
-                               Niels Hoffmann
+                       Andreas Kohlbecker
                        </name>
-      <email>n.hoffmann [at] bgbm.org</email>
+      <email>a.kohlbecker [at] bgbm.org</email>
+      <organization>
+                               Botanic Garden Botanical Museum Berlin
+                       </organization>
+      <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
+      <timezone>+1</timezone>
+      <roles>
+        <role>Java Developer</role>
+        <role>Architect</role>
+      </roles>
+      <url/>
+    </developer>
+    <developer>
+      <!-- your SVN account id please! -->
+      <id>a.mueller</id>
+      <name>
+                               Andreas Müller
+                       </name>
+      <email>a.mueller [at] bgbm.org</email>
       <organization>
                                Botanic Garden Botanical Museum Berlin
                        </organization>
@@ -86,6 +106,30 @@
     <url>http://160.45.63.201/jenkins/view/EDIT%20Taxonomic%20Editor/</url>
   </ciManagement>
   <!-- **** REPOSITORIES **** -->
+  <profiles>
+    <profile>
+      <id>local-repository</id>
+      <activation>
+        <property>
+          <name>localrepo</name>
+        </property>
+      </activation>
+      <repositories>
+        <repository>
+          <id>EditLocalRepository</id>
+          <url>file://${localrepo}/eu/etaxonomy/</url>
+          <releases>
+            <enabled>false</enabled>
+            <updatePolicy>always</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>always</updatePolicy>
+          </snapshots>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
   <repositories>
     <!-- the cdm internal repository -->
     <repository>
@@ -97,6 +141,11 @@
       <layout>p2</layout>
       <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/</url>
     </repository>
+    <repository>
+      <id>eclipse-nebula</id>
+      <layout>p2</layout>
+      <url>http://download.eclipse.org/technology/nebula/snapshot/</url>
+    </repository>
     <repository>
       <id>eclipse-swtbot</id>
       <layout>p2</layout>
@@ -317,11 +366,11 @@
     </extensions>
     <pluginManagement>
       <plugins>
-       <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-antrun-plugin</artifactId>
-         <version>1.7</version>
-       </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.7</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>