Merge branch 'release/3.7.0'
authorjenkins <jenkins-int@bgbm.org>
Wed, 15 Jul 2015 15:56:02 +0000 (17:56 +0200)
committerjenkins <jenkins-int@bgbm.org>
Wed, 15 Jul 2015 15:56:02 +0000 (17:56 +0200)
Conflicts:
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.feature.platform/feature.xml
eu.etaxonomy.taxeditor.feature/feature.xml
eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF

eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.feature/feature.xml
pom.xml

index 3a6eebf5544790ac041b813114973c55466e4606..20cffab12135d832275af97a5af5a8ae56d0d5a2 100644 (file)
@@ -12,7 +12,6 @@
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src/main/java"/>
        <classpathentry kind="src" path="src/main/resources"/>
-       <classpathentry kind="src" path="src/test/java/"/>
        <classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.10-FINAL.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/swagger-annotations-1.3.5.jar"/>
-       <classpathentry kind="output" path="bin"/>
+       <classpathentry kind="output" path="target/classes"/>
 </classpath>
index 53ffb9ba873278506abffce993fbfc294b362bf2..92d7ebe7c71900b09d598fe30b62ba24773c79d1 100644 (file)
@@ -2,7 +2,11 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
+<<<<<<< HEAD
+      version="3.6.1"
+=======
       version="3.7.0"
+>>>>>>> refs/heads/release/3.7.0
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
diff --git a/pom.xml b/pom.xml
index abed873ce9d8cc196cc67b88eb321710b7ed60d6..d0dc7c4bad51e5dd13a0f17a35f921c6ecb91178 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
         <role>Java Developer</role>
         <role>Architect</role>
       </roles>
-      <url />
+      <url/>
     </developer>
     <developer>
       <!-- your SVN account id please! -->
         <role>Java Developer</role>
         <role>Architect</role>
       </roles>
-      <url />
+      <url/>
     </developer>
   </developers>
   <issueManagement>