Add CDI annotations to blueprint-starter
Project: http://git-wip-us.apache.org/repos/asf/karaf-boot/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-boot/commit/af038891 Tree: http://git-wip-us.apache.org/repos/asf/karaf-boot/tree/af038891 Diff: http://git-wip-us.apache.org/repos/asf/karaf-boot/diff/af038891 Branch: refs/heads/master Commit: af03889117a6f4faafb81402bb2bb944471bf637 Parents: 4860b60 Author: Christian Schneider <[email protected]> Authored: Tue Apr 26 14:46:36 2016 +0200 Committer: Christian Schneider <[email protected]> Committed: Tue Apr 26 14:46:36 2016 +0200 ---------------------------------------------------------------------- samples/blueprint/service-consumer/pom.xml | 14 +------------- samples/blueprint/service-provider/pom.xml | 14 +------------- starters/karaf-boot-starter-blueprint/pom.xml | 10 ++++++++++ .../karaf/boot/blueprint/impl/BlueprintProcessor.java | 5 +++-- 4 files changed, 15 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-boot/blob/af038891/samples/blueprint/service-consumer/pom.xml ---------------------------------------------------------------------- diff --git a/samples/blueprint/service-consumer/pom.xml b/samples/blueprint/service-consumer/pom.xml index d482686..cffe223 100644 --- a/samples/blueprint/service-consumer/pom.xml +++ b/samples/blueprint/service-consumer/pom.xml @@ -27,22 +27,10 @@ <dependencies> <dependency> <groupId>org.apache.karaf.boot</groupId> - <artifactId>karaf-boot-starter</artifactId> + <artifactId>karaf-boot-starter-blueprint</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.ops4j.pax.cdi</groupId> - <artifactId>pax-cdi-api</artifactId> - <version>0.5.0</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> - <optional>true</optional> - </dependency> - <dependency> <groupId>org.apache.karaf.boot</groupId> <artifactId>karaf-boot-sample-service-provider-blueprint</artifactId> <version>${project.version}</version> http://git-wip-us.apache.org/repos/asf/karaf-boot/blob/af038891/samples/blueprint/service-provider/pom.xml ---------------------------------------------------------------------- diff --git a/samples/blueprint/service-provider/pom.xml b/samples/blueprint/service-provider/pom.xml index de9ab62..08b0912 100644 --- a/samples/blueprint/service-provider/pom.xml +++ b/samples/blueprint/service-provider/pom.xml @@ -22,21 +22,9 @@ <dependencies> <dependency> <groupId>org.apache.karaf.boot</groupId> - <artifactId>karaf-boot-starter</artifactId> + <artifactId>karaf-boot-starter-blueprint</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.ops4j.pax.cdi</groupId> - <artifactId>pax-cdi-api</artifactId> - <version>0.5.0</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - <version>1</version> - <optional>true</optional> - </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/karaf-boot/blob/af038891/starters/karaf-boot-starter-blueprint/pom.xml ---------------------------------------------------------------------- diff --git a/starters/karaf-boot-starter-blueprint/pom.xml b/starters/karaf-boot-starter-blueprint/pom.xml index 9f48c60..14db02e 100644 --- a/starters/karaf-boot-starter-blueprint/pom.xml +++ b/starters/karaf-boot-starter-blueprint/pom.xml @@ -41,6 +41,16 @@ <artifactId>org.apache.aries.blueprint.annotation.api</artifactId> <version>1.0.0</version> </dependency> + <dependency> + <groupId>org.ops4j.pax.cdi</groupId> + <artifactId>pax-cdi-api</artifactId> + <version>0.5.0</version> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>1</version> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/karaf-boot/blob/af038891/starters/karaf-boot-starter-blueprint/src/main/java/org/apache/karaf/boot/blueprint/impl/BlueprintProcessor.java ---------------------------------------------------------------------- diff --git a/starters/karaf-boot-starter-blueprint/src/main/java/org/apache/karaf/boot/blueprint/impl/BlueprintProcessor.java b/starters/karaf-boot-starter-blueprint/src/main/java/org/apache/karaf/boot/blueprint/impl/BlueprintProcessor.java index 896a161..aebcfca 100644 --- a/starters/karaf-boot-starter-blueprint/src/main/java/org/apache/karaf/boot/blueprint/impl/BlueprintProcessor.java +++ b/starters/karaf-boot-starter-blueprint/src/main/java/org/apache/karaf/boot/blueprint/impl/BlueprintProcessor.java @@ -6,6 +6,9 @@ import javax.lang.model.element.TypeElement; import javax.tools.Diagnostic.Kind; import javax.tools.FileObject; import javax.tools.StandardLocation; + +import org.apache.aries.blueprint.annotation.Bean; + import java.io.ByteArrayOutputStream; import java.io.CharArrayWriter; import java.io.IOException; @@ -16,8 +19,6 @@ import java.io.Writer; import java.util.HashSet; import java.util.Set; -import org.apache.aries.blueprint.annotation.Bean; - public class BlueprintProcessor extends AbstractProcessor { boolean hasRun;
