BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: ebd5e5e a41fa7f)
Merge branch 'move-to-luna' of wp5.e-taxonomy.eu:/var/git/taxeditor into develop
authorCherian Mathew <c.mathew@bgbm.org>
Thu, 4 Jun 2015 13:30:07 +0000 (15:30 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Thu, 4 Jun 2015 13:30:07 +0000 (15:30 +0200)
Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath

1  2 
eu.etaxonomy.taxeditor.cdmlib/.classpath patch | diff1 | diff2 | blob | history
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history

diff --combined eu.etaxonomy.taxeditor.cdmlib/.classpath
index fe9dcabdeae9bdc263656fe2f6f222bb301d219d,390956d2a035e98b7fc2e839cb858437122525a7..b94a8b1d0ac6645b45ad8aa6adaed6e91bb09f8a
--- 1/eu.etaxonomy.taxeditor.cdmlib/.classpath
--- 2/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@@ -193,22 -193,22 +193,6 @@@
        <classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.0.jar" sourcepath="lib/cdmlib-io-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.0.jar" sourcepath="lib/cdmlib-model-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.0.jar" sourcepath="lib/cdmlib-persistence-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.0-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.0.jar" sourcepath="lib/cdmlib-services-3.6.0-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.5.2-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.5.2-SNAPSHOT.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.5.2-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.5.2-SNAPSHOT.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.5.2-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.5.2-SNAPSHOT.jar" sourcepath="lib/cdmlib-io-3.5.2-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.5.2-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.5.2-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.5.2-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.5.2-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.5.2-SNAPSHOT.jar" sourcepath="lib/cdmlib-persistence-3.5.2-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.5.2-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.5.2-SNAPSHOT.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.5.2-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.5.2-SNAPSHOT.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.5.2-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.5.2-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.5.2-SNAPSHOT-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/poi-3.10-FINAL.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.10-FINAL.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
diff --combined eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 584d38d72fe8ce0db43ff4d5ba1d7cd1c97b3cf1,30d09f9e0a340dbb8f90db731386ccd0cf095e54..d1ac59def13ca9fdbe27be1fd5a353afff2eb151
--- 1/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
--- 2/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@@ -2,7 -2,7 +2,7 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: CDM Library Dependencies Plugin
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
 -Bundle-Version: 3.5.2.qualifier
 +Bundle-Version: 3.6.0
  Eclipse-BundleShape: dir
  Export-Package: com.google.api,
   com.google.api.detect,
@@@ -195,7 -195,6 +195,7 @@@
   org.apache.commons.collections;uses:="org.apache.commons.collections.keyvalue,new org.apache.commons.collections",
   org.apache.commons.io;uses:="org.apache.commons.io.filefilter",
   org.apache.commons.lang;uses:="org.apache.commons.lang.exception",
 + org.apache.commons.lang.exception,
   org.apache.fop.apps,
   org.apache.http,
   org.apache.http.client,
@@@ -258,6 -257,7 +258,7 @@@
   org.apache.lucene.util,
   org.apache.sanselan;uses:="org.apache.sanselan.common,org.apache.sanselan.common.byteSources",
   org.apache.xerces.dom,
+  org.eclipse.osgi.internal.loader,
   org.eclipse.osgi.util,
   org.h2.jdbc,
   org.hamcrest,
@@@ -302,6 -302,7 +303,7 @@@
   org.joda.time.format;uses:="org.joda.time",
   org.joda.time.tz;uses:="org.joda.time",
   org.junit;uses:="org.hamcrest",
+  org.junit.runner,
   org.odftoolkit.odfdom,
   org.odftoolkit.odfdom.doc,
   org.odftoolkit.odfdom.doc.office,
@@@ -605,22 -606,22 +607,22 @@@ Bundle-ClassPath: .
   lib/spring-security-remoting-3.1.3.RELEASE.jar,
   lib/jena-core-2.11.2.jar,
   lib/jena-iri-1.0.2.jar,
 - lib/cdmlib-commons-3.5.2-SNAPSHOT-sources.jar,
 - lib/cdmlib-commons-3.5.2-SNAPSHOT.jar,
 - lib/cdmlib-ext-3.5.2-SNAPSHOT-sources.jar,
 - lib/cdmlib-ext-3.5.2-SNAPSHOT.jar,
 - lib/cdmlib-io-3.5.2-SNAPSHOT-sources.jar,
 - lib/cdmlib-io-3.5.2-SNAPSHOT.jar,
 - lib/cdmlib-model-3.5.2-SNAPSHOT-sources.jar,
 - lib/cdmlib-model-3.5.2-SNAPSHOT.jar,
 - lib/cdmlib-persistence-3.5.2-SNAPSHOT-sources.jar,
 - lib/cdmlib-persistence-3.5.2-SNAPSHOT.jar,
 - lib/cdmlib-print-3.5.2-SNAPSHOT-sources.jar,
 - lib/cdmlib-print-3.5.2-SNAPSHOT.jar,
 - lib/cdmlib-remote-3.5.2-SNAPSHOT-sources.jar,
 - lib/cdmlib-remote-3.5.2-SNAPSHOT.jar,
 - lib/cdmlib-services-3.5.2-SNAPSHOT-sources.jar,
 - lib/cdmlib-services-3.5.2-SNAPSHOT.jar,
 + lib/cdmlib-commons-3.6.0-sources.jar,
 + lib/cdmlib-commons-3.6.0.jar,
 + lib/cdmlib-ext-3.6.0-sources.jar,
 + lib/cdmlib-ext-3.6.0.jar,
 + lib/cdmlib-io-3.6.0-sources.jar,
 + lib/cdmlib-io-3.6.0.jar,
 + lib/cdmlib-model-3.6.0-sources.jar,
 + lib/cdmlib-model-3.6.0.jar,
 + lib/cdmlib-persistence-3.6.0-sources.jar,
 + lib/cdmlib-persistence-3.6.0.jar,
 + lib/cdmlib-print-3.6.0-sources.jar,
 + lib/cdmlib-print-3.6.0.jar,
 + lib/cdmlib-remote-3.6.0-sources.jar,
 + lib/cdmlib-remote-3.6.0.jar,
 + lib/cdmlib-services-3.6.0-sources.jar,
 + lib/cdmlib-services-3.6.0.jar,
   lib/poi-3.10-FINAL.jar,
   lib/poi-ooxml-3.10-FINAL.jar,
   lib/xmlbeans-2.3.0.jar,
diff --combined eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
index 3905f99b4ce9ce0071e54ea6c541a51d257c806c,b26b72184252c4ace4eae45d2ccbe03f684b2f6e..2553e6492bc6456b11bd78dc80dbb2e03848bf46
--- 1/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
--- 2/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
@@@ -2,7 -2,7 +2,7 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: Editor Bundle
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
 -Bundle-Version: 3.5.2.qualifier
 +Bundle-Version: 3.6.0
  Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
  Bundle-Vendor: %Bundle-Vendor.0
  Bundle-Localization: OSGI-INF/l10n/plugin
@@@ -25,7 -25,7 +25,7 @@@ Require-Bundle: org.eclipse.ui
   org.eclipse.zest.core,
   org.eclipse.zest.layouts,
   eu.etaxonomy.taxeditor.cdmlib,
-  org.eclipse.ui.ide;bundle-version="3.7.0"
+  org.eclipse.ui.ide
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
  Bundle-ActivationPolicy: lazy
  Import-Package: org.eclipse.core.databinding.beans,