You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by da...@apache.org on 2018/11/23 09:57:53 UTC
[sling-slingfeature-maven-plugin] branch master updated: Fix
javadoc in preparation for release.
This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new e4cebfb Fix javadoc in preparation for release.
e4cebfb is described below
commit e4cebfbb7c409963c4e4027ce3dfaabdafb36c1f
Author: David Bosschaert <bo...@adobe.com>
AuthorDate: Fri Nov 23 09:57:37 2018 +0000
Fix javadoc in preparation for release.
---
src/main/java/org/apache/sling/feature/maven/Preprocessor.java | 3 +--
src/main/java/org/apache/sling/feature/maven/ProjectHelper.java | 5 +++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/maven/Preprocessor.java b/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
index 7f4f025..574bfee 100644
--- a/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
+++ b/src/main/java/org/apache/sling/feature/maven/Preprocessor.java
@@ -284,9 +284,8 @@ public class Preprocessor {
* The feature is either inlined in the pom or stored in a file in the project.
*
* @param logger The logger
- * @param project The current maven project
+ * @param info The project info
* @param config The configuration
- * @return The feature or {@code null}
*/
protected void readProjectFeatures(
final Logger logger,
diff --git a/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java b/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java
index e9f2f4c..06dfb2c 100644
--- a/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java
+++ b/src/main/java/org/apache/sling/feature/maven/ProjectHelper.java
@@ -222,6 +222,11 @@ public abstract class ProjectHelper {
/**
* Get a resolved Artifact from the coordinates provided
*
+ * @param project The maven project
+ * @param session The maven session
+ * @param artifactHandlerManager The artifact handler manager
+ * @param resolver The artifact resolver
+ * @param id The ID of the artifact to get/resolve.
* @return the artifact, which has been resolved.
*/
public static Artifact getOrResolveArtifact(final MavenProject project,