ARIES-2179: Remove blueprint annotation api usage

blueprint/blueprint-bundle/pom.xml

@@ -61,7 +61,6 @@
             org.osgi.service.event*;resolution:=optional,
             org.osgi.service.framework;resolution:=optional,
             org.osgi.service.cm;version="[1.2,2)",
-            org.apache.aries.blueprint.annotation.service;provide:=true;resolution:=optional,
             org.apache.aries.quiesce.manager;provide:=true;resolution:=optional,
             org.apache.aries.quiesce.participant;provide:=true;resolution:=optional,
             *
@@ -71,7 +70,6 @@
             org.osgi.service.blueprint;uses:="org.osgi.service.blueprint.container,org.osgi.service.blueprint.reflect,org.apache.aries.blueprint,org.apache.aries.blueprint.ext,org.apache.aries.blueprint.mutable,org.apache.aries.blueprint.compendium.cm";version="1.1.0";-split-package:=merge-first,
             org.osgi.service.blueprint.container;-split-package:=merge-first,
             org.osgi.service.blueprint.reflect;-split-package:=merge-first,
-            !org.apache.aries.blueprint.annotation*,
             org.apache.aries.blueprint,
             org.apache.aries.blueprint.services,
             org.apache.aries.blueprint.mutable,

blueprint/blueprint-core/pom.xml

@@ -52,7 +52,6 @@
         </aries.osgi.activator>
         <!-- Export package versions are maintained in packageinfo files -->
         <aries.osgi.export.pkg>
-            !org.apache.aries.blueprint.annotation*,
             org.apache.aries.blueprint;-split-package:=merge-first,
             org.apache.aries.blueprint.mutable,
             org.apache.aries.blueprint.ext,
@@ -65,7 +64,6 @@
             !org.apache.aries.blueprint*,
             org.apache.aries.quiesce.manager;provide:=true;resolution:=optional,
             org.apache.aries.quiesce.participant;provide:=true;resolution:=optional,
-            org.apache.aries.blueprint.annotation.service,
             org.osgi.service.blueprint.*;provide:=true,
             org.osgi.service.event*;resolution:=optional,
             org.osgi.service.framework;resolution:=optional,
@@ -96,7 +94,6 @@
         <lastReleaseVersion>1.6.0</lastReleaseVersion>
 
         <asm.version>9.8</asm.version>
-        <blueprint.annotation.api.version>1.0.1</blueprint.annotation.api.version>
         <blueprint.api.version>1.0.1</blueprint.api.version>
         <blueprint.parser.version>1.6.0</blueprint.parser.version>
         <easymock.version>5.5.0</easymock.version>
@@ -136,12 +133,6 @@
             <artifactId>org.apache.aries.blueprint.api</artifactId>
             <version>${blueprint.api.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.annotation.api</artifactId>
-            <optional>true</optional>
-            <version>${blueprint.annotation.api.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>blueprint-parser</artifactId>

blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintExtender.java

@@ -39,7 +39,6 @@
 import java.util.concurrent.ScheduledExecutorService;
 
 import org.apache.aries.blueprint.BlueprintConstants;
-import org.apache.aries.blueprint.annotation.service.BlueprintAnnotationScanner;
 import org.apache.aries.blueprint.namespace.NamespaceHandlerRegistryImpl;
 import org.apache.aries.blueprint.services.BlueprintExtenderService;
 import org.apache.aries.blueprint.services.ParserService;
@@ -223,9 +222,9 @@
             // The bundle is not in STARTING or ACTIVE state anymore
             // so destroy the context.  Ignore our own bundle since it
             // needs to kick the orderly shutdown and not unregister the namespaces.
             if (bundle != this.context.getBundle()) {
                 destroyContainer(bundle);
             }
         }
     }
 
@@ -423,7 +422,7 @@
         try {
             List<URL> pathList = new ArrayList<URL>();
             String blueprintHeader = bundle.getHeaders().get(BlueprintConstants.BUNDLE_BLUEPRINT_HEADER);
             String blueprintHeaderAnnotation = bundle.getHeaders().get(BlueprintConstants.BUNDLE_BLUEPRINT_ANNOTATION_HEADER);
             if (blueprintHeader == null) {
                 blueprintHeader = "OSGI-INF/blueprint/";
             }
@@ -446,23 +445,6 @@
                     addEntries(bundle, baseName, filePattern, pathList);
                 }
             }
-            // Check annotations
-            if (blueprintHeaderAnnotation != null && blueprintHeaderAnnotation.trim().equalsIgnoreCase("true")) {
-                LOGGER.debug("Scanning bundle {}/{} for blueprint annotations", bundle.getSymbolicName(), bundle.getVersion());
-                ServiceReference sr = this.context.getServiceReference(BlueprintAnnotationScanner.class.getName());
-                if (sr != null) {
-                    BlueprintAnnotationScanner bas = (BlueprintAnnotationScanner) this.context.getService(sr);
-                    try {
-                        // try to generate the blueprint definition XML
-                        URL url = bas.createBlueprintModel(bundle);
-                        if (url != null) {
-                            pathList.add(url);
-                        }
-                    } finally {
-                        this.context.ungetService(sr);
-                    }
-                }
-            }
             if (!pathList.isEmpty()) {
                 LOGGER.debug("Found blueprint application in bundle {}/{} with paths: {}", bundle.getSymbolicName(), bundle.getVersion(), pathList);
                 // Check compatibility