Author: tjwatson
Date: Wed Feb 13 19:32:24 2019
New Revision: 1853529
URL: http://svn.apache.org/viewvc?rev=1853529&view=rev
Log:
FELIX-6056 - stop exporting promises and function
Modified:
felix/trunk/scr/bnd.bnd
felix/trunk/scr/pom.xml
felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
Modified: felix/trunk/scr/bnd.bnd
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/bnd.bnd?rev=1853529&r1=1853528&r2=1853529&view=diff
==============================================================================
--- felix/trunk/scr/bnd.bnd (original)
+++ felix/trunk/scr/bnd.bnd Wed Feb 13 19:32:24 2019
@@ -17,9 +17,7 @@ Export-Package: org.apache.felix.scr.com
org.apache.felix.scr.info;version=1.0.0;provide:=true, \
org.osgi.service.component;version=1.4;provide:=true, \
org.osgi.service.component.runtime;version=1.4;provide:=true, \
- org.osgi.service.component.runtime.dto;version=1.4;provide:=true, \
- org.osgi.util.function;version=1.1, \
- org.osgi.util.promise;version=1.1.1
+ org.osgi.service.component.runtime.dto;version=1.4;provide:=true
Private-Package: org.apache.felix.scr.impl.*
@@ -33,9 +31,7 @@ Import-Package: \
org.osgi.service.cm;version="[1.6,2)";resolution:=optional, \
org.osgi.service.log;version="[1.3,2)";resolution:=optional, \
org.osgi.service.metatype;version="[1.2,2)";resolution:=optional, \
- org.osgi.service.packageadmin;version="[1.2,2)";resolution:=optional, \
- org.osgi.util.function;version="[1.0,2)", \
- org.osgi.util.promise;version="[1.0,2)", \
+ org.osgi.service.packageadmin;version="[1.2,2)";resolution:=optional,\
org.apache.felix.service.command;resolution:=optional, \
*
Modified: felix/trunk/scr/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/pom.xml?rev=1853529&r1=1853528&r2=1853529&view=diff
==============================================================================
--- felix/trunk/scr/pom.xml (original)
+++ felix/trunk/scr/pom.xml Wed Feb 13 19:32:24 2019
@@ -114,13 +114,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.promise</artifactId>
- <version>1.1.1</version>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.function</artifactId>
- <version>1.1.0</version>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified:
felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java?rev=1853529&r1=1853528&r2=1853529&view=diff
==============================================================================
---
felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
(original)
+++
felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
Wed Feb 13 19:32:24 2019
@@ -179,6 +179,8 @@ public abstract class ComponentTestBase
provision( CoreOptions.bundle( bundleFile.toURI().toString() ),
mavenBundle( "org.ops4j.pax.tinybundles",
"tinybundles", "1.0.0" ),
mavenBundle( "org.apache.felix",
"org.apache.felix.configadmin", felixCaVersion ) ),
+ mavenBundle( "org.osgi", "org.osgi.util.promise"),
+ mavenBundle( "org.osgi", "org.osgi.util.function"),
junitBundles(), frameworkProperty(
"org.osgi.framework.bsnversion" ).value( bsnVersionUniqueness ),
systemProperty( "ds.factory.enabled" ).value(
Boolean.toString( NONSTANDARD_COMPONENT_FACTORY_BEHAVIOR ) ),
systemProperty( "ds.loglevel" ).value( DS_LOGLEVEL )
