Author: jbonofre
Date: Tue Mar 4 14:56:08 2014
New Revision: 1574121
URL: http://svn.apache.org/r1574121
Log:
Fix import in hadoop-client 2.3.0 bundle
Modified:
servicemix/smx4/bundles/trunk/hadoop-client-2.3.0/pom.xml
Modified: servicemix/smx4/bundles/trunk/hadoop-client-2.3.0/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/hadoop-client-2.3.0/pom.xml?rev=1574121&r1=1574120&r2=1574121&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/hadoop-client-2.3.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/hadoop-client-2.3.0/pom.xml Tue Mar 4
14:56:08 2014
@@ -43,9 +43,11 @@
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
com.google.common*,
- com.google.inject*,
+ com.google.inject,
+ com.google.inject.binder,
+ com.google.inject.servlet;resolution:=optional,
com.google.protobuf;version="[2.5,3)",
- com.jcraft.jsch,
+ com.jcraft.jsch;resolution:=optional,
javax.annotation,
javax.crypto*,
javax.management*,
@@ -53,9 +55,7 @@
javax.net*,
javax.security.auth*,
javax.security.sasl,
- javax.servlet,
- javax.servlet.http,
- javax.servlet.jsp;resolution:=optional,
+ javax.servlet*;resolution:=optional,
javax.ws.rs*;resolution:=optional,
javax.xml.bind*;resolution:=optional,
javax.xml.parsers,
@@ -65,56 +65,25 @@
com.sun.jersey*;resolution:=optional,
org.apache.avro*,
org.apache.commons.cli;version="[1.2,2)";resolution:=optional,
- org.apache.commons.codec.binary;version="[1.4,2)",
- org.apache.commons.codec.digest;version="[1.4,2)",
- org.apache.commons.codec;version="[1.4,2)",
- org.apache.commons.collections.map;version="[3.2,4)",
- org.apache.commons.collections;version="[3.2,4)",
+ org.apache.commons.codec*;version="[1.4,2)",
+ org.apache.commons.collections*;version="[3.2,4)",
org.apache.commons.compress.archivers.tar;version="[1.4,2)",
org.apache.commons.configuration;version="[1.6,2)",
org.apache.commons.daemon;version="[1.0,2)";resolution:=optional,
org.apache.commons.httpclient*,
- org.apache.commons.io.input;version="[1.4,2)",
- org.apache.commons.io;version="[1.4,2)",
- org.apache.commons.lang.builder;version="[2.6,3)",
- org.apache.commons.lang.math;version="[2.6,3)",
- org.apache.commons.lang.time;version="[2.6,3)",
- org.apache.commons.lang;version="[2.6,3)",
- org.apache.commons.logging.impl;version="[1.1,2)",
- org.apache.commons.logging;version="[1.1,2)",
- org.apache.commons.math3.util;version="[3.1,4)",
- org.apache.commons.net.ftp;version="[3.1,4)",
- org.apache.commons.net.util;version="[3.1,4)",
- org.apache.http;resolution:=optional,
- org.apache.http.client.utils;resolution:=optional,
+ org.apache.commons.io*;version="[1.4,2)",
+ org.apache.commons.lang*;version="[2.6,3)",
+ org.apache.commons.logging*;version="[1.1,2)";resolution:=optional,
+
org.apache.commons.math3.util;version="[3.1,4)";resolution:=optional,
+ org.apache.commons.net*;version="[3.1,4)",
+ org.apache.http*;resolution:=optional,
org.apache.log4j*;resolution:=optional,
org.apache.jasper.runtime;resolution:=optional,
- org.apache.tools.ant;resolution:=optional,
- org.apache.tools.ant.types;resolution:=optional,
- org.apache.zookeeper.data;version="[3.4,4)",
- org.apache.zookeeper;version="[3.4,4)",
+ org.apache.tools.ant*;resolution:=optional,
+ org.apache.zookeeper*;version="[3.4,4)";resolution:=optional,
org.codehaus.jackson*;version="[1.8,2)",
- org.jboss.netty.bootstrap;version="[3.6,4)",
- org.jboss.netty.buffer;version="[3.6,4)",
- org.jboss.netty.channel.group;version="[3.6,4)",
- org.jboss.netty.channel.socket.nio;version="[3.6,4)",
- org.jboss.netty.channel;version="[3.6,4)",
- org.jboss.netty.handler.codec.frame;version="[3.6,4)",
- org.jboss.netty.handler.codec.http;version="[3.6,4)",
- org.jboss.netty.handler.ssl;version="[3.6,4)",
- org.jboss.netty.handler.stream;version="[3.6,4)",
- org.jboss.netty.util;version="[3.6,4)",
- org.mortbay.io;version="[6.1,8)";resolution:=optional,
- org.mortbay.jetty.handler;version="[6.1,8)";resolution:=optional,
- org.mortbay.jetty.nio;version="[6.1,8)";resolution:=optional,
- org.mortbay.jetty.security;version="[6.1,8)";resolution:=optional,
- org.mortbay.jetty.servlet;version="[6.1,8)";resolution:=optional,
- org.mortbay.jetty;version="[6.1,8)";resolution:=optional,
- org.mortbay.jetty.webapp;version="[6.1,8)";resolution:=optional,
- org.mortbay.log;version="[6.1,8)";resolution:=optional,
- org.mortbay.thread;version="[6.1,8)";resolution:=optional,
- org.mortbay.util.ajax;version="[6.1,8)";resolution:=optional,
- org.mortbay.util;version="[6.1,8)";resolution:=optional,
+ org.jboss.netty*;version="[3.6,4)";resolution:=optional,
+ org.mortbay*;version="[6.1,8)";resolution:=optional,
sun.net*;resolution:=optional,
org.ietf.jgss;resolution:=optional,
org.jets3t.service*;resolution:=optional,
