Author: cschneider
Date: Wed Jan 11 14:55:22 2017
New Revision: 1778307
URL: http://svn.apache.org/viewvc?rev=1778307&view=rev
Log:
[ARIES-1658] Require OSGi 4.3 and slf4j
Modified:
aries/trunk/proxy/proxy-api/pom.xml
aries/trunk/proxy/proxy-impl/pom.xml
Modified: aries/trunk/proxy/proxy-api/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-api/pom.xml?rev=1778307&r1=1778306&r2=1778307&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-api/pom.xml (original)
+++ aries/trunk/proxy/proxy-api/pom.xml Wed Jan 11 14:55:22 2017
@@ -48,15 +48,6 @@
<aries.osgi.export.pkg>
org.apache.aries.proxy*
</aries.osgi.export.pkg>
- <!--
- We override the import versions for org.osgi.framework because we
can operate on
- a 4.2 framework (we only need 4.3 for weaving which is optional).
- -->
- <aries.osgi.import.pkg>
- org.osgi.framework;version="[1.5,2)",
- org.osgi.framework.hooks.weaving;resolution:=optional,
- *
- </aries.osgi.import.pkg>
<aries.osgi.private.pkg />
<lastReleaseVersion>1.0.1</lastReleaseVersion>
Modified: aries/trunk/proxy/proxy-impl/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/proxy/proxy-impl/pom.xml?rev=1778307&r1=1778306&r2=1778307&view=diff
==============================================================================
--- aries/trunk/proxy/proxy-impl/pom.xml (original)
+++ aries/trunk/proxy/proxy-impl/pom.xml Wed Jan 11 14:55:22 2017
@@ -50,19 +50,11 @@
<aries.osgi.activator>
org.apache.aries.proxy.impl.ProxyManagerActivator
</aries.osgi.activator>
- <!--
- We override the import versions for org.osgi.framework because we
can operate on
- a 4.2 framework (we only need 4.3 for weaving which is optional).
- -->
<aries.osgi.import.pkg>
org.apache.aries.proxy.weavinghook;resolution:=optional;provide:=true,
org.apache.aries.proxy*;provide:=true,
org.objectweb.asm*;resolution:=optional;version="[5,7)",
sun.reflect*;resolution:=optional,
- org.osgi.framework;version="[1.5,2)",
- org.osgi.framework.hooks.weaving;resolution:=optional,
- org.osgi.framework.wiring;resolution:=optional,
- org.slf4j;version="[1.6,2)";resolution:=optional,
*
</aries.osgi.import.pkg>
<aries.osgi.private.pkg>