From: jenkins <jenkins-int@bgbm.org>
Date: Thu, 16 Jul 2015 09:11:32 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: 3.7.0~2^2~13
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/b4bf78facca8c9d1f075c882d53487c3cd7bba41?hp=5594e56eedc32cb1265df89f0d63044926547191

Merge branch 'master' into develop
---

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index 3962c23f1..20cffab12 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.8.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.8.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.8.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.8.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.8.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.8.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.8.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.8.0-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.7.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.7.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.7.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.7.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.7.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.7.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.7.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.7.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/main/java"/>
diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index ad4085b64..a9257eb9d 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -612,12 +612,12 @@ Bundle-ClassPath: .,
  lib/xmlbeans-2.3.0.jar,
  lib/poi-ooxml-schemas-3.10-FINAL.jar,
  lib/swagger-annotations-1.3.5.jar,
- lib/cdmlib-commons-3.8.0-SNAPSHOT.jar,
- lib/cdmlib-ext-3.8.0-SNAPSHOT.jar,
- lib/cdmlib-io-3.8.0-SNAPSHOT.jar,
- lib/cdmlib-model-3.8.0-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.8.0-SNAPSHOT.jar,
- lib/cdmlib-print-3.8.0-SNAPSHOT.jar,
- lib/cdmlib-remote-3.8.0-SNAPSHOT.jar,
- lib/cdmlib-services-3.8.0-SNAPSHOT.jar
+ lib/cdmlib-commons-3.7.0.jar,
+ lib/cdmlib-ext-3.7.0.jar,
+ lib/cdmlib-io-3.7.0.jar,
+ lib/cdmlib-model-3.7.0.jar,
+ lib/cdmlib-persistence-3.7.0.jar,
+ lib/cdmlib-print-3.7.0.jar,
+ lib/cdmlib-remote-3.7.0.jar,
+ lib/cdmlib-services-3.7.0.jar
 Import-Package: eu.etaxonomy.cdm.api.application
diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 3ce2b145d..e5abfe106 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -194,14 +194,14 @@ bin.includes = META-INF/,\
                lib/poi-ooxml-schemas-3.10-FINAL.jar,\
                lib/xmlbeans-2.3.0.jar,\
                lib/swagger-annotations-1.3.5.jar,\
-               lib/cdmlib-commons-3.8.0-SNAPSHOT.jar,\
-               lib/cdmlib-ext-3.8.0-SNAPSHOT.jar,\
-               lib/cdmlib-io-3.8.0-SNAPSHOT.jar,\
-               lib/cdmlib-model-3.8.0-SNAPSHOT.jar,\
-               lib/cdmlib-persistence-3.8.0-SNAPSHOT.jar,\
-               lib/cdmlib-print-3.8.0-SNAPSHOT.jar,\
-               lib/cdmlib-remote-3.8.0-SNAPSHOT.jar,\
-               lib/cdmlib-services-3.8.0-SNAPSHOT.jar
+               lib/cdmlib-commons-3.7.0.jar,\
+               lib/cdmlib-ext-3.7.0.jar,\
+               lib/cdmlib-io-3.7.0.jar,\
+               lib/cdmlib-model-3.7.0.jar,\
+               lib/cdmlib-persistence-3.7.0.jar,\
+               lib/cdmlib-print-3.7.0.jar,\
+               lib/cdmlib-remote-3.7.0.jar,\
+               lib/cdmlib-services-3.7.0.jar
 
 jars.compile.order = .
 output.. = bin/
diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
index ba79cb296..733482991 100644
--- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
+++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="3.8.0.qualifier">
+<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="3.7.0">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>
diff --git a/pom.xml b/pom.xml
index bfb7c318e..abed873ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,10 +18,10 @@
   <properties>
     <java.codelevel>1.6</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>3.8.0-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>3.7.0</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.22.0</tycho.version>
-    <taxeditor.version>3.8.0-SNAPSHOT</taxeditor.version>
+    <taxeditor.version>3.7.0</taxeditor.version>
     <update.dir>snapshot</update.dir>
   </properties>
   <modules>