[felix-dev] branch master updated: FELIX-6521 - Stop exporting org.osgi.service.component packages

[tj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tjwatson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new bb03476133 FELIX-6521 - Stop exporting org.osgi.service.component packages
     new dc0d442ed4 Merge pull request #145 from tjwatson/importComponentPackages
bb03476133 is described below

commit bb03476133c54babb184c0f33af0f5005d4a5fcf
Author: Thomas Watson <tj...@us.ibm.com>
AuthorDate: Mon Apr 25 10:01:51 2022 -0500

    FELIX-6521 - Stop exporting org.osgi.service.component packages
    
    Require the spec package org.osgi.service.component and its
    subpackages to be imported.
---
 scr/bnd.bnd                                                          | 5 +----
 .../java/org/apache/felix/scr/integration/ComponentTestBase.java     | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/scr/bnd.bnd b/scr/bnd.bnd
index 72a5c1ed6c..f42aaf5beb 100644
--- a/scr/bnd.bnd
+++ b/scr/bnd.bnd
@@ -14,10 +14,7 @@ Require-Capability: osgi.ee;\
                    filter:="(|(&(osgi.ee=JavaSE)(version=1.7))(&(osgi.ee=JavaSE/compact1)(version=1.8)))"
 
 Export-Package: org.apache.felix.scr.component;version=1.1.0;provide:=true, \
- org.apache.felix.scr.info;version=1.0.0;provide:=true, \
- org.osgi.service.component;version=1.5;provide:=true, \
- org.osgi.service.component.runtime;version=1.5;provide:=true, \
- org.osgi.service.component.runtime.dto;version=1.5;provide:=true
+ org.apache.felix.scr.info;version=1.0.0;provide:=true
 
 Private-Package: org.apache.felix.scr.impl.*
 
diff --git a/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java b/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
index bab72bc0b7..39724c1b0f 100644
--- a/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
+++ b/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
@@ -190,6 +190,7 @@ public abstract class ComponentTestBase
                         mavenBundle( "org.apache.felix", "org.apache.felix.configadmin", felixCaVersion ) ),
                         mavenBundle( "org.osgi", "org.osgi.util.promise"),
                         mavenBundle( "org.osgi", "org.osgi.util.function"),
+                        mavenBundle( "org.osgi", "org.osgi.service.component"),
                         mavenBundle( "org.ops4j.pax.url", "pax-url-aether"),
                 junitBundles(), frameworkProperty( "org.osgi.framework.bsnversion" ).value( bsnVersionUniqueness ),
                 systemProperty( "ds.factory.enabled" ).value( Boolean.toString( NONSTANDARD_COMPONENT_FACTORY_BEHAVIOR ) ),