Author: buildbot
Date: Fri Mar 6 20:54:09 2015
New Revision: 942639
Log:
Staging update by buildbot for felix
Modified:
websites/staging/felix/trunk/content/ (props changed)
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/guides/migrating-from-earlier-versions.html
Propchange: websites/staging/felix/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Mar 6 20:54:09 2015
@@ -1 +1 @@
-1664715
+1664717
Modified:
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/guides/migrating-from-earlier-versions.html
==============================================================================
---
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/guides/migrating-from-earlier-versions.html
(original)
+++
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/guides/migrating-from-earlier-versions.html
Fri Mar 6 20:54:09 2015
@@ -86,56 +86,56 @@ annotations plugin if you don't need to
<li>The Dependency Manager metatype annotations are now deprecated and it is
encouraged to use standard bnd metatypes annotation instead.
See
org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/annot/DictionaryConfiguration.java
for an example.
You can also check http://www.aqute.biz/Bnd/MetaType for more information
about the bnd metatypes annotations.</li>
-<li>
-<p>Dependency Manager is now fully built using bndtools, and there is no Maven
annotation plugin anymore. However, the workaround is simply the
+<li>Dependency Manager is now fully built using bndtools, and there is no
Maven annotation plugin anymore. However, the workaround is simply the
use a "_plugin" option in the pom, and to declare a dependency inside the
"plugin" configuration.
Notice that in the R1 version, we are not pushing DM distribution to maven, so
you have to do manually push the DM artifacts in your own nexus server.
-We'll try to release DM artifacts to maven central in the next release (R2).
-For example:</p>
-<p>:::xml
-<project ...>
- <dependencies>
- ...
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.dependencymanager.annotation</artifactId>
- <version>4.0.0</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- ... <br />
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Name>Test</Bundle-Name>
- <Bundle-SymbolicName>test</Bundle-SymbolicName>
- <Import-Package>*</Import-Package>
-
<Private-Package>test.dmannotations.withbndplugininvokedfrompom</Private-Package>
-
<_plugin>org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin;log=debug</_plugin>
- </instructions>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.felix</groupId>
-
<artifactId>org.apache.felix.dependencymanager.annotation</artifactId>
- <version>4.0.0</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-</project></p>
-</li>
+We'll try to release DM artifacts to maven central in the next release
(R2).</li>
</ul>
+<p>For example:</p>
+<div class="codehilite"><pre><span class="nt"><project</span> <span
class="err">...</span><span class="nt">></span>
+ <span class="nt"><dependencies></span>
+ ...
+ <span class="nt"><dependency></span>
+ <span class="nt"><groupId></span>org.apache.felix<span
class="nt"></groupId></span>
+ <span
class="nt"><artifactId></span>org.apache.felix.dependencymanager.annotation<span
class="nt"></artifactId></span>
+ <span class="nt"><version></span>4.0.0<span
class="nt"></version></span>
+ <span class="nt"></dependency></span>
+ <span class="nt"></dependencies></span>
+ <span class="nt"><build></span>
+ <span class="nt"><plugins></span>
+ ...
+ <span class="nt"><plugin></span>
+ <span class="nt"><groupId></span>org.apache.felix<span
class="nt"></groupId></span>
+ <span class="nt"><artifactId></span>maven-bundle-plugin<span
class="nt"></artifactId></span>
+ <span class="nt"><version></span>2.5.0<span
class="nt"></version></span>
+ <span class="nt"><extensions></span>true<span
class="nt"></extensions></span>
+ <span class="nt"><configuration></span>
+ <span class="nt"><instructions></span>
+ <span class="nt"><Bundle-Name></span>Test<span
class="nt"></Bundle-Name></span>
+ <span class="nt"><Bundle-SymbolicName></span>test<span
class="nt"></Bundle-SymbolicName></span>
+ <span class="nt"><Import-Package></span>*<span
class="nt"></Import-Package></span>
+ <span
class="nt"><Private-Package></span>test.dmannotations.withbndplugininvokedfrompom<span
class="nt"></Private-Package></span>
+ <span
class="nt"><_plugin></span>org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin;log=debug<span
class="nt"></_plugin></span>
+ <span class="nt"></instructions></span>
+ <span class="nt"></configuration></span>
+ <span class="nt"><dependencies></span>
+ <span class="nt"><dependency></span>
+ <span class="nt"><groupId></span>org.apache.felix<span
class="nt"></groupId></span>
+ <span
class="nt"><artifactId></span>org.apache.felix.dependencymanager.annotation<span
class="nt"></artifactId></span>
+ <span class="nt"><version></span>4.0.0<span
class="nt"></version></span>
+ <span class="nt"></dependency></span>
+ <span class="nt"></dependencies></span>
+ <span class="nt"></plugin></span>
+ <span class="nt"></plugins></span>
+ <span class="nt"></build></span>
+<span class="nt"></project></span>
+</pre></div>
+
+
<h1 id="migrating-from-version-2">Migrating from version 2</h1>
<p>...</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1664715 by pderop on Fri, 6 Mar 2015 20:51:59 +0000
+ Rev. 1664717 by pderop on Fri, 6 Mar 2015 20:53:54 +0000
</div>
<div class="trademarkFooter">
Apache Felix, Felix, Apache, the Apache feather logo, and the Apache
Felix project
