From d9fe30081d7f3c0c4c1f0e6ed20e5dce7f03d74c Mon Sep 17 00:00:00 2001
From: Stefan Triller <stefan.triller@telekom.de>
Date: Tue, 15 Aug 2017 16:13:06 +0200
Subject: [PATCH] Generate DS annotations in maven (#193)

Signed-off-by: Stefan Triller <stefan.triller@telekom.de>
---
 poms/pom.xml       | 11 +++++++++++
 poms/tycho/pom.xml | 23 +++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/poms/pom.xml b/poms/pom.xml
index c72fdd057..dc6b6a92e 100644
--- a/poms/pom.xml
+++ b/poms/pom.xml
@@ -69,6 +69,7 @@
         <tycho-version>1.0.0</tycho-version>
         <tycho-groupid>org.eclipse.tycho</tycho-groupid>
         <jdt-annotations.version>2.1.0</jdt-annotations.version>
+        <ds-annotations.version>1.2.8</ds-annotations.version>
     </properties>
 
     <description>This is the open Home Automation Bus (openHAB)</description>
@@ -143,6 +144,16 @@
                         </supportedProjectTypes>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-scr-plugin</artifactId>
+                    <version>1.24.0</version>
+                    <configuration>
+                        <supportedProjectTypes>
+                            <supportedProjectType>eclipse-plugin</supportedProjectType>
+                        </supportedProjectTypes>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
diff --git a/poms/tycho/pom.xml b/poms/tycho/pom.xml
index 62c926175..3e48bdb77 100644
--- a/poms/tycho/pom.xml
+++ b/poms/tycho/pom.xml
@@ -23,6 +23,12 @@
             <version>3.4.0</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.ds-annotations</artifactId>
+            <version>${ds-annotations.version}</version>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -82,6 +88,18 @@
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-scr-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-scr-scrdescriptor</id>
+						<goals>
+							<goal>scr</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
         </plugins>
 
         <pluginManagement>
@@ -101,6 +119,11 @@
                             <artifactId>org.eclipse.jdt.annotation</artifactId>
                             <version>${jdt-annotations.version}</version>
                           </extraClasspathElement>
+                          <extraClasspathElement>
+                            <groupId>org.apache.felix</groupId>
+                            <artifactId>org.apache.felix.scr.ds-annotations</artifactId>
+                          <version>${ds-annotations.version}</version>
+                        </extraClasspathElement>
                         </extraClasspathElements>
                         <compilerArgs>
                             <arg>-err:+nullAnnot(org.eclipse.jdt.annotation.Nullable|org.eclipse.jdt.annotation.NonNull|org.eclipse.jdt.annotation.NonNullByDefault),+inheritNullAnnot</arg>