Author: buildbot
Date: Thu Nov  3 08:35:08 2016
New Revision: 1000423

Log:
Staging update by buildbot for sling

Modified:
    websites/staging/sling/trunk/content/   (props changed)
    
websites/staging/sling/trunk/content/documentation/development/ide-tooling/ide-tooling-incremental-build.html

Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Nov  3 08:35:08 2016
@@ -1 +1 @@
-1767833
+1767834

Modified: 
websites/staging/sling/trunk/content/documentation/development/ide-tooling/ide-tooling-incremental-build.html
==============================================================================
--- 
websites/staging/sling/trunk/content/documentation/development/ide-tooling/ide-tooling-incremental-build.html
 (original)
+++ 
websites/staging/sling/trunk/content/documentation/development/ide-tooling/ide-tooling-incremental-build.html
 Thu Nov  3 08:35:08 2016
@@ -142,10 +142,10 @@ Depending on which maven plugins you use
 <h3 id="bnd-maven-plugin">bnd-maven-plugin<a class="headerlink" 
href="#bnd-maven-plugin" title="Permanent link">&para;</a></h3>
 <p>The <a 
href="https://github.com/bndtools/bnd/tree/master/maven/bnd-maven-plugin";>bnd-maven-plugin</a>
 is developed from the bnd team and is based on bnd as well. It is versioned in 
parallel with bnd and bndtools. It natively supports incremental builds since 
version 3.1.0 <a href="https://github.com/bndtools/bnd/issues/1180";>issue 
1180</a>.</p>
 <h2 id="service-description-and-metatype-resources">Service Description and 
Metatype Resources<a class="headerlink" 
href="#service-description-and-metatype-resources" title="Permanent 
link">&para;</a></h2>
-<p>OSGi component and metatype annotations (for OSGi 6) are natively supported 
through bnd (and therefore automatically generated through both 
maven-bundle-plugin and bnd-maven-plugin). You don't need to configure anything 
explicitly since version 3.0.0 of bnd <a 
href="https://github.com/bndtools/bnd/issues/1041";>issue 1041</a>.</p>
-<p>The <code>maven-bundle-plugin</code> can be optionally coupled with the 
<code>maven-scr-plugin</code>. Both <code>maven-bundle-plugin</code> as well as 
<code>bnd-maven-plugin</code> can be optionally coupled with the <a 
href="http://felix.apache.org/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-bndtools-use.html";>scr-bnd-plugin</a>
 to generate components descriptions and metatype resources out of the Felix 
SCR annotations. The recommended way for new projects though is to rely on OSGi 
6 annotations only.</p>
+<p>OSGi component and metatype annotations (for OSGi 6) are natively supported 
through bnd (and therefore automatically generated through both 
maven-bundle-plugin and bnd-maven-plugin). You don't need to configure anything 
explicitly since version 3.0.0 of bnd (<a 
href="https://github.com/bndtools/bnd/issues/1041";>issue 1041</a>).</p>
+<p>The maven-bundle-plugin can be optionally coupled with the <a 
href="http://felix.apache.org/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-maven-scr-plugin-use.html";>maven-scr-plugin</a>.
 Both maven-bundle-plugin as well as bnd-maven-plugin can be optionally coupled 
with the <a 
href="http://felix.apache.org/documentation/subprojects/apache-felix-maven-scr-plugin/apache-felix-scr-bndtools-use.html";>scr-bnd-plugin</a>.
 Both approaches can be used to generate components descriptions and metatype 
resources out of the <a 
href="http://felix.apache.org/documentation/subprojects/apache-felix-maven-scr-plugin/scr-annotations.html";>Felix
 SCR annotations</a>. The recommended way for new projects though is to rely on 
OSGi 6 annotations. However if you need to rely on Felix SCR annotations though 
it is recommended to rather use the scr-bnd-plugin over the maven-scr-plugin, 
as the former is nicely integrated into bnd and therefore means less overhead 
during the build.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">
-        Rev. 1767833 by kwin on Thu, 3 Nov 2016 08:29:17 +0000
+        Rev. 1767834 by kwin on Thu, 3 Nov 2016 08:34:59 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project


Reply via email to