svn commit: r1742680 - in /felix/site/trunk/content/documentation: faqs/apache-felix-scr-plugin-faq.mdtext subprojects/apache-felix-maven-scr-plugin.mdtext subprojects/apache-felix-maven-scr-plugin/apache-felix-maven-scr-plugin-use.mdtext

[cz...@apache.org]

Author: cziegeler
Date: Sat May  7 00:34:10 2016
New Revision: 1742680

URL: http://svn.apache.org/viewvc?rev=1742680&view=rev
Log:
Update SCR plugin docs

Modified:
    felix/site/trunk/content/documentation/faqs/apache-felix-scr-plugin-faq.mdtext
    felix/site/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin.mdtext
    felix/site/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-maven-scr-plugin-use.mdtext

Modified: felix/site/trunk/content/documentation/faqs/apache-felix-scr-plugin-faq.mdtext
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/documentation/faqs/apache-felix-scr-plugin-faq.mdtext?rev=1742680&r1=1742679&r2=1742680&view=diff
==============================================================================
--- felix/site/trunk/content/documentation/faqs/apache-felix-scr-plugin-faq.mdtext (original)
+++ felix/site/trunk/content/documentation/faqs/apache-felix-scr-plugin-faq.mdtext Sat May  7 00:34:10 2016
@@ -6,6 +6,10 @@ This page provides answers to frequently
 SCR Plugin. See [{{ refs.apache-felix-maven-scr-plugin.headers.title }}]({{ refs.apache-felix-maven-scr-plugin.path }})
 for documentation on that plugin.
 
+## Should I still use the Apache Felix SCR annotations over the official OSGi annotations?
+
+Starting with the R6 release of the OSGi Declarative Services and Metatype specification, the official annotations support the same features as the Apache Felix SCR annotations in a more elegant manner and even provide additional functionality. Therefore the Apache Felix SCR annotations are now in maintenance mode and therefore you should rather use the official annotations. The Apache Felix maven-bundle-plugin, version 3.0.1 or higher supports those directly and there is no need for an additional plugin anymore.
+
 ## Why are the (standard) annotations not processed?
 
 In order to process any annotations, a processor for them needs to be added as a dependency to your project. There are currently two different processors, one for the annotations defined within the Apache Felix project and another one for the standard annotations from the Declarative Services specification.

Modified: felix/site/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin.mdtext
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin.mdtext?rev=1742680&r1=1742679&r2=1742680&view=diff
==============================================================================
--- felix/site/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin.mdtext (original)
+++ felix/site/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin.mdtext Sat May  7 00:34:10 2016
@@ -1,5 +1,7 @@
 Title: Apache Felix Maven SCR Plugin
 
+Note: While the Apache Felix Maven SCR Plugin is a great tool (see below), for developing OSGi components using Declarative Services you should use the official annotations from the OSGi R6 specification. The development of the Apache Felix SCR Plugin is in maintenance mode.
+
 The Apache Felix Maven SCR Plugin is a great tool to ease the development of OSGi components and services. Components and services are defined through annotations and the plugin creates the necessary descriptors for the OSGi Declarative Services, Config Admin and Metatype services. Recent versions of the plugin support OSGi Declarative Services versions 1.0, 1.1, and 1.2.
 
 Make sure to see the [FAQ]({{ refs.apache-felix-scr-plugin-faq.path }}) for known problems.

Modified: felix/site/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-maven-scr-plugin-use.mdtext
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-maven-scr-plugin-use.mdtext?rev=1742680&r1=1742679&r2=1742680&view=diff
==============================================================================
--- felix/site/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-maven-scr-plugin-use.mdtext (original)
+++ felix/site/trunk/content/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-maven-scr-plugin-use.mdtext Sat May  7 00:34:10 2016
@@ -13,7 +13,7 @@ Support for automatic generation of the
           <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-scr-plugin</artifactId>
-            <version>1.15.0</version>
+            <version>1.20.0</version>
             <executions>
               <execution>
                 <id>generate-scr-scrdescriptor</id>