CQ12676 : use Eclipse Orbit bundle apache.commons.codec (#475)

uses import-packages rather than required bundle to increase flexibility for integrators (using never versions of codec bundle or even from another provider)

Change-Id: Ic7483438df15c06f66ef0159057a96549935abcf

Signed-off-by: kassid <[email protected]>

Co-authored-by: Frank Gasdorf <[email protected]>

Author: kassid

extras/org.locationtech.udig.target/org.locationtech.udig.target.target

@@ -95,7 +95,7 @@
 <unit id="org.apache.batik.util" version="1.7.0.v201011041433"/>
 <unit id="org.apache.batik.util.gui" version="1.7.0.v200903091627"/>
 <unit id="org.apache.batik.xml" version="1.7.0.v201011041433"/>
-<unit id="org.apache.commons.codec" version="0.0.0"/>
+<unit id="org.apache.commons.codec" version="1.9.0.v20170208-1614"/>
 <unit id="org.apache.commons.lang" version="0.0.0"/>
 <unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
 <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>

plugins/org.locationtech.udig.libs.netcdf/.classpath

@@ -9,7 +9,6 @@
 	<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/cdm-4.6.11.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-cli-1.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-httpclient-3.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.0.4.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/gt-netcdf-22.1.jar"/>

plugins/org.locationtech.udig.libs.netcdf/META-INF/MANIFEST.MF

@@ -21,7 +21,6 @@ Bundle-ClassPath: lib/aws-java-sdk-core-1.11.236.jar,
  lib/c3p0-0.9.1.1.jar,
  lib/cdm-4.6.11.jar,
  lib/commons-cli-1.4.jar,
- lib/commons-codec-1.2.jar,
  lib/commons-httpclient-3.1.jar,
  lib/commons-logging-1.0.4.jar,
  lib/gt-netcdf-22.1.jar,
@@ -66,4 +65,10 @@ Import-Package: com.sun.jna;version="4.2.0",
  javax.media.jai.remote,
  javax.media.jai.tilecodec,
  javax.media.jai.util,
- javax.media.jai.widget
+ javax.media.jai.widget,
+ org.apache.commons.codec;version="1.2.0",
+ org.apache.commons.codec.binary;version="1.2.0",
+ org.apache.commons.codec.digest;version="1.2.0",
+ org.apache.commons.codec.language;version="1.2.0",
+ org.apache.commons.codec.language.bm;version="1.2.0",
+ org.apache.commons.codec.net;version="1.2.0"

plugins/org.locationtech.udig.libs.netcdf/build.properties

@@ -6,7 +6,6 @@ bin.includes = META-INF/,\
                lib/c3p0-0.9.1.1.jar,\
                lib/cdm-4.6.11.jar,\
                lib/commons-cli-1.4.jar,\
-               lib/commons-codec-1.2.jar,\
                lib/commons-httpclient-3.1.jar,\
                lib/commons-logging-1.0.4.jar,\
                lib/gt-netcdf-22.1.jar,\

plugins/org.locationtech.udig.libs/META-INF/MANIFEST.MF

@@ -13,8 +13,7 @@ Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
  org.apache.xerces;visibility:=reexport,
  org.apache.log4j;visibility:=reexport,
  org.eclipse.xsd;visibility:=reexport,
- org.eclipse.swt;visibility:=reexport,
- org.apache.commons.codec;bundle-version="1.9.0";visibility:=reexport
+ org.eclipse.swt;visibility:=reexport
 Bundle-Activator: org.locationtech.udig.libs.internal.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -94,6 +93,12 @@ Import-Package: com.sun.jna;version="4.2.0",
  oracle.security.o3logon;resolution:=optional,
  oracle.sql;resolution:=optional,
  oracle.sql.converter;resolution:=optional,
+ org.apache.commons.codec;version="1.2.0",
+ org.apache.commons.codec.binary;version="1.2.0",
+ org.apache.commons.codec.digest;version="1.2.0",
+ org.apache.commons.codec.language;version="1.2.0",
+ org.apache.commons.codec.language.bm;version="1.2.0",
+ org.apache.commons.codec.net;version="1.2.0",
  org.jfree;version="1.0.13",
  org.jfree.base;version="1.0.13",
  org.jfree.base.config;version="1.0.13",

plugins/org.locationtech.udig.libs/pom-libs.xml

@@ -722,13 +722,6 @@
 			<artifactId>commons-math</artifactId>
 			<version>2.2</version>
 		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.9</version>
-			<scope>provided</scope>
-		</dependency>
-		
 
 		<!-- EMF -->
 		<dependency>

pom-libs.xml

@@ -111,6 +111,12 @@
         <version>${jai.core.version}</version>
         <scope>provided</scope>
       </dependency>
+      <dependency>
+        <groupId>commons-codec</groupId>
+        <artifactId>commons-codec</artifactId>
+        <version>1.9</version>
+        <scope>provided</scope>
+      </dependency>
     </dependencies>
 
     <build>