You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2016/01/26 08:31:14 UTC
maven git commit: o Updated to get rid of some Javadoc warnings.
Repository: maven
Updated Branches:
refs/heads/master 5c98a4261 -> ae9ccf2e4
o Updated to get rid of some Javadoc warnings.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ae9ccf2e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ae9ccf2e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ae9ccf2e
Branch: refs/heads/master
Commit: ae9ccf2e48b8cd848908c6da2e6247ef46fc0829
Parents: 5c98a42
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Jan 26 08:30:39 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Tue Jan 26 08:30:39 2016 +0100
----------------------------------------------------------------------
.../apache/maven/artifact/repository/ArtifactRepository.java | 1 -
.../src/main/java/org/apache/maven/repository/Proxy.java | 2 +-
.../java/org/apache/maven/artifact/ArtifactScopeEnum.java | 2 --
.../maven/artifact/UnknownRepositoryLayoutException.java | 1 +
.../interpolation/AbstractStringBasedModelInterpolator.java | 2 --
.../main/java/org/apache/maven/repository/MetadataGraph.java | 7 -------
.../java/org/apache/maven/DefaultArtifactFilterManager.java | 2 --
.../org/apache/maven/execution/MavenExecutionRequest.java | 1 +
.../src/main/java/org/apache/maven/project/MavenProject.java | 8 ++++----
.../apache/maven/properties/internal/SystemProperties.java | 2 +-
.../java/org/apache/maven/toolchain/ToolchainManager.java | 2 +-
11 files changed, 9 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ae9ccf2e/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
index 9ef3038..0b33345 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
@@ -79,7 +79,6 @@ public interface ArtifactRepository
/**
*
* @param artifact
- * @return
* @since 3.0-alpha-3
*/
Artifact find( Artifact artifact );
http://git-wip-us.apache.org/repos/asf/maven/blob/ae9ccf2e/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java b/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java
index ea2c023..1dc1a2c 100644
--- a/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java
+++ b/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java
@@ -158,7 +158,7 @@ public class Proxy
}
/**
- * @param type the type of the proxy server like <i>SOCKSv4</i>
+ * @param protocol the type of the proxy server like <i>SOCKSv4</i>
*/
public void setProtocol( String protocol )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/ae9ccf2e/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java b/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
index 7051e3b..4460a07 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
@@ -49,8 +49,6 @@ public enum ArtifactScopeEnum
/**
* Helper method to simplify null processing
- *
- * @return
*/
public static final ArtifactScopeEnum checkScope( ArtifactScopeEnum scope )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/ae9ccf2e/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java b/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
index 5abe110..cb0af7f 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
@@ -19,6 +19,7 @@ package org.apache.maven.artifact;
* under the License.
*/
+import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
/**
http://git-wip-us.apache.org/repos/asf/maven/blob/ae9ccf2e/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
index 568196c..634c43a 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
@@ -188,8 +188,6 @@ public abstract class AbstractStringBasedModelInterpolator
* with the value, and continue to find other expressions.</li>
* <li>If the value is null, get it from the model properties.</li>
* <li>
- * @param overrideContext
- * @param outputDebugMessages
*/
public String interpolate( String src,
Model model,
http://git-wip-us.apache.org/repos/asf/maven/blob/ae9ccf2e/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java
index e994856..2aebc74 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraph.java
@@ -55,9 +55,6 @@ public class MetadataGraph
/**
* find a node by the GAV (metadata)
- *
- * @param md
- * @return
*/
public MetadataGraphNode findNode( MavenArtifactMetadata md )
{
@@ -76,8 +73,6 @@ public class MetadataGraph
/**
* getter
- *
- * @return
*/
public MetadataGraphNode getEntry()
{
@@ -86,8 +81,6 @@ public class MetadataGraph
/**
* getter
- *
- * @return
*/
public Collection<MetadataGraphNode> getNodes()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/ae9ccf2e/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
index 503dcdb..1b049d0 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
@@ -84,8 +84,6 @@ public class DefaultArtifactFilterManager
/**
* Returns the artifact filter for the standard core artifacts.
- *
- * @see org.apache.maven.ArtifactFilterManager#getExtensionDependencyFilter()
*/
public ArtifactFilter getCoreArtifactFilter()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/ae9ccf2e/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
index 53f84c5..a87f674 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
@@ -28,6 +28,7 @@ import java.util.Properties;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.eventspy.internal.EventSpyDispatcher;
+import org.apache.maven.lifecycle.internal.builder.Builder;
import org.apache.maven.model.Profile;
import org.apache.maven.project.ProjectBuildingRequest;
//
http://git-wip-us.apache.org/repos/asf/maven/blob/ae9ccf2e/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
index f649960..d7d6ce8 100644
--- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
+++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
@@ -914,10 +914,10 @@ public class MavenProject
* @param artifact The artifact to add or replace.
*
* @deprecated Please use {@link MavenProjectHelper}
- * @see https://issues.apache.org/jira/browse/MNG-5868
- * @see https://issues.apache.org/jira/browse/MNG-5387
- * @see https://issues.apache.org/jira/browse/MNG-4013
- * @see https://issues.apache.org/jira/browse/MNG-3119
+ * @see "https://issues.apache.org/jira/browse/MNG-5868"
+ * @see "https://issues.apache.org/jira/browse/MNG-5387"
+ * @see "https://issues.apache.org/jira/browse/MNG-4013"
+ * @see "https://issues.apache.org/jira/browse/MNG-3119"
*/
@Deprecated
public void addAttachedArtifact( Artifact artifact )
http://git-wip-us.apache.org/repos/asf/maven/blob/ae9ccf2e/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java b/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
index aa5fed9..0372558 100644
--- a/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
+++ b/maven-core/src/main/java/org/apache/maven/properties/internal/SystemProperties.java
@@ -29,7 +29,7 @@ public class SystemProperties
/**
* Thread-safe System.properties copy implementation.
*
- * @see https://issues.apache.org/jira/browse/MNG-5670
+ * @see "https://issues.apache.org/jira/browse/MNG-5670"
*/
public static void addSystemProperties( Properties props )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/ae9ccf2e/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
index 8eddac5..bc0a91d 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
@@ -44,8 +44,8 @@ public interface ToolchainManager
* <code>maven-toolchains-plugin</code> contains the configuration to select the appropriate
* toolchain and is executed at the beginning of the build.
*
- * @param session the Maven session, must not be {@code null}
* @param type the type, must not be {@code null}
+ * @param context the Maven session, must not be {@code null}
* @return the toolchain selected by <code>maven-toolchains-plugin</code>
*/
Toolchain getToolchainFromBuildContext( String type, MavenSession context );