ref #9359 add commons-collections4 to taxeditor dependencies

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 845bd19462d0a62586b579bc4ffd68188c8925f9..62e292adb5d7b6a619a21160f93720020b751fb2 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -179,8 +179,8 @@ Export-Package: com.sun.istack.internal.tools,
  eu.etaxonomy.taxeditor.service,
  eu.etaxonomy.taxeditor.session,
  eu.etaxonomy.taxeditor.session.mock,
- javax.persistence,
  jakarta.validation,
+ javax.persistence,
  junit.framework;uses:="org.junit.runner.manipulation,org.junit.runner,org.junit.runner.notification",
  net.sf.ehcache,
  net.sf.ehcache.config,
@@ -190,6 +190,8 @@ Export-Package: com.sun.istack.internal.tools,
  org.aopalliance.aop,
  org.apache.commons.collections;uses:="org.apache.commons.collections.keyvalue,new org.apache.commons.collections",
  org.apache.commons.collections.buffer,
+ org.apache.commons.collections.map,
+ org.apache.commons.collections4.map,
  org.apache.commons.dbcp,
  org.apache.commons.imaging,
  org.apache.commons.io;uses:="org.apache.commons.io.filefilter",
@@ -396,6 +398,7 @@ Bundle-ClassPath: .,
  lib/cdmlib-services-5.32.0-SNAPSHOT.jar,
  lib/commons-codec-1.15.jar,
  lib/commons-collections-3.2.2.jar,
+ lib/commons-collections4-4.4.jar,
  lib/commons-dbcp-1.4.jar,
  lib/commons-imaging-1.0-alpha3.jar,
  lib/commons-io-2.11.0.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 5f42faf4b5d098abdb70752315a1e852cf6305f2..f39f0fe7f347159c27c07baf3a32b1131f9450ce 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -10,6 +10,7 @@ bin.includes = META-INF/,\
                lib/cdmlib-services-5.32.0-SNAPSHOT.jar,\
                lib/commons-codec-1.15.jar,\
                lib/commons-collections-3.2.2.jar,\
+               lib/commons-collections4-4.4.jar,\
                lib/commons-dbcp-1.4.jar,\
                lib/commons-imaging-1.0-alpha3.jar,\
                lib/commons-io-2.11.0.jar,\

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index bb7241106f78a4b5e792a540d39f0d6fb0a3ba8d..e6e7c334bb163eb0134b96ed71c0778a3852d442 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -444,6 +444,14 @@
       <version>1.1.2</version>\r
     </dependency>\r
     \r
+    <!-- used by bulkeditor -->\r
+    <dependency>\r
+      <!-- used by CharacterMatrix/bulkeditor (LinkedList)  -->\r
+      <groupId>org.apache.commons</groupId>\r
+      <artifactId>commons-collections4</artifactId>\r
+      <version>4.4</version>\r
+    </dependency>\r
+    \r
     <!-- needed by taxeditor.test during test run, maybe move to test package only -->\r
     <dependency>\r
       <!-- when using bytebuddy for hibernate -->\r
@@ -670,13 +678,6 @@
       <version>${spring-security.version}</version>\r
     </dependency> -->\r
 \r
-    <!-- not yet used    \r
-    <dependency>\r
-      <!- used by AvailableDistributionWizard ->\r
-      <groupId>org.apache.commons</groupId>\r
-      <artifactId>commons-collections4</artifactId>\r
-      <version>4.4</version>\r
-    </dependency>  -->\r
     \r
   </dependencies>\r
 </project>\r

diff --git a/eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/AppModelId.java b/eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/bulkeditor2/AppModelId.java
similarity index 100%
rename from eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/AppModelId.java
rename to eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/bulkeditor2/AppModelId.java