ref #9204, ref #9206 cglib from taxeditor.cdmlib, move cglib-nodep to pom

diff --git a/.gitattributes b/.gitattributes
index 39cfdd6974a36ae12c037300e41fbce63dfd11da..ff88cf75c8db58547442d2cbe1569416fbec0d80 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -142,7 +142,6 @@ eu.etaxonomy.taxeditor.cdmlib/build.properties -text
 eu.etaxonomy.taxeditor.cdmlib/lib/activation-1.1.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/aopalliance-1.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-2.2.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/com.springsource.org.aopalliance-1.0.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/com.springsource.org.apache.commons.logging-1.1.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-20041127.091804.jar -text
@@ -163,7 +162,6 @@ eu.etaxonomy.taxeditor.cdmlib/lib/google-api-translate-java-0.92.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/h2mig_pagestore_addon.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hamcrest-core-1.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-4.1.10.Final.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-cglib-repack-2.1_3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/icu4j-2.6.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar -text

diff --git a/.gitignore b/.gitignore
index 82545b198b19f75360100ef25a5e95ff4fd2f028..be7640868914d519c210b6dc23979a6d85d6b444 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -111,3 +111,4 @@ eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-5.*.Final.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-5.*.Final.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/apache-log4j-extras-1.2.17.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/antlr-2.*.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-3.*.jar

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 2b7d804074e87c0ce0052170b3733234bf9b948f..080d756999db5b8cb568bee6679d226db771fa9b 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -717,8 +717,7 @@ Bundle-ClassPath: .,
  lib/slf4j-log4j12-1.7.30.jar,
  lib/antlr-2.7.7.jar,
  lib/aopalliance-1.0.jar,
- lib/cglib-3.2.0.jar,
- lib/cglib-nodep-3.2.0.jar,
+ lib/cglib-nodep-3.3.0.jar,
  lib/classmate-1.5.1.jar,
  lib/codemodel-2.2.11.jar,
  lib/FastInfoset-1.2.13.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index e94e22bf169a4bb1c753a79f14bb441d57d98054..66128d7369790745ac39411d0ee80d1220b51c56 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -118,8 +118,7 @@ bin.includes = META-INF/,\
                lib/slf4j-log4j12-1.7.30.jar,\
                lib/antlr-2.7.7.jar,\
                lib/aopalliance-1.0.jar,\
-               lib/cglib-3.2.0.jar,\
-               lib/cglib-nodep-3.2.0.jar,\
+               lib/cglib-nodep-3.3.0.jar,\
                lib/classmate-1.5.1.jar,\
                lib/codemodel-2.2.11.jar,\
                lib/FastInfoset-1.2.13.jar,\

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-3.2.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-3.2.0.jar
deleted file mode 100644 (file)
index 51e2d85..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-3.2.0.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-3.2.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-3.2.0.jar
deleted file mode 100644 (file)
index e11f7cb..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-3.2.0.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 418fde2a9a00810c4196d7bfc0319f8e734ab651..d4161051e1bc6494b0eb54b2f07d0cb149dcd7ed 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -68,7 +68,7 @@
                 spring-oxm,spring-jdbc,spring-security-config,spring-security-core,\r
                 aopalliance,aspectjweaver,aspectjrt,\r
                 hibernate-jpa-2.1-api,javassist,hibernate-commons-annotations,\r
-                hibernate-core,hibernate-entitymanager,hibernate-envers,antlr,\r
+                hibernate-core,hibernate-entitymanager,hibernate-envers,antlr,cglib-nodep,\r
                 xml-apis,lsid-client,jdom,jdom2,\r
                 poi,poi-ooxml,poi-ooxml-schemas,xmlbeans,commons-collections4,commons-math3,\r
                 jaxb-api,javax.activation-api,\r
@@ -659,6 +659,11 @@
         <artifactId>antlr</artifactId>\r
         <version>2.7.7</version>\r
     </dependency>\r
+    <dependency>\r
+           <groupId>cglib</groupId>\r
+           <artifactId>cglib-nodep</artifactId>\r
+           <version>3.3.0</version>\r
+       </dependency>\r
     \r
     <!-- KML/IIIF dependencies should not bee needed for the taxeditor, but at current the KMLDocumentBuilder \r
          is used in the EditGeoService bean which is needed to display the distribution maps in the editor.\r