Author: khmarbaise
Date: Tue Aug 1 19:36:26 2017
New Revision: 1803691
URL: http://svn.apache.org/viewvc?rev=1803691&view=rev
Log:
- Enhanced javadoc.
- Removed duplicated copyright header.
Modified:
maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResult.java
maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/project/deploy/ProjectDeployer.java
maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
Modified:
maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResult.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResult.java?rev=1803691&r1=1803690&r2=1803691&view=diff
==============================================================================
---
maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResult.java
(original)
+++
maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResult.java
Tue Aug 1 19:36:26 2017
@@ -31,7 +31,7 @@ public interface DependencyResult
/**
* Gets the exceptions that occurred while building the dependency graph.
*
- * @return
+ * @return The list of exceptions {@link Exception}.
*/
List<Exception> getCollectorExceptions();
}
Modified:
maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/project/deploy/ProjectDeployer.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/project/deploy/ProjectDeployer.java?rev=1803691&r1=1803690&r2=1803691&view=diff
==============================================================================
---
maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/project/deploy/ProjectDeployer.java
(original)
+++
maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/project/deploy/ProjectDeployer.java
Tue Aug 1 19:36:26 2017
@@ -19,31 +19,12 @@ package org.apache.maven.shared.project.
* under the License.
*/
-import java.io.IOException;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.project.NoFileAssignedException;
+import java.io.IOException;
+
/**
* This defines the interface to deploy a single Maven Project.
*
@@ -56,9 +37,9 @@ public interface ProjectDeployer
* appropriate remote repository.
*
* <pre class="java">
- * @Parameter( defaultValue = "${session}", required=true, readonly =
true)
+ * @Parameter( defaultValue = "${session}", required=true, readonly =
true)
* MavenSession session;
- * @Parameter( defaultValue = "${project}", required=true, readonly =
true)
+ * @Parameter( defaultValue = "${project}", required=true, readonly =
true)
* MavenProject project;
* ..
* @Component
@@ -72,6 +53,17 @@ public interface ProjectDeployer
* deployer.deploy (session.getProjectBuildingRequest(), pdr,
artifactRepository);
* </pre>
*
+ * To set a different local repository than the current one in the Maven
session, you can inject an instance of the
+ * <code>RepositoryManager</code> and set the path to the local
repository, called <code>localRepositoryPath</code>,
+ * as such:
+ *
+ * <pre class="java">
+ * @Component
+ * private RepositoryManager repositoryManager;
+ *
+ * buildingRequest = repositoryManager.setLocalRepositoryBasedir(
buildingRequest, localRepositoryPath );
+ * </pre>
+ *
* @param buildingRequest {@link ProjectBuildingRequest}
* @param request {@link ProjectDeployerRequest}
* @param artifactRepository {@link ArtifactRepository}
@@ -79,7 +71,7 @@ public interface ProjectDeployer
* @throws NoFileAssignedException In case of missing file which has not
been assigned to project.
*/
void deploy( ProjectBuildingRequest buildingRequest,
ProjectDeployerRequest request,
- ArtifactRepository artifactRepository )
+ ArtifactRepository artifactRepository )
throws IOException, NoFileAssignedException;
}
Modified:
maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java?rev=1803691&r1=1803690&r2=1803691&view=diff
==============================================================================
---
maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
(original)
+++
maven/shared/branches/maven-artifact-transfer-MSHARED-627/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
Tue Aug 1 19:36:26 2017
@@ -113,7 +113,6 @@ public class DefaultProjectInstaller
}
File file = artifact.getFile();
-
// Here, we have a temporary solution to MINSTALL-3 (isDirectory()
is true if it went through compile
// but not package). We are designing in a proper solution for
Maven 2.1
if ( file != null && file.isFile() )
