ref #10009 try to remove json-lib-2.4-jdk15

diff --git a/.gitattributes b/.gitattributes
index 4d006deaf9ec57081d71580a4b1b000ab799876c..8812ddcea5f06f5b926184cd161e165445638a9b 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -162,9 +162,6 @@ eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2-EA.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jdbc4-2.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jdom-1.1.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.11.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.0.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/json-lib-2.4-jdk15.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jsr250-api-1.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.3.3.jar -text

diff --git a/.gitignore b/.gitignore
index d817610e2c9f4d08e61eb2a2177e0e16a29c8ae4..06dfb729d6dbcd21fc164e805f8e9592b9ed391d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -114,7 +114,6 @@ eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/json-2*.jar
-eu.etaxonomy.taxeditor.cdmlib/lib/json-lib-2.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/lucene-*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.*.jar
 

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 0128c8317e294bfb83afbab610187430502535fa..ec764495b139f60029c2b1f43782fa5a651f123b 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -187,7 +187,6 @@ Export-Package: com.sun.istack.internal.tools,
  net.sf.ehcache.statistics,
  net.sf.ehcache.store,
  net.sf.ehcache.util,
- net.sf.json;uses:="net.sf.json.processors,net.sf.json.util,org.apache.commons.lang.exception",
  org.aopalliance.aop,
  org.apache.commons.collections4.map,
  org.apache.commons.dbcp,
@@ -431,7 +430,6 @@ Bundle-ClassPath: .,
  lib/opencsv-2.3.jar,
  lib/junit-4.13.2.jar,
  lib/json-20220320.jar,
- lib/json-lib-2.4-jdk15.jar,
  lib/antlr-2.7.7.jar,
  lib/postgresql-42.3.6.jar,
  lib/lucene-core-5.5.5.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index c84e2e322dbe6a084bc10ffea1bcd3743f0640cf..b3245146fe244ace33ae95838dd9ebd9f166f55c 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -65,7 +65,7 @@
               <includeArtifactIds>\r
                 httpclient,JavaAPIforKml,iiif-apis,commons-lang3,commons-lang,commons-text,\r
                 commons-codec,commons-io,\r
-                json,json-lib,\r
+                json,\r
                 log4j-core,log4j-api,slf4j-api,jboss-logging,jcl-over-slf4j,log4j-slf4j-impl,\r
                 lucene-analyzers-common,lucene-core,lucene-queryparser,lucene-suggest,lucene-sandbox,\r
                 commons-imaging,jackson-databind,jackson-annotations,jackson-core,\r
@@ -590,14 +590,6 @@
     </dependency>\r
     \r
     <!-- Only added for correct package export -->\r
-\r
-  <!--  <dependency>\r
-      <groupId>net.sf.json-lib</groupId>\r
-      <artifactId>json-lib</artifactId>\r
-      <version>2.4</version>  -->\r
-      <!-- classifier required as json-lib exists on maven central as json-lib-2.4-jdk15.jar and xxx-jdk13.jar, see #9887 -->\r
-   <!--  <classifier>jdk15</classifier>\r
-    </dependency>  -->\r
     <!-- \r
     <dependency>\r
       <groupId>org.springframework</groupId>\r