Author: khmarbaise
Date: Sun Sep 18 15:28:09 2016
New Revision: 1761333
URL: http://svn.apache.org/viewvc?rev=1761333&view=rev
Log:
DefaultProjectDeployer, DefaultProjectInstaller
o Changed @Inject into @Requirement
ProjectInstaller
o Added IllegalArgumentException to interface method.
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java?rev=1761333&r1=1761332&r2=1761333&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java
Sun Sep 18 15:28:09 2016
@@ -24,8 +24,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import javax.inject.Inject;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.project.ProjectBuildingRequest;
@@ -35,6 +33,7 @@ import org.apache.maven.shared.artifact.
import org.apache.maven.shared.project.deploy.ProjectDeployer;
import org.apache.maven.shared.project.deploy.ProjectDeployerRequest;
import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,7 +50,7 @@ public class DefaultProjectDeployer impl
{
private static final Logger LOGGER = LoggerFactory.getLogger(
DefaultProjectDeployer.class );
- @Inject
+ @Requirement
private ArtifactDeployer deployer;
/**
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java?rev=1761333&r1=1761332&r2=1761333&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java
Sun Sep 18 15:28:09 2016
@@ -41,9 +41,10 @@ public interface ProjectInstaller
* @param artifactRepository {@link ArtifactRepository}
* @throws IOException In case of problem to install project.
* @throws ArtifactInstallerException In case of problems to install
artifacts.
+ * @throws IllegalArgumentException In case of no file has been assigned.
*/
void installProject( ProjectBuildingRequest projectBuildingRequest,
ProjectInstallerRequest projectInstallerRequest,
ArtifactRepository artifactRepository )
- throws IOException, ArtifactInstallerException;
+ throws IOException, ArtifactInstallerException,
IllegalArgumentException;
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java?rev=1761333&r1=1761332&r2=1761333&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
Sun Sep 18 15:28:09 2016
@@ -26,8 +26,6 @@ import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
-import javax.inject.Inject;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -41,6 +39,7 @@ import org.apache.maven.shared.project.i
import org.apache.maven.shared.project.install.ProjectInstallerRequest;
import org.apache.maven.shared.repository.RepositoryManager;
import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.util.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,17 +56,17 @@ public class DefaultProjectInstaller
private static final Logger LOGGER = LoggerFactory.getLogger(
DefaultProjectInstaller.class );
- @Inject
+ @Requirement
private ArtifactInstaller installer;
- @Inject
+ @Requirement
private RepositoryManager repositoryManager;
private final DualDigester digester = new DualDigester();
public void installProject( ProjectBuildingRequest buildingRequest,
ProjectInstallerRequest request,
ArtifactRepository artifactRepository )
- throws IOException, ArtifactInstallerException
+ throws IOException, ArtifactInstallerException,
IllegalArgumentException
{
MavenProject project = request.getProject();
