Author: sseifert
Date: Wed Mar 8 19:30:10 2017
New Revision: 1786059
URL: http://svn.apache.org/viewvc?rev=1786059&view=rev
Log:
fix javadoc errors
DefaultMaven2OsgiConverter: eliminate obsolete @plexus.component annotation
BundlePlugin: add @Component annotation to artifactResolver member variable
Modified:
felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundleInfo.java
felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/VerifyBundlePlugin.java
felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java
felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
Modified:
felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundleInfo.java
URL:
http://svn.apache.org/viewvc/felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundleInfo.java?rev=1786059&r1=1786058&r2=1786059&view=diff
==============================================================================
---
felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundleInfo.java
(original)
+++
felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundleInfo.java
Wed Mar 8 19:30:10 2017
@@ -60,7 +60,7 @@ public class BundleInfo
/**
* Get a list of packages that are exported in more than one bundle.
* Key is package name and value list of artifacts where it's exported.
- * @return {@link Map} < {@link String}, {@link Set} < {@link
Artifact} > >
+ * @return {@link Map} < {@link String}, {@link Set} < {@link
Artifact} > >
*/
public Map<String, Set<Artifact>> getDuplicatedExports()
{
Modified:
felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
URL:
http://svn.apache.org/viewvc/felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java?rev=1786059&r1=1786058&r2=1786059&view=diff
==============================================================================
---
felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
(original)
+++
felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
Wed Mar 8 19:30:10 2017
@@ -245,11 +245,8 @@ public class BundlePlugin extends Abstra
/**
* Artifact resolver, needed to download source jars for inclusion in
classpath.
- *
- * @component
- * @required
- * @readonly
*/
+ @Component
protected ArtifactResolver artifactResolver;
Modified:
felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/VerifyBundlePlugin.java
URL:
http://svn.apache.org/viewvc/felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/VerifyBundlePlugin.java?rev=1786059&r1=1786058&r2=1786059&view=diff
==============================================================================
---
felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/VerifyBundlePlugin.java
(original)
+++
felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/VerifyBundlePlugin.java
Wed Mar 8 19:30:10 2017
@@ -46,7 +46,7 @@ import org.apache.maven.project.MavenPro
*
* Supported checks in the current version:
* <ul>
- * <li>All packages declared in the <a
href="http://bnd.bndtools.org/heads/export_package.html";>Export-Package<a/>
header are really included in the bundle.</li>
+ * <li>All packages declared in the <a
href="http://bnd.bndtools.org/heads/export_package.html";>Export-Package</a>
header are really included in the bundle.</li>
* </ul>
*/
@Mojo(
Modified:
felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java
URL:
http://svn.apache.org/viewvc/felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java?rev=1786059&r1=1786058&r2=1786059&view=diff
==============================================================================
---
felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java
(original)
+++
felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/maven/shared/dependency/tree/DependencyTreeResolutionListener.java
Wed Mar 8 19:30:10 2017
@@ -385,7 +385,7 @@ public class DependencyTreeResolutionLis
* Gets a list of all dependency nodes in the computed dependency tree.
*
* @return a list of dependency nodes
- * @deprecated As of 1.1, use a {@link CollectingDependencyNodeVisitor} on
the root dependency node
+ * @deprecated As of 1.1, use a CollectingDependencyNodeVisitor on the
root dependency node
*/
public Collection getNodes()
{
Modified:
felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
URL:
http://svn.apache.org/viewvc/felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java?rev=1786059&r1=1786058&r2=1786059&view=diff
==============================================================================
---
felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
(original)
+++
felix/trunk/tools/maven-bundle-plugin/src/main/java/org/apache/maven/shared/osgi/DefaultMaven2OsgiConverter.java
Wed Mar 8 19:30:10 2017
@@ -39,8 +39,6 @@ import aQute.bnd.osgi.Analyzer;
/**
* Default implementation of {@link Maven2OsgiConverter}
*
- * @plexus.component
- *
* @author <a href="mailto:[email protected]";>Carlos Sanchez</a>
* @version $Id: DefaultMaven2OsgiConverter.java 661727 2008-05-30 14:21:49Z
bentmann $
*/
@@ -62,14 +60,14 @@ public class DefaultMaven2OsgiConverter
* <li>if artifact.getFile is not null and the jar contains a OSGi
Manifest with
* Bundle-SymbolicName property then that value is returned</li>
* <li>if groupId has only one section (no dots) and artifact.getFile is
not null then the
- * first package name with classes is returned. eg.
commons-logging:commons-logging ->
+ * first package name with classes is returned. eg.
commons-logging:commons-logging ->
* org.apache.commons.logging</li>
* <li>if artifactId is equal to last section of groupId then groupId is
returned. eg.
- * org.apache.maven:maven -> org.apache.maven</li>
+ * org.apache.maven:maven -> org.apache.maven</li>
* <li>if artifactId starts with last section of groupId that portion is
removed. eg.
- * org.apache.maven:maven-core -> org.apache.maven.core</li>
+ * org.apache.maven:maven-core -> org.apache.maven.core</li>
* <li>if artifactId starts with groupId then the artifactId is removed.
eg.
- * org.apache:org.apache.maven.core -> org.apache.maven.core</li>
+ * org.apache:org.apache.maven.core -> org.apache.maven.core</li>
* </ul>
*/
public String getBundleSymbolicName( Artifact artifact )
