TUP-4273 : used servicemix.avro instead of avro.

TUP-4273 : removed avro from libraies.apache .
2016-03-23 11:48:44 +01:00 · 2016-03-22 11:51:53 +01:00
6 changed files with 24 additions and 44 deletions
--- a/main/features/org.talend.utils.feature/feature.xml
+++ b/main/features/org.talend.utils.feature/feature.xml
@@ -128,4 +128,24 @@
         version="0.0.0"
         unpack="false"/>

+   <plugin
+         id="org.apache.servicemix.bundles.avro"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="com.thoughtworks.paranamer"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.commons.compress"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
--- a/main/plugins/org.talend.core.runtime/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.core.runtime/META-INF/MANIFEST.MF
@@ -105,14 +105,13 @@ Require-Bundle: org.eclipse.jdt.core,
 org.apache.log4j,
 org.talend.model,
 org.talend.utils;visibility:=reexport,
- org.talend.libraries.apache,
 org.talend.libraries.dom4j-jaxen,
 org.talend.libraries.csv,
 org.talend.commons.runtime;visibility:=reexport,
 org.talend.commons.ui,
 org.ops4j.pax.url.mvn,
 org.talend.components.api,
- org.talend.libraries.jackson
+ org.apache.servicemix.bundles.avro
 Bundle-Activator: org.talend.core.runtime.CoreRuntimePlugin
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
--- a/main/plugins/org.talend.libraries.apache/.classpath
+++ b/main/plugins/org.talend.libraries.apache/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/avro-1.8.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="lib/ant.jar"/>
--- a/main/plugins/org.talend.libraries.apache/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.libraries.apache/META-INF/MANIFEST.MF
@@ -9,23 +9,13 @@ Bundle-ClassPath: .,
 lib/castor-1.0.3.jar,
 lib/jakarta-oro-2.0.8.jar,
 lib/xerces-2.6.2.jar,
- lib/xmlbeans-2.3.0.jar,
- lib/avro-1.8.0.jar
+ lib/xmlbeans-2.3.0.jar
 Bundle-Vendor: .Talend SA.
 Require-Bundle: org.apache.log4j;resolution:=optional,
 org.talend.libraries.apache.common;visibility:=reexport,
 jackson-core-asl;bundle-version="1.9.13",
 jackson-mapper-asl;bundle-version="1.9.13"
 Export-Package: 
- org.apache.avro;version="1.8.0",
- org.apache.avro.data;version="1.8.0",
- org.apache.avro.file;version="1.8.0",
- org.apache.avro.generic;version="1.8.0",
- org.apache.avro.io;version="1.8.0",
- org.apache.avro.io.parsing;version="1.8.0",
- org.apache.avro.reflect;version="1.8.0",
- org.apache.avro.specific;version="1.8.0",
- org.apache.avro.util;version="1.8.0",
 org.apache.james.mime4j,
 org.apache.james.mime4j.codec,
 org.apache.james.mime4j.descriptor,
--- a/main/plugins/org.talend.libraries.apache/build.properties
+++ b/main/plugins/org.talend.libraries.apache/build.properties
@@ -2,8 +2,7 @@ output.. = bin/
 bin.includes = META-INF/,\
               .,\
               licences/,\
-               lib/,\
-               lib/avro-1.8.0.jar
+               lib/
 bin.excludes = libs_not_used/commons-betwixt-0.8.jar,\
               libs_not_used/commons-digester-1.7.jar,\
               libs_not_used/commons-discovery-0.2.jar,\
--- a/main/plugins/org.talend.libraries.jackson/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.libraries.jackson/META-INF/MANIFEST.MF
@@ -38,34 +38,7 @@ Export-Package: com.fasterxml.jackson.databind;version="2.5.3",
 net.sf.json.regexp,
 net.sf.json.test,
 net.sf.json.util,
- net.sf.json.xml,
- org.codehaus.jackson,
- org.codehaus.jackson.annotate,
- org.codehaus.jackson.format,
- org.codehaus.jackson.impl,
- org.codehaus.jackson.io,
- org.codehaus.jackson.map,
- org.codehaus.jackson.map.annotate,
- org.codehaus.jackson.map.deser,
- org.codehaus.jackson.map.deser.impl,
- org.codehaus.jackson.map.deser.std,
- org.codehaus.jackson.map.exc,
- org.codehaus.jackson.map.ext,
- org.codehaus.jackson.map.impl,
- org.codehaus.jackson.map.introspect,
- org.codehaus.jackson.map.jsontype,
- org.codehaus.jackson.map.jsontype.impl,
- org.codehaus.jackson.map.module,
- org.codehaus.jackson.map.ser,
- org.codehaus.jackson.map.ser.impl,
- org.codehaus.jackson.map.ser.std,
- org.codehaus.jackson.map.type,
- org.codehaus.jackson.map.util,
- org.codehaus.jackson.node,
- org.codehaus.jackson.schema,
- org.codehaus.jackson.sym,
- org.codehaus.jackson.type,
- org.codehaus.jackson.util
+ net.sf.json.xml
 Require-Bundle: org.apache.commons.lang,
 org.apache.commons.logging,
 org.apache.commons.collections,
Author	SHA1	Message	Date
Sebastien Gandon	ec1cf37059	TUP-4273 : used servicemix.avro instead of avro.	2016-03-23 11:48:44 +01:00
Sebastien Gandon	2867cdf3a7	TUP-4273 : removed avro from libraies.apache .	2016-03-22 11:51:53 +01:00