Add CDI annotations to blueprint-starter
authorChristian Schneider <chris@die-schneider.net>
Tue, 26 Apr 2016 12:46:36 +0000 (14:46 +0200)
committerChristian Schneider <chris@die-schneider.net>
Tue, 26 Apr 2016 12:46:36 +0000 (14:46 +0200)
samples/blueprint/service-consumer/pom.xml
samples/blueprint/service-provider/pom.xml
starters/karaf-boot-starter-blueprint/pom.xml
starters/karaf-boot-starter-blueprint/src/main/java/org/apache/karaf/boot/blueprint/impl/BlueprintProcessor.java

index d482686..cffe223 100644 (file)
     <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>
index de9ab62..08b0912 100644 (file)
     <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>
index 9f48c60..14db02e 100644 (file)
             <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>
index 896a161..aebcfca 100644 (file)
@@ -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;