You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2015/02/06 09:36:11 UTC
svn commit: r1657755 - in /felix/trunk/scr: bnd.bnd pom.xml
src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
Author: cziegeler
Date: Fri Feb 6 08:36:11 2015
New Revision: 1657755
URL: http://svn.apache.org/r1657755
Log:
Set version back to 1.8.3-SNAPSHOT and move provisional marker from API as that is not true
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=1657755&r1=1657754&r2=1657755&view=diff
==============================================================================
--- felix/trunk/scr/bnd.bnd (original)
+++ felix/trunk/scr/bnd.bnd Fri Feb 6 08:36:11 2015
@@ -12,7 +12,7 @@ Provide-Capability: osgi.extender;\
Export-Package: org.apache.felix.scr;version=1.8.1, \
- org.apache.felix.scr.component;version=1.1.0;mandatory:="status"; status="provisional", \
+ org.apache.felix.scr.component;version=1.1.0, \
org.osgi.service.component;version=1.3;-split-package:=first, \
org.osgi.service.component.runtime.*;version=1.3, \
org.osgi.util.function;version=1.0, \
Modified: felix/trunk/scr/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scr/pom.xml?rev=1657755&r1=1657754&r2=1657755&view=diff
==============================================================================
--- felix/trunk/scr/pom.xml (original)
+++ felix/trunk/scr/pom.xml Fri Feb 6 08:36:11 2015
@@ -30,7 +30,7 @@
Implementation of the Declarative Services specification 1.3
</description>
<artifactId>org.apache.felix.scr</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>1.8.3-SNAPSHOT</version>
<scm>
<connection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/scr</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/scr</developerConnection>
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=1657755&r1=1657754&r2=1657755&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 Fri Feb 6 08:36:11 2015
@@ -159,7 +159,7 @@ public abstract class ComponentTestBase
"org.apache.felix.scr.integration.components.deadlock," +
"org.apache.felix.scr.integration.components.felix3680," +
"org.apache.felix.scr.integration.components.felix3680_2");
- builder.setHeader("Import-Package", "org.apache.felix.scr,org.apache.felix.scr.component;mandatory:=\"status\"; status=\"provisional\"");
+ builder.setHeader("Import-Package", "org.apache.felix.scr,org.apache.felix.scr.component");
builder.setHeader("Bundle-ManifestVersion", "2");
return builder;
}