You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by al...@apache.org on 2025/03/07 18:38:55 UTC

(aries) 01/01: ARIES-2169: Make blueprint-maven-plugin a top level module

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

alien11689 pushed a commit to branch ARIES-2169-make-blueprint-maven-plugin-a-top-level-module
in repository https://gitbox.apache.org/repos/asf/aries.git

commit 5413fc7e787f3c2a5bc547bfee4e1c73a6d36059
Author: Dominik Przybysz <al...@gmail.com>
AuthorDate: Fri Mar 7 19:36:32 2025 +0100

    ARIES-2169: Make blueprint-maven-plugin a top level module
---
 .github/labeler.yml                                               | 3 +++
 .../{blueprint-plugin.yml => blueprint-maven-plugin.yml}          | 8 ++++----
 .github/workflows/blueprint.yml                                   | 1 -
 .../blueprint-maven-plugin-annotation/LICENSE                     | 0
 .../blueprint-maven-plugin-annotation/NOTICE                      | 0
 .../blueprint-maven-plugin-annotation/pom.xml                     | 2 +-
 .../org/apache/aries/blueprint/annotation/bean/Activation.java    | 0
 .../java/org/apache/aries/blueprint/annotation/bean/Bean.java     | 0
 .../java/org/apache/aries/blueprint/annotation/bean/Scope.java    | 0
 .../org/apache/aries/blueprint/annotation/bean/package-info.java  | 0
 .../aries/blueprint/annotation/collection/CollectionInject.java   | 0
 .../aries/blueprint/annotation/collection/package-info.java       | 0
 .../java/org/apache/aries/blueprint/annotation/config/Config.java | 0
 .../aries/blueprint/annotation/config/ConfigProperties.java       | 0
 .../apache/aries/blueprint/annotation/config/ConfigProperty.java  | 0
 .../apache/aries/blueprint/annotation/config/DefaultProperty.java | 0
 .../apache/aries/blueprint/annotation/config/package-info.java    | 0
 .../blueprint/annotation/referencelistener/Availability.java      | 0
 .../apache/aries/blueprint/annotation/referencelistener/Bind.java | 0
 .../aries/blueprint/annotation/referencelistener/Cardinality.java | 0
 .../blueprint/annotation/referencelistener/ReferenceListener.java | 0
 .../aries/blueprint/annotation/referencelistener/Unbind.java      | 0
 .../blueprint/annotation/referencelistener/package-info.java      | 0
 .../org/apache/aries/blueprint/annotation/service/AutoExport.java | 0
 .../apache/aries/blueprint/annotation/service/Availability.java   | 0
 .../org/apache/aries/blueprint/annotation/service/MemberType.java | 0
 .../org/apache/aries/blueprint/annotation/service/Reference.java  | 0
 .../apache/aries/blueprint/annotation/service/ReferenceList.java  | 0
 .../org/apache/aries/blueprint/annotation/service/Service.java    | 0
 .../aries/blueprint/annotation/service/ServiceProperty.java       | 0
 .../apache/aries/blueprint/annotation/service/package-info.java   | 0
 .../blueprint-maven-plugin-itest/LICENSE                          | 0
 .../blueprint-maven-plugin-itest/NOTICE                           | 0
 .../blueprint-maven-plugin-itest/pom.xml                          | 2 +-
 .../src/it/custom-destination/pom.xml                             | 0
 .../src/it/custom-destination/src/main/java/p1/T1.java            | 0
 .../src/it/custom-destination/verify.groovy                       | 0
 .../src/it/fail-on-conflict/invoker.properties                    | 0
 .../blueprint-maven-plugin-itest/src/it/fail-on-conflict/pom.xml  | 0
 .../src/it/fail-on-conflict/src/main/java/p1/T1.java              | 0
 .../src/it/fail-on-conflict/src/main/java/p1/T2.java              | 0
 .../src/it/fail-on-conflict/src/main/java/p2/T1.java              | 0
 .../src/it/fail-on-conflict/verify.groovy                         | 0
 .../src/it/multiple-invocation/pom.xml                            | 0
 .../src/it/multiple-invocation/src/main/java/p1/T1.java           | 0
 .../src/it/multiple-invocation/src/main/java/p2/T2.java           | 0
 .../src/it/multiple-invocation/verify.groovy                      | 0
 .../blueprint-maven-plugin-itest/src/it/pax-cdi/pom.xml           | 0
 .../src/it/pax-cdi/src/main/java/p1/I1.java                       | 0
 .../src/it/pax-cdi/src/main/java/p1/I2.java                       | 0
 .../src/it/pax-cdi/src/main/java/p1/T1.java                       | 0
 .../blueprint-maven-plugin-itest/src/it/pax-cdi/verify.groovy     | 0
 .../src/it/produced-bean-by-method-name/pom.xml                   | 0
 .../src/it/produced-bean-by-method-name/src/main/java/p1/T1.java  | 0
 .../src/it/produced-bean-by-method-name/verify.groovy             | 0
 .../blueprint-maven-plugin-itest/src/it/scanpath-restrict/pom.xml | 0
 .../src/it/scanpath-restrict/src/main/java/p1/T1.java             | 0
 .../src/it/scanpath-restrict/src/main/java/p2/T2.java             | 0
 .../src/it/scanpath-restrict/src/main/java/p2/inner/T3.java       | 0
 .../src/it/scanpath-restrict/verify.groovy                        | 0
 .../blueprint-maven-plugin-itest/src/it/simple-project/pom.xml    | 0
 .../src/it/simple-project/src/main/java/p1/T1.java                | 0
 .../src/it/simple-project/src/main/java/p1/T2.java                | 0
 .../src/it/simple-project/verify.groovy                           | 0
 .../blueprint-maven-plugin-itest/src/it/spring/pom.xml            | 0
 .../src/it/spring/src/main/java/p1/T1.java                        | 0
 .../src/it/spring/src/main/java/p1/T2.java                        | 0
 .../blueprint-maven-plugin-itest/src/it/spring/verify.groovy      | 0
 .../src/it/transaction-annotation/pom.xml                         | 0
 .../src/it/transaction-annotation/src/main/java/p1/T1.java        | 0
 .../src/it/transaction-annotation/src/main/java/p2/T1.java        | 0
 .../src/it/transaction-annotation/src/main/java/p3/T1.java        | 0
 .../src/it/transaction-annotation/verify.groovy                   | 0
 .../blueprint-maven-plugin-itest/src/it/with-provide/a/pom.xml    | 0
 .../src/it/with-provide/a/src/main/java/a/A.java                  | 0
 .../blueprint-maven-plugin-itest/src/it/with-provide/b/pom.xml    | 0
 .../src/it/with-provide/b/src/main/java/b/B.java                  | 0
 .../blueprint-maven-plugin-itest/src/it/with-provide/c/pom.xml    | 0
 .../src/it/with-provide/c/src/main/java/c/Api.java                | 0
 .../blueprint-maven-plugin-itest/src/it/with-provide/pom.xml      | 0
 .../src/it/with-provide/verify.groovy                             | 0
 .../blueprint-maven-plugin-pax-cdi-handlers/LICENSE               | 0
 .../blueprint-maven-plugin-pax-cdi-handlers/NOTICE                | 0
 .../blueprint-maven-plugin-pax-cdi-handlers/pom.xml               | 2 +-
 .../blueprint/plugin/handlers/paxcdi/OsgiServiceHandler.java      | 0
 .../plugin/handlers/paxcdi/OsgiServiceProviderHandler.java        | 0
 .../aries/blueprint/plugin/handlers/paxcdi/ServiceProperty.java   | 0
 .../org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler   | 0
 ...e.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler | 0
 .../blueprint-maven-plugin-spi/LICENSE                            | 0
 .../blueprint-maven-plugin-spi/NOTICE                             | 0
 .../blueprint-maven-plugin-spi/pom.xml                            | 2 +-
 .../java/org/apache/aries/blueprint/plugin/spi/Activation.java    | 0
 .../org/apache/aries/blueprint/plugin/spi/AnnotationHandler.java  | 0
 .../java/org/apache/aries/blueprint/plugin/spi/Availability.java  | 0
 .../apache/aries/blueprint/plugin/spi/BeanAnnotationHandler.java  | 0
 .../java/org/apache/aries/blueprint/plugin/spi/BeanEnricher.java  | 0
 .../java/org/apache/aries/blueprint/plugin/spi/BeanFinder.java    | 0
 .../apache/aries/blueprint/plugin/spi/BlueprintConfiguration.java | 0
 .../plugin/spi/CollectionDependencyAnnotationHandler.java         | 0
 .../org/apache/aries/blueprint/plugin/spi/ContextEnricher.java    | 0
 .../aries/blueprint/plugin/spi/ContextInitializationHandler.java  | 0
 .../blueprint/plugin/spi/CustomDependencyAnnotationHandler.java   | 0
 .../apache/aries/blueprint/plugin/spi/FactoryMethodFinder.java    | 0
 .../apache/aries/blueprint/plugin/spi/FieldAnnotationHandler.java | 0
 .../org/apache/aries/blueprint/plugin/spi/InjectLikeHandler.java  | 0
 .../aries/blueprint/plugin/spi/MethodAnnotationHandler.java       | 0
 .../org/apache/aries/blueprint/plugin/spi/NamedLikeHandler.java   | 0
 .../aries/blueprint/plugin/spi/QualifingAnnotationFinder.java     | 0
 .../apache/aries/blueprint/plugin/spi/ValueInjectionHandler.java  | 0
 .../java/org/apache/aries/blueprint/plugin/spi/XmlWriter.java     | 0
 .../blueprint-maven-plugin-spring-handlers/LICENSE                | 0
 .../blueprint-maven-plugin-spring-handlers/NOTICE                 | 0
 .../blueprint-maven-plugin-spring-handlers/pom.xml                | 2 +-
 .../aries/blueprint/plugin/handlers/spring/AutowiredAsInject.java | 0
 .../aries/blueprint/plugin/handlers/spring/ComponentAsNamed.java  | 0
 .../blueprint/plugin/handlers/spring/ComponentBeanFinder.java     | 0
 .../plugin/handlers/spring/DependsOnAttributeResolver.java        | 0
 .../blueprint/plugin/handlers/spring/LazyAttributeResolver.java   | 0
 .../aries/blueprint/plugin/handlers/spring/QualifierAsNamed.java  | 0
 .../plugin/handlers/spring/SpringTransactionalFactory.java        | 0
 .../blueprint/plugin/handlers/spring/ValueInjectionHandler.java   | 0
 .../org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler   | 0
 .../services/org.apache.aries.blueprint.plugin.spi.BeanFinder     | 0
 .../org.apache.aries.blueprint.plugin.spi.InjectLikeHandler       | 0
 .../org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler | 0
 .../org.apache.aries.blueprint.plugin.spi.NamedLikeHandler        | 0
 .../org.apache.aries.blueprint.plugin.spi.ValueInjectionHandler   | 0
 .../blueprint-maven-plugin/LICENSE                                | 0
 .../blueprint-maven-plugin/NOTICE                                 | 0
 .../blueprint-maven-plugin/pom.xml                                | 2 +-
 .../org/apache/aries/blueprint/plugin/AddResourceDirMojo.java     | 0
 .../java/org/apache/aries/blueprint/plugin/ArtifactFilter.java    | 0
 .../apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java | 0
 .../org/apache/aries/blueprint/plugin/BlueprintFileWriter.java    | 0
 .../org/apache/aries/blueprint/plugin/FilteredClassFinder.java    | 0
 .../main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java | 0
 .../java/org/apache/aries/blueprint/plugin/NegativeTimeout.java   | 0
 .../java/org/apache/aries/blueprint/plugin/PackageFinder.java     | 0
 .../org/apache/aries/blueprint/plugin/ResourceInitializer.java    | 0
 .../java/org/apache/aries/blueprint/plugin/handlers/Handlers.java | 0
 .../blueprint/plugin/handlers/blueprint/bean/BeanHandler.java     | 0
 .../handlers/blueprint/collection/CollectionInjectHandler.java    | 0
 .../plugin/handlers/blueprint/config/ConfigAnnotationHandler.java | 0
 .../plugin/handlers/blueprint/config/ConfigPropertiesHandler.java | 0
 .../handlers/blueprint/config/ConfigPropertyInjectionHandler.java | 0
 .../blueprint/plugin/handlers/blueprint/config/ConfigWriter.java  | 0
 .../plugin/handlers/blueprint/init/BlueprintInitialization.java   | 0
 .../blueprint/referencelistener/ReferenceListenerDefinition.java  | 0
 .../blueprint/referencelistener/ReferenceListenerHandler.java     | 0
 .../plugin/handlers/blueprint/service/ReferenceHandler.java       | 0
 .../blueprint/plugin/handlers/blueprint/service/ReferenceId.java  | 0
 .../plugin/handlers/blueprint/service/ReferenceListHandler.java   | 0
 .../handlers/blueprint/service/ReferenceListInvalidInterface.java | 0
 .../plugin/handlers/blueprint/service/ReferenceParameters.java    | 0
 .../plugin/handlers/blueprint/service/ServiceHandler.java         | 0
 .../plugin/handlers/blueprint/service/ServicePropertyWriter.java  | 0
 .../plugin/handlers/javax/AbstractTransactionFactory.java         | 0
 .../blueprint/plugin/handlers/javax/CdiTransactionFactory.java    | 0
 .../aries/blueprint/plugin/handlers/javax/InjectHandler.java      | 0
 .../blueprint/plugin/handlers/javax/JavaxTransactionFactory.java  | 0
 .../aries/blueprint/plugin/handlers/javax/NamedBeanFinder.java    | 0
 .../aries/blueprint/plugin/handlers/javax/NamedHandler.java       | 0
 .../apache/aries/blueprint/plugin/handlers/javax/Namespaces.java  | 0
 .../plugin/handlers/javax/PersistenceContextHandler.java          | 0
 .../blueprint/plugin/handlers/javax/PersistenceUnitHandler.java   | 0
 .../blueprint/plugin/handlers/javax/PostConstructHandler.java     | 0
 .../aries/blueprint/plugin/handlers/javax/PreDestroyHandler.java  | 0
 .../aries/blueprint/plugin/handlers/javax/ProducesHandler.java    | 0
 .../aries/blueprint/plugin/handlers/javax/QualifierHandler.java   | 0
 .../blueprint/plugin/handlers/javax/SingletonBeanFinder.java      | 0
 .../org/apache/aries/blueprint/plugin/model/AnnotationHelper.java | 0
 .../java/org/apache/aries/blueprint/plugin/model/Argument.java    | 0
 .../main/java/org/apache/aries/blueprint/plugin/model/Bean.java   | 0
 .../org/apache/aries/blueprint/plugin/model/BeanFromFactory.java  | 0
 .../java/org/apache/aries/blueprint/plugin/model/BeanRef.java     | 0
 .../org/apache/aries/blueprint/plugin/model/BeanRefStore.java     | 0
 .../org/apache/aries/blueprint/plugin/model/BeanTemplate.java     | 0
 .../java/org/apache/aries/blueprint/plugin/model/Blueprint.java   | 0
 .../apache/aries/blueprint/plugin/model/BlueprintRegistry.java    | 0
 .../org/apache/aries/blueprint/plugin/model/ConflictDetected.java | 0
 .../aries/blueprint/plugin/model/CustomTypeConverterWriter.java   | 0
 .../org/apache/aries/blueprint/plugin/model/Introspector.java     | 0
 .../org/apache/aries/blueprint/plugin/model/NamingHelper.java     | 0
 .../java/org/apache/aries/blueprint/plugin/model/Property.java    | 0
 .../org/apache/aries/blueprint/plugin/model/QualifierHelper.java  | 0
 .../org/apache/aries/blueprint/plugin/model/RefCollection.java    | 0
 .../main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml    | 0
 .../org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler   | 0
 .../services/org.apache.aries.blueprint.plugin.spi.BeanFinder     | 0
 ...ies.blueprint.plugin.spi.CollectionDependencyAnnotationHandler | 0
 ...apache.aries.blueprint.plugin.spi.ContextInitializationHandler | 0
 ...e.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler | 0
 .../org.apache.aries.blueprint.plugin.spi.FactoryMethodFinder     | 0
 .../org.apache.aries.blueprint.plugin.spi.FieldAnnotationHandler  | 0
 .../org.apache.aries.blueprint.plugin.spi.InjectLikeHandler       | 0
 .../org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler | 0
 .../org.apache.aries.blueprint.plugin.spi.NamedLikeHandler        | 0
 ...rg.apache.aries.blueprint.plugin.spi.QualifingAnnotationFinder | 0
 .../org.apache.aries.blueprint.plugin.spi.ValueInjectionHandler   | 0
 .../java/org/apache/aries/blueprint/plugin/AnnotatedService.java  | 0
 .../apache/aries/blueprint/plugin/BlueprintFileWriterTest.java    | 0
 .../org/apache/aries/blueprint/plugin/EnableAnnotationTest.java   | 0
 .../test/java/org/apache/aries/blueprint/plugin/Namespaces.java   | 0
 .../test/java/org/apache/aries/blueprint/plugin/bad/BadBean1.java | 0
 .../test/java/org/apache/aries/blueprint/plugin/bad/BadBean2.java | 0
 .../test/java/org/apache/aries/blueprint/plugin/bad/BadBean3.java | 0
 .../java/org/apache/aries/blueprint/plugin/bad/BadFieldBean1.java | 0
 .../java/org/apache/aries/blueprint/plugin/bad/BadFieldBean2.java | 0
 .../java/org/apache/aries/blueprint/plugin/bad/BadFieldBean3.java | 0
 .../java/org/apache/aries/blueprint/plugin/bad/FieldBean4.java    | 0
 .../org/apache/aries/blueprint/plugin/bad/ParentWithField.java    | 0
 .../aries/blueprint/plugin/bad/ParentWithInjectedField.java       | 0
 .../aries/blueprint/plugin/extension/InitContextExample.java      | 0
 .../java/org/apache/aries/blueprint/plugin/model/BeanTest.java    | 0
 .../org/apache/aries/blueprint/plugin/model/BlueprintTest.java    | 0
 .../org/apache/aries/blueprint/plugin/model/TestBeanForRef.java   | 0
 .../org/apache/aries/blueprint/plugin/model/TransactionalDef.java | 0
 .../org/apache/aries/blueprint/plugin/test/BeanWithSetters.java   | 0
 .../test/java/org/apache/aries/blueprint/plugin/test/MyBean1.java | 0
 .../test/java/org/apache/aries/blueprint/plugin/test/MyBean3.java | 0
 .../test/java/org/apache/aries/blueprint/plugin/test/MyBean4.java | 0
 .../test/java/org/apache/aries/blueprint/plugin/test/MyBean5.java | 0
 .../test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java | 0
 .../test/java/org/apache/aries/blueprint/plugin/test/MyBean7.java | 0
 .../org/apache/aries/blueprint/plugin/test/MyFactoryBean.java     | 0
 .../apache/aries/blueprint/plugin/test/MyFactoryNamedBean.java    | 0
 .../java/org/apache/aries/blueprint/plugin/test/MyProduced.java   | 0
 .../aries/blueprint/plugin/test/MyProducedWithConstructor.java    | 0
 .../java/org/apache/aries/blueprint/plugin/test/ParentBean.java   | 0
 .../org/apache/aries/blueprint/plugin/test/ServiceABImpl.java     | 0
 .../org/apache/aries/blueprint/plugin/test/ServiceAImpl1.java     | 0
 .../org/apache/aries/blueprint/plugin/test/ServiceAImpl2.java     | 0
 .../org/apache/aries/blueprint/plugin/test/ServiceAImpl3.java     | 0
 .../apache/aries/blueprint/plugin/test/ServiceAImplQualified.java | 0
 .../org/apache/aries/blueprint/plugin/test/ServiceReferences.java | 0
 .../aries/blueprint/plugin/test/ServiceReferencesParent.java      | 0
 .../org/apache/aries/blueprint/plugin/test/bean/BasicBean.java    | 0
 .../aries/blueprint/plugin/test/bean/BeanWithCallbackMethods.java | 0
 .../org/apache/aries/blueprint/plugin/test/bean/NamedBean.java    | 0
 .../aries/blueprint/plugin/test/bean/SimpleProducedBean.java      | 0
 .../test/cditransactional/CdiTransactionalAnnotatedBean.java      | 0
 .../blueprint/plugin/test/collection/BeanWithCollections.java     | 0
 .../org/apache/aries/blueprint/plugin/test/collection/I1.java     | 0
 .../apache/aries/blueprint/plugin/test/collection/I1Impl1.java    | 0
 .../apache/aries/blueprint/plugin/test/collection/I1Impl2.java    | 0
 .../aries/blueprint/plugin/test/collection/I1Impl3Annotated.java  | 0
 .../aries/blueprint/plugin/test/collection/I1Impl4Annotated.java  | 0
 .../org/apache/aries/blueprint/plugin/test/collection/I2.java     | 0
 .../apache/aries/blueprint/plugin/test/collection/I2Impl1.java    | 0
 .../aries/blueprint/plugin/test/collection/I2Impl2Annotated.java  | 0
 .../aries/blueprint/plugin/test/collection/I2Impl3Annotated.java  | 0
 .../org/apache/aries/blueprint/plugin/test/collection/I3.java     | 0
 .../aries/blueprint/plugin/test/configuration/BeanWithConfig.java | 0
 .../test/configuration/BeanWithConfigurationProperties.java       | 0
 .../apache/aries/blueprint/plugin/test/converters/Converter1.java | 0
 .../apache/aries/blueprint/plugin/test/converters/Converter2.java | 0
 .../apache/aries/blueprint/plugin/test/interfaces/ServiceA.java   | 0
 .../apache/aries/blueprint/plugin/test/interfaces/ServiceB.java   | 0
 .../apache/aries/blueprint/plugin/test/interfaces/ServiceC.java   | 0
 .../apache/aries/blueprint/plugin/test/interfaces/ServiceD.java   | 0
 .../plugin/test/osgiserviceprovider/MyFactoryBeanAsService.java   | 0
 .../plugin/test/osgiserviceprovider/ServiceWithRanking.java       | 0
 .../test/osgiserviceprovider/ServiceWithTypedParameters.java      | 0
 .../org/apache/aries/blueprint/plugin/test/qualifiers/A1.java     | 0
 .../org/apache/aries/blueprint/plugin/test/qualifiers/A2.java     | 0
 .../apache/aries/blueprint/plugin/test/qualifiers/MyFactory.java  | 0
 .../apache/aries/blueprint/plugin/test/qualifiers/TestBean.java   | 0
 .../aries/blueprint/plugin/test/qualifiers/TestConsumer.java      | 0
 .../blueprint/plugin/test/reference/BeanWithReferenceLists.java   | 0
 .../aries/blueprint/plugin/test/reference/BeanWithReferences.java | 0
 .../org/apache/aries/blueprint/plugin/test/reference/Ref1.java    | 0
 .../org/apache/aries/blueprint/plugin/test/reference/Ref2.java    | 0
 .../org/apache/aries/blueprint/plugin/test/reference/Ref3.java    | 0
 .../org/apache/aries/blueprint/plugin/test/reference/Ref4.java    | 0
 .../test/referencelistener/ReferenceListenerBeanWithName.java     | 0
 .../ReferenceListenerBeanWithoutMethodsAnnotation.java            | 0
 .../plugin/test/referencelistener/ReferenceListenerListBean.java  | 0
 .../plugin/test/referencelistener/ReferenceListenerProducer.java  | 0
 .../plugin/test/referencelistener/ReferenceListenerToProduce.java | 0
 .../ReferenceListenerToProduceWithoutAnnotation.java              | 0
 .../org/apache/aries/blueprint/plugin/test/service/Service1.java  | 0
 .../org/apache/aries/blueprint/plugin/test/service/Service2.java  | 0
 .../aries/blueprint/plugin/test/service/ServiceProducer.java      | 0
 .../blueprint/plugin/test/service/ServiceWithAllClasses.java      | 0
 .../blueprint/plugin/test/service/ServiceWithClassHierarchy.java  | 0
 .../blueprint/plugin/test/service/ServiceWithManyInterfaces.java  | 0
 .../blueprint/plugin/test/service/ServiceWithOneInterface.java    | 0
 .../blueprint/plugin/test/service/ServiceWithProperties.java      | 0
 .../plugin/test/service/ServiceWithRankingAndProperty.java        | 0
 .../plugin/test/service/ServiceWithRankingParameter.java          | 0
 .../aries/blueprint/plugin/test/service/SimplestService.java      | 0
 .../aries/blueprint/plugin/test/transactionenable/TxBean.java     | 0
 ...apache.aries.blueprint.plugin.spi.ContextInitializationHandler | 0
 .../blueprint-maven-plugin/src/test/resources/schema/example.xsd  | 0
 {blueprint/plugin => blueprint-maven-plugin}/pom.xml              | 2 +-
 pom.xml                                                           | 2 +-
 297 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index cf315efed..19d51297f 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -7,6 +7,9 @@ async:
 blueprint:
 - changed-files:
   - any-glob-to-any-file: 'blueprint/**/*'
+blueprint-maven-plugin:
+- changed-files:
+  - any-glob-to-any-file: 'blueprint-maven-plugin/**/*'
 eba-maven-plugin:
 - changed-files:
   - any-glob-to-any-file: 'eba-maven-plugin/**/*'
diff --git a/.github/workflows/blueprint-plugin.yml b/.github/workflows/blueprint-maven-plugin.yml
similarity index 86%
rename from .github/workflows/blueprint-plugin.yml
rename to .github/workflows/blueprint-maven-plugin.yml
index 3ac2eb6e0..c85d7fd28 100644
--- a/.github/workflows/blueprint-plugin.yml
+++ b/.github/workflows/blueprint-maven-plugin.yml
@@ -10,14 +10,14 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-name: Blueprint Plugin - CI Build
+name: Blueprint Maven Plugin - CI Build
 
 on:
   pull_request:
     paths:
       - parent/**
-      - blueprint/plugin/**
-      - .github/workflows/blueprint-plugin.yml
+      - blueprint-maven-plugin/**
+      - .github/workflows/blueprint-maven-plugin.yml
   push:
     branches:
       - 'trunk'
@@ -48,4 +48,4 @@ jobs:
       run: mvn -U -e -B -ntp clean install -f parent
     - name: Build blueprint plugin
       shell: bash
-      run: mvn -U -e -B -ntp clean install -f blueprint/plugin
+      run: mvn -U -e -B -ntp clean install -f blueprint-maven-plugin
diff --git a/.github/workflows/blueprint.yml b/.github/workflows/blueprint.yml
index 33d4e0851..109e1ef65 100644
--- a/.github/workflows/blueprint.yml
+++ b/.github/workflows/blueprint.yml
@@ -23,7 +23,6 @@ on:
       - quiesce/**
       - blueprint/**
       - .github/workflows/blueprint.yml
-      - '!blueprint/plugin/**'
   push:
     branches:
       - 'trunk'
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/LICENSE b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/LICENSE
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/LICENSE
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/LICENSE
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/NOTICE b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/NOTICE
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/NOTICE
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/NOTICE
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/pom.xml
similarity index 98%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/pom.xml
index 7b8665653..639285b3d 100644
--- a/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml
+++ b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/pom.xml
@@ -26,7 +26,7 @@
         <groupId>org.apache.aries</groupId>
         <artifactId>parent</artifactId>
         <version>2.1.2-SNAPSHOT</version>
-        <relativePath>../../../parent/pom.xml</relativePath>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Activation.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Activation.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Activation.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Activation.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Bean.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Bean.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Bean.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Bean.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Scope.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Scope.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Scope.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/Scope.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/package-info.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/package-info.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/package-info.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/bean/package-info.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/collection/CollectionInject.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/collection/CollectionInject.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/collection/CollectionInject.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/collection/CollectionInject.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/collection/package-info.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/collection/package-info.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/collection/package-info.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/collection/package-info.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/Config.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/Config.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/Config.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/Config.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperties.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperties.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperties.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperties.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperty.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperty.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperty.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/ConfigProperty.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/DefaultProperty.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/DefaultProperty.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/DefaultProperty.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/DefaultProperty.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/package-info.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/package-info.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/package-info.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/config/package-info.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Availability.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Availability.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Availability.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Availability.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Bind.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Bind.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Bind.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Bind.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Cardinality.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Cardinality.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Cardinality.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Cardinality.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/ReferenceListener.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/ReferenceListener.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/ReferenceListener.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/ReferenceListener.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Unbind.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Unbind.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Unbind.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/Unbind.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/package-info.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/package-info.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/package-info.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/referencelistener/package-info.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/AutoExport.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/AutoExport.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/AutoExport.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/AutoExport.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/Availability.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/Availability.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/Availability.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/Availability.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/MemberType.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/MemberType.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/MemberType.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/MemberType.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/Reference.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/Reference.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/Reference.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/Reference.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/ReferenceList.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/ReferenceList.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/ReferenceList.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/ReferenceList.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/Service.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/Service.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/Service.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/Service.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/ServiceProperty.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/ServiceProperty.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/ServiceProperty.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/ServiceProperty.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/package-info.java b/blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/package-info.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/package-info.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-annotation/src/main/java/org/apache/aries/blueprint/annotation/service/package-info.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/LICENSE b/blueprint-maven-plugin/blueprint-maven-plugin-itest/LICENSE
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/LICENSE
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/LICENSE
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/NOTICE b/blueprint-maven-plugin/blueprint-maven-plugin-itest/NOTICE
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/NOTICE
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/NOTICE
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-itest/pom.xml
similarity index 98%
rename from blueprint/plugin/blueprint-maven-plugin-itest/pom.xml
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/pom.xml
index bfafdcfba..e8729e260 100644
--- a/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml
+++ b/blueprint-maven-plugin/blueprint-maven-plugin-itest/pom.xml
@@ -25,7 +25,7 @@
         <groupId>org.apache.aries</groupId>
         <artifactId>parent</artifactId>
         <version>2.1.2-SNAPSHOT</version>
-        <relativePath>../../../parent/pom.xml</relativePath>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/custom-destination/pom.xml
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/pom.xml
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/custom-destination/pom.xml
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/src/main/java/p1/T1.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/custom-destination/src/main/java/p1/T1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/src/main/java/p1/T1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/custom-destination/src/main/java/p1/T1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/verify.groovy b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/custom-destination/verify.groovy
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/verify.groovy
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/custom-destination/verify.groovy
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/invoker.properties b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/invoker.properties
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/invoker.properties
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/invoker.properties
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/pom.xml
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/pom.xml
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/pom.xml
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/src/main/java/p1/T1.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/src/main/java/p1/T1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/src/main/java/p1/T1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/src/main/java/p1/T1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/src/main/java/p1/T2.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/src/main/java/p1/T2.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/src/main/java/p1/T2.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/src/main/java/p1/T2.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/src/main/java/p2/T1.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/src/main/java/p2/T1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/src/main/java/p2/T1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/src/main/java/p2/T1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/verify.groovy b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/verify.groovy
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/verify.groovy
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/fail-on-conflict/verify.groovy
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/pom.xml
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/pom.xml
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/pom.xml
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/src/main/java/p1/T1.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/src/main/java/p1/T1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/src/main/java/p1/T1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/src/main/java/p1/T1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/src/main/java/p2/T2.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/src/main/java/p2/T2.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/src/main/java/p2/T2.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/src/main/java/p2/T2.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/verify.groovy b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/verify.groovy
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/verify.groovy
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/verify.groovy
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/pom.xml
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/pom.xml
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/pom.xml
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/src/main/java/p1/I1.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/src/main/java/p1/I1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/src/main/java/p1/I1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/src/main/java/p1/I1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/src/main/java/p1/I2.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/src/main/java/p1/I2.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/src/main/java/p1/I2.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/src/main/java/p1/I2.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/src/main/java/p1/T1.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/src/main/java/p1/T1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/src/main/java/p1/T1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/src/main/java/p1/T1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/verify.groovy b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/verify.groovy
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/verify.groovy
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/verify.groovy
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/pom.xml
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/pom.xml
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/pom.xml
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/src/main/java/p1/T1.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/src/main/java/p1/T1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/src/main/java/p1/T1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/src/main/java/p1/T1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/verify.groovy b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/verify.groovy
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/verify.groovy
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/verify.groovy
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/pom.xml
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/pom.xml
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/pom.xml
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/src/main/java/p1/T1.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/src/main/java/p1/T1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/src/main/java/p1/T1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/src/main/java/p1/T1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/src/main/java/p2/T2.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/src/main/java/p2/T2.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/src/main/java/p2/T2.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/src/main/java/p2/T2.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/src/main/java/p2/inner/T3.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/src/main/java/p2/inner/T3.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/src/main/java/p2/inner/T3.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/src/main/java/p2/inner/T3.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/verify.groovy b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/verify.groovy
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/verify.groovy
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/verify.groovy
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/simple-project/pom.xml
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/pom.xml
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/simple-project/pom.xml
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/src/main/java/p1/T1.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/simple-project/src/main/java/p1/T1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/src/main/java/p1/T1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/simple-project/src/main/java/p1/T1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/src/main/java/p1/T2.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/simple-project/src/main/java/p1/T2.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/src/main/java/p1/T2.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/simple-project/src/main/java/p1/T2.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/verify.groovy b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/simple-project/verify.groovy
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/verify.groovy
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/simple-project/verify.groovy
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/spring/pom.xml
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/pom.xml
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/spring/pom.xml
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/src/main/java/p1/T1.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/spring/src/main/java/p1/T1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/src/main/java/p1/T1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/spring/src/main/java/p1/T1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/src/main/java/p1/T2.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/spring/src/main/java/p1/T2.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/src/main/java/p1/T2.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/spring/src/main/java/p1/T2.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/verify.groovy b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/spring/verify.groovy
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/verify.groovy
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/spring/verify.groovy
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/pom.xml
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/pom.xml
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/pom.xml
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/src/main/java/p1/T1.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/src/main/java/p1/T1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/src/main/java/p1/T1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/src/main/java/p1/T1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/src/main/java/p2/T1.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/src/main/java/p2/T1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/src/main/java/p2/T1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/src/main/java/p2/T1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/src/main/java/p3/T1.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/src/main/java/p3/T1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/src/main/java/p3/T1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/src/main/java/p3/T1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/verify.groovy b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/verify.groovy
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/verify.groovy
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/verify.groovy
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/a/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/with-provide/a/pom.xml
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/a/pom.xml
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/with-provide/a/pom.xml
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/a/src/main/java/a/A.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/with-provide/a/src/main/java/a/A.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/a/src/main/java/a/A.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/with-provide/a/src/main/java/a/A.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/b/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/with-provide/b/pom.xml
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/b/pom.xml
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/with-provide/b/pom.xml
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/b/src/main/java/b/B.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/with-provide/b/src/main/java/b/B.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/b/src/main/java/b/B.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/with-provide/b/src/main/java/b/B.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/c/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/with-provide/c/pom.xml
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/c/pom.xml
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/with-provide/c/pom.xml
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/c/src/main/java/c/Api.java b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/with-provide/c/src/main/java/c/Api.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/c/src/main/java/c/Api.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/with-provide/c/src/main/java/c/Api.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/with-provide/pom.xml
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/pom.xml
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/with-provide/pom.xml
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/verify.groovy b/blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/with-provide/verify.groovy
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/verify.groovy
rename to blueprint-maven-plugin/blueprint-maven-plugin-itest/src/it/with-provide/verify.groovy
diff --git a/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/LICENSE b/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/LICENSE
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/LICENSE
rename to blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/LICENSE
diff --git a/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/NOTICE b/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/NOTICE
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/NOTICE
rename to blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/NOTICE
diff --git a/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml
similarity index 97%
rename from blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml
rename to blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml
index 4d2c462f8..5eafcc619 100644
--- a/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml
+++ b/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml
@@ -25,7 +25,7 @@
         <groupId>org.apache.aries</groupId>
         <artifactId>parent</artifactId>
         <version>2.1.2-SNAPSHOT</version>
-        <relativePath>../../../parent/pom.xml</relativePath>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
diff --git a/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/OsgiServiceHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/OsgiServiceHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/OsgiServiceHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/OsgiServiceHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/OsgiServiceProviderHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/OsgiServiceProviderHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/OsgiServiceProviderHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/OsgiServiceProviderHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/ServiceProperty.java b/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/ServiceProperty.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/ServiceProperty.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/paxcdi/ServiceProperty.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler b/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler
rename to blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler
diff --git a/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler b/blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler
rename to blueprint-maven-plugin/blueprint-maven-plugin-pax-cdi-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/LICENSE b/blueprint-maven-plugin/blueprint-maven-plugin-spi/LICENSE
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spi/LICENSE
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/LICENSE
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/NOTICE b/blueprint-maven-plugin/blueprint-maven-plugin-spi/NOTICE
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spi/NOTICE
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/NOTICE
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-spi/pom.xml
similarity index 96%
rename from blueprint/plugin/blueprint-maven-plugin-spi/pom.xml
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/pom.xml
index 8af7180a7..719aa2696 100644
--- a/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml
+++ b/blueprint-maven-plugin/blueprint-maven-plugin-spi/pom.xml
@@ -25,7 +25,7 @@
         <groupId>org.apache.aries</groupId>
         <artifactId>parent</artifactId>
         <version>2.1.2-SNAPSHOT</version>
-        <relativePath>../../../parent/pom.xml</relativePath>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/Activation.java b/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/Activation.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/Activation.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/Activation.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/AnnotationHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/AnnotationHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/AnnotationHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/AnnotationHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/Availability.java b/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/Availability.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/Availability.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/Availability.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanAnnotationHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanAnnotationHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanAnnotationHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanAnnotationHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanEnricher.java b/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanEnricher.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanEnricher.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanEnricher.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanFinder.java b/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanFinder.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanFinder.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BeanFinder.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BlueprintConfiguration.java b/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BlueprintConfiguration.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BlueprintConfiguration.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/BlueprintConfiguration.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/CollectionDependencyAnnotationHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/CollectionDependencyAnnotationHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/CollectionDependencyAnnotationHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/CollectionDependencyAnnotationHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/ContextEnricher.java b/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/ContextEnricher.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/ContextEnricher.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/ContextEnricher.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/ContextInitializationHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/ContextInitializationHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/ContextInitializationHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/ContextInitializationHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/CustomDependencyAnnotationHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/CustomDependencyAnnotationHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/CustomDependencyAnnotationHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/CustomDependencyAnnotationHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/FactoryMethodFinder.java b/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/FactoryMethodFinder.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/FactoryMethodFinder.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/FactoryMethodFinder.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/FieldAnnotationHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/FieldAnnotationHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/FieldAnnotationHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/FieldAnnotationHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/InjectLikeHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/InjectLikeHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/InjectLikeHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/InjectLikeHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/MethodAnnotationHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/MethodAnnotationHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/MethodAnnotationHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/MethodAnnotationHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/NamedLikeHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/NamedLikeHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/NamedLikeHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/NamedLikeHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/QualifingAnnotationFinder.java b/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/QualifingAnnotationFinder.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/QualifingAnnotationFinder.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/QualifingAnnotationFinder.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/ValueInjectionHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/ValueInjectionHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/ValueInjectionHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/ValueInjectionHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/XmlWriter.java b/blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/XmlWriter.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/XmlWriter.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spi/src/main/java/org/apache/aries/blueprint/plugin/spi/XmlWriter.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/LICENSE b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/LICENSE
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spring-handlers/LICENSE
rename to blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/LICENSE
diff --git a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/NOTICE b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/NOTICE
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spring-handlers/NOTICE
rename to blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/NOTICE
diff --git a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/pom.xml
similarity index 98%
rename from blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml
rename to blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/pom.xml
index 53800108b..0eb95d894 100644
--- a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml
+++ b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.apache.aries</groupId>
         <artifactId>parent</artifactId>
         <version>2.1.2-SNAPSHOT</version>
-        <relativePath>../../../parent/pom.xml</relativePath>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
diff --git a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/AutowiredAsInject.java b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/AutowiredAsInject.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/AutowiredAsInject.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/AutowiredAsInject.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ComponentAsNamed.java b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ComponentAsNamed.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ComponentAsNamed.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ComponentAsNamed.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ComponentBeanFinder.java b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ComponentBeanFinder.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ComponentBeanFinder.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ComponentBeanFinder.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/DependsOnAttributeResolver.java b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/DependsOnAttributeResolver.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/DependsOnAttributeResolver.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/DependsOnAttributeResolver.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/LazyAttributeResolver.java b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/LazyAttributeResolver.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/LazyAttributeResolver.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/LazyAttributeResolver.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/QualifierAsNamed.java b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/QualifierAsNamed.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/QualifierAsNamed.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/QualifierAsNamed.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/SpringTransactionalFactory.java b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/SpringTransactionalFactory.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/SpringTransactionalFactory.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/SpringTransactionalFactory.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ValueInjectionHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ValueInjectionHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ValueInjectionHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/java/org/apache/aries/blueprint/plugin/handlers/spring/ValueInjectionHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler
rename to blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler
diff --git a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder
rename to blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder
diff --git a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.InjectLikeHandler b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.InjectLikeHandler
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.InjectLikeHandler
rename to blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.InjectLikeHandler
diff --git a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler
rename to blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler
diff --git a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.NamedLikeHandler b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.NamedLikeHandler
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.NamedLikeHandler
rename to blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.NamedLikeHandler
diff --git a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ValueInjectionHandler b/blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ValueInjectionHandler
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ValueInjectionHandler
rename to blueprint-maven-plugin/blueprint-maven-plugin-spring-handlers/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ValueInjectionHandler
diff --git a/blueprint/plugin/blueprint-maven-plugin/LICENSE b/blueprint-maven-plugin/blueprint-maven-plugin/LICENSE
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/LICENSE
rename to blueprint-maven-plugin/blueprint-maven-plugin/LICENSE
diff --git a/blueprint/plugin/blueprint-maven-plugin/NOTICE b/blueprint-maven-plugin/blueprint-maven-plugin/NOTICE
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/NOTICE
rename to blueprint-maven-plugin/blueprint-maven-plugin/NOTICE
diff --git a/blueprint/plugin/blueprint-maven-plugin/pom.xml b/blueprint-maven-plugin/blueprint-maven-plugin/pom.xml
similarity index 99%
rename from blueprint/plugin/blueprint-maven-plugin/pom.xml
rename to blueprint-maven-plugin/blueprint-maven-plugin/pom.xml
index 0195e7572..ad0350219 100644
--- a/blueprint/plugin/blueprint-maven-plugin/pom.xml
+++ b/blueprint-maven-plugin/blueprint-maven-plugin/pom.xml
@@ -25,7 +25,7 @@
         <groupId>org.apache.aries</groupId>
         <artifactId>parent</artifactId>
         <version>2.1.2-SNAPSHOT</version>
-        <relativePath>../../../parent/pom.xml</relativePath>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/AddResourceDirMojo.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/AddResourceDirMojo.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/AddResourceDirMojo.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/AddResourceDirMojo.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/ArtifactFilter.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/ArtifactFilter.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/ArtifactFilter.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/ArtifactFilter.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintConfigurationImpl.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintFileWriter.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintFileWriter.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintFileWriter.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/BlueprintFileWriter.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/FilteredClassFinder.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/FilteredClassFinder.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/FilteredClassFinder.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/FilteredClassFinder.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/GenerateMojo.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/NegativeTimeout.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/NegativeTimeout.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/NegativeTimeout.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/NegativeTimeout.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/PackageFinder.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/PackageFinder.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/PackageFinder.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/PackageFinder.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/ResourceInitializer.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/ResourceInitializer.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/ResourceInitializer.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/ResourceInitializer.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/Handlers.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/Handlers.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/Handlers.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/Handlers.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/bean/BeanHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/bean/BeanHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/bean/BeanHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/bean/BeanHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/collection/CollectionInjectHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/collection/CollectionInjectHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/collection/CollectionInjectHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/collection/CollectionInjectHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigAnnotationHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigAnnotationHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigAnnotationHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigAnnotationHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigPropertiesHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigPropertiesHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigPropertiesHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigPropertiesHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigPropertyInjectionHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigPropertyInjectionHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigPropertyInjectionHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigPropertyInjectionHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigWriter.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigWriter.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigWriter.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/config/ConfigWriter.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/init/BlueprintInitialization.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/init/BlueprintInitialization.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/init/BlueprintInitialization.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/init/BlueprintInitialization.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/referencelistener/ReferenceListenerDefinition.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/referencelistener/ReferenceListenerDefinition.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/referencelistener/ReferenceListenerDefinition.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/referencelistener/ReferenceListenerDefinition.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/referencelistener/ReferenceListenerHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/referencelistener/ReferenceListenerHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/referencelistener/ReferenceListenerHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/referencelistener/ReferenceListenerHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceId.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceId.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceId.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceId.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceListHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceListHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceListHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceListHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceListInvalidInterface.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceListInvalidInterface.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceListInvalidInterface.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceListInvalidInterface.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceParameters.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceParameters.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceParameters.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ReferenceParameters.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ServiceHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ServiceHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ServiceHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ServiceHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ServicePropertyWriter.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ServicePropertyWriter.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ServicePropertyWriter.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/blueprint/service/ServicePropertyWriter.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/AbstractTransactionFactory.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/AbstractTransactionFactory.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/AbstractTransactionFactory.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/AbstractTransactionFactory.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/CdiTransactionFactory.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/CdiTransactionFactory.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/CdiTransactionFactory.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/CdiTransactionFactory.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/InjectHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/InjectHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/InjectHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/InjectHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/JavaxTransactionFactory.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/JavaxTransactionFactory.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/JavaxTransactionFactory.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/JavaxTransactionFactory.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/NamedBeanFinder.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/NamedBeanFinder.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/NamedBeanFinder.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/NamedBeanFinder.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/NamedHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/NamedHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/NamedHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/NamedHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/Namespaces.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/Namespaces.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/Namespaces.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/Namespaces.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PersistenceContextHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PersistenceContextHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PersistenceContextHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PersistenceContextHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PersistenceUnitHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PersistenceUnitHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PersistenceUnitHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PersistenceUnitHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PostConstructHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PostConstructHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PostConstructHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PostConstructHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PreDestroyHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PreDestroyHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PreDestroyHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/PreDestroyHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/ProducesHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/ProducesHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/ProducesHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/ProducesHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/QualifierHandler.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/QualifierHandler.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/QualifierHandler.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/QualifierHandler.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/SingletonBeanFinder.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/SingletonBeanFinder.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/SingletonBeanFinder.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/handlers/javax/SingletonBeanFinder.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/AnnotationHelper.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/AnnotationHelper.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/AnnotationHelper.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/AnnotationHelper.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Argument.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Argument.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Argument.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Argument.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanFromFactory.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanFromFactory.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanFromFactory.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanFromFactory.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRef.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRef.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRef.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRef.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRefStore.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRefStore.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRefStore.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanRefStore.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanTemplate.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanTemplate.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanTemplate.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BeanTemplate.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Blueprint.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprintRegistry.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprintRegistry.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprintRegistry.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/BlueprintRegistry.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/ConflictDetected.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/ConflictDetected.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/ConflictDetected.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/ConflictDetected.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/CustomTypeConverterWriter.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/CustomTypeConverterWriter.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/CustomTypeConverterWriter.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/CustomTypeConverterWriter.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Introspector.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Introspector.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Introspector.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Introspector.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/NamingHelper.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/NamingHelper.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/NamingHelper.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/NamingHelper.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Property.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/QualifierHelper.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/QualifierHelper.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/QualifierHelper.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/QualifierHelper.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/RefCollection.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/RefCollection.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/RefCollection.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/RefCollection.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanAnnotationHandler
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.BeanFinder
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CollectionDependencyAnnotationHandler b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CollectionDependencyAnnotationHandler
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CollectionDependencyAnnotationHandler
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CollectionDependencyAnnotationHandler
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ContextInitializationHandler b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ContextInitializationHandler
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ContextInitializationHandler
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ContextInitializationHandler
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.CustomDependencyAnnotationHandler
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.FactoryMethodFinder b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.FactoryMethodFinder
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.FactoryMethodFinder
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.FactoryMethodFinder
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.FieldAnnotationHandler b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.FieldAnnotationHandler
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.FieldAnnotationHandler
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.FieldAnnotationHandler
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.InjectLikeHandler b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.InjectLikeHandler
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.InjectLikeHandler
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.InjectLikeHandler
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.MethodAnnotationHandler
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.NamedLikeHandler b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.NamedLikeHandler
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.NamedLikeHandler
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.NamedLikeHandler
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.QualifingAnnotationFinder b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.QualifingAnnotationFinder
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.QualifingAnnotationFinder
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.QualifingAnnotationFinder
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ValueInjectionHandler b/blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ValueInjectionHandler
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ValueInjectionHandler
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/main/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ValueInjectionHandler
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/AnnotatedService.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/AnnotatedService.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/AnnotatedService.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/AnnotatedService.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/BlueprintFileWriterTest.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/EnableAnnotationTest.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/EnableAnnotationTest.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/EnableAnnotationTest.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/EnableAnnotationTest.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/Namespaces.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/Namespaces.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/Namespaces.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/Namespaces.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadBean1.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadBean1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadBean1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadBean1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadBean2.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadBean2.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadBean2.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadBean2.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadBean3.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadBean3.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadBean3.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadBean3.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean1.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean2.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean2.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean2.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean2.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean3.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean3.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean3.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/BadFieldBean3.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/FieldBean4.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/FieldBean4.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/FieldBean4.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/FieldBean4.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/ParentWithField.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/ParentWithField.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/ParentWithField.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/ParentWithField.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/ParentWithInjectedField.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/ParentWithInjectedField.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/ParentWithInjectedField.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/bad/ParentWithInjectedField.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/extension/InitContextExample.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/extension/InitContextExample.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/extension/InitContextExample.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/extension/InitContextExample.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BeanTest.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BlueprintTest.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BlueprintTest.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BlueprintTest.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/BlueprintTest.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/TestBeanForRef.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/TestBeanForRef.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/TestBeanForRef.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/TestBeanForRef.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/TransactionalDef.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/TransactionalDef.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/TransactionalDef.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/model/TransactionalDef.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithSetters.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithSetters.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithSetters.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/BeanWithSetters.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean1.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean3.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean3.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean3.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean3.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean4.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean4.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean4.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean4.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean5.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean5.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean5.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean5.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean6.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean7.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean7.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean7.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyBean7.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBean.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBean.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBean.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryBean.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryNamedBean.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryNamedBean.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryNamedBean.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyFactoryNamedBean.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProduced.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProducedWithConstructor.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProducedWithConstructor.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProducedWithConstructor.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/MyProducedWithConstructor.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ParentBean.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ParentBean.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ParentBean.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ParentBean.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceABImpl.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceABImpl.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceABImpl.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceABImpl.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl1.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl2.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl2.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl2.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl2.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl3.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl3.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl3.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImpl3.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImplQualified.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImplQualified.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImplQualified.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceAImplQualified.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceReferences.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceReferences.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceReferences.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceReferences.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceReferencesParent.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceReferencesParent.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceReferencesParent.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/ServiceReferencesParent.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/bean/BasicBean.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/bean/BasicBean.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/bean/BasicBean.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/bean/BasicBean.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/bean/BeanWithCallbackMethods.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/bean/BeanWithCallbackMethods.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/bean/BeanWithCallbackMethods.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/bean/BeanWithCallbackMethods.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/bean/NamedBean.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/bean/NamedBean.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/bean/NamedBean.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/bean/NamedBean.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/bean/SimpleProducedBean.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/bean/SimpleProducedBean.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/bean/SimpleProducedBean.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/bean/SimpleProducedBean.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/cditransactional/CdiTransactionalAnnotatedBean.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/cditransactional/CdiTransactionalAnnotatedBean.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/cditransactional/CdiTransactionalAnnotatedBean.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/cditransactional/CdiTransactionalAnnotatedBean.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/BeanWithCollections.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/BeanWithCollections.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/BeanWithCollections.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/BeanWithCollections.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl1.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl2.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl2.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl2.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl2.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl3Annotated.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl3Annotated.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl3Annotated.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl3Annotated.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl4Annotated.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl4Annotated.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl4Annotated.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I1Impl4Annotated.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2Impl1.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2Impl1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2Impl1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2Impl1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2Impl2Annotated.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2Impl2Annotated.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2Impl2Annotated.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2Impl2Annotated.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2Impl3Annotated.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2Impl3Annotated.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2Impl3Annotated.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I2Impl3Annotated.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I3.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I3.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I3.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/collection/I3.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfig.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfig.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfig.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfig.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfigurationProperties.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfigurationProperties.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfigurationProperties.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/configuration/BeanWithConfigurationProperties.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/converters/Converter1.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/converters/Converter1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/converters/Converter1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/converters/Converter1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/converters/Converter2.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/converters/Converter2.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/converters/Converter2.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/converters/Converter2.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceA.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceA.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceA.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceA.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceB.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceB.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceB.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceB.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceC.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceC.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceC.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceC.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceD.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceD.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceD.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/interfaces/ServiceD.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/MyFactoryBeanAsService.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/MyFactoryBeanAsService.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/MyFactoryBeanAsService.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/MyFactoryBeanAsService.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithRanking.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithRanking.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithRanking.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithRanking.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithTypedParameters.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithTypedParameters.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithTypedParameters.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/osgiserviceprovider/ServiceWithTypedParameters.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/A1.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/A1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/A1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/A1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/A2.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/A2.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/A2.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/A2.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/MyFactory.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/MyFactory.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/MyFactory.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/MyFactory.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/TestBean.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/TestBean.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/TestBean.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/TestBean.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/TestConsumer.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/TestConsumer.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/TestConsumer.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/qualifiers/TestConsumer.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/BeanWithReferenceLists.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/BeanWithReferenceLists.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/BeanWithReferenceLists.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/BeanWithReferenceLists.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/BeanWithReferences.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/BeanWithReferences.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/BeanWithReferences.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/BeanWithReferences.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/Ref1.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/Ref1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/Ref1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/Ref1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/Ref2.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/Ref2.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/Ref2.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/Ref2.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/Ref3.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/Ref3.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/Ref3.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/Ref3.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/Ref4.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/Ref4.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/Ref4.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/reference/Ref4.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithName.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithName.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithName.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithName.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithoutMethodsAnnotation.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithoutMethodsAnnotation.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithoutMethodsAnnotation.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerBeanWithoutMethodsAnnotation.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerListBean.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerListBean.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerListBean.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerListBean.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerProducer.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerProducer.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerProducer.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerProducer.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduce.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduce.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduce.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduce.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduceWithoutAnnotation.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduceWithoutAnnotation.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduceWithoutAnnotation.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/referencelistener/ReferenceListenerToProduceWithoutAnnotation.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/Service1.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/Service1.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/Service1.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/Service1.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/Service2.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/Service2.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/Service2.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/Service2.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceProducer.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceProducer.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceProducer.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceProducer.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithAllClasses.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithAllClasses.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithAllClasses.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithAllClasses.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithClassHierarchy.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithClassHierarchy.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithClassHierarchy.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithClassHierarchy.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithManyInterfaces.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithManyInterfaces.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithManyInterfaces.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithManyInterfaces.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithOneInterface.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithOneInterface.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithOneInterface.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithOneInterface.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithProperties.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithProperties.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithProperties.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithProperties.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithRankingAndProperty.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithRankingAndProperty.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithRankingAndProperty.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithRankingAndProperty.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithRankingParameter.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithRankingParameter.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithRankingParameter.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/ServiceWithRankingParameter.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/SimplestService.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/SimplestService.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/SimplestService.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/service/SimplestService.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/transactionenable/TxBean.java b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/transactionenable/TxBean.java
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/transactionenable/TxBean.java
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/java/org/apache/aries/blueprint/plugin/test/transactionenable/TxBean.java
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ContextInitializationHandler b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ContextInitializationHandler
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ContextInitializationHandler
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/resources/META-INF/services/org.apache.aries.blueprint.plugin.spi.ContextInitializationHandler
diff --git a/blueprint/plugin/blueprint-maven-plugin/src/test/resources/schema/example.xsd b/blueprint-maven-plugin/blueprint-maven-plugin/src/test/resources/schema/example.xsd
similarity index 100%
rename from blueprint/plugin/blueprint-maven-plugin/src/test/resources/schema/example.xsd
rename to blueprint-maven-plugin/blueprint-maven-plugin/src/test/resources/schema/example.xsd
diff --git a/blueprint/plugin/pom.xml b/blueprint-maven-plugin/pom.xml
similarity index 96%
rename from blueprint/plugin/pom.xml
rename to blueprint-maven-plugin/pom.xml
index a51845ed6..3c5ebd8d7 100644
--- a/blueprint/plugin/pom.xml
+++ b/blueprint-maven-plugin/pom.xml
@@ -25,7 +25,7 @@
         <groupId>org.apache.aries</groupId>
         <artifactId>parent</artifactId>
         <version>2.1.2-SNAPSHOT</version>
-        <relativePath>../../parent/pom.xml</relativePath>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.blueprint</groupId>
diff --git a/pom.xml b/pom.xml
index be3476816..0c6247436 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
         <module>application</module>
         <module>async</module>
         <module>blueprint</module>
-        <module>blueprint/plugin</module>
+        <module>blueprint-maven-plugin</module>
         <module>eba-maven-plugin</module>
         <module>esa-ant-task</module>
         <module>esa-maven-plugin</module>