From 38d0262cdafc9330352fcea59750f2034eeb80c3 Mon Sep 17 00:00:00 2001
From: Piotr Orleanski <porleanski@outlook.com>
Date: Wed, 8 Aug 2018 12:25:07 +0200
Subject: [PATCH] new OSGi annotations - validation

---
 core/validation/pom.xml                       | 25 +++++++++++++++++--
 .../ValidationResultBuilderFactoryImpl.java   | 11 +++-----
 pom.xml                                       | 15 +++++++++++
 3 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/core/validation/pom.xml b/core/validation/pom.xml
index 3a39b813d..c939d5c39 100644
--- a/core/validation/pom.xml
+++ b/core/validation/pom.xml
@@ -41,9 +41,18 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.scr.annotations</artifactId>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.component.annotations</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.annotation</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.metatype.annotations</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
@@ -81,6 +90,18 @@
           </execution>
         </executions>
       </plugin>
+      <!-- overwrites configuration from parent pom to disable SCR plugin -->
+      <!-- ToDo: remove me when all felix dependencies are removed -->
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-scr-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate-scr-descriptor</id>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/core/validation/src/main/java/com/cognifide/aet/validation/impl/ValidationResultBuilderFactoryImpl.java b/core/validation/src/main/java/com/cognifide/aet/validation/impl/ValidationResultBuilderFactoryImpl.java
index e7bb2585a..645cd35ab 100644
--- a/core/validation/src/main/java/com/cognifide/aet/validation/impl/ValidationResultBuilderFactoryImpl.java
+++ b/core/validation/src/main/java/com/cognifide/aet/validation/impl/ValidationResultBuilderFactoryImpl.java
@@ -17,16 +17,11 @@
 
 import com.cognifide.aet.validation.ValidationResultBuilder;
 import com.cognifide.aet.validation.ValidationResultBuilderFactory;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Service;
+import org.osgi.service.component.annotations.Component;
 
-@Service
-@Component(
-    label = "AET Validation Result Builder Factory",
-    description = "AET Validation Result Builder Factory")
+@Component
 public class ValidationResultBuilderFactoryImpl implements ValidationResultBuilderFactory {
-
-  @Override
+  
   public ValidationResultBuilder createInstance() {
     return new ValidationResultBuilderImpl();
   }
diff --git a/pom.xml b/pom.xml
index 0d78e339e..210b691e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,6 +198,21 @@
         <version>1.8.16</version>
         <scope>provided</scope>
       </dependency>
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.service.component.annotations</artifactId>
+        <version>1.3.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.annotation</artifactId>
+        <version>6.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.service.metatype.annotations</artifactId>
+        <version>1.3.0</version>
+      </dependency>
 
       <!-- provided by Karaf: org.osgi.service.http -->
       <dependency>