You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2015/04/24 22:04:46 UTC

svn commit: r1675944 - in /maven/plugins/branches/m-install-p-3.0: pom.xml src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java src/main/java/org/apache/maven/plugin/install/InstallMojo.java

Author: rfscholte
Date: Fri Apr 24 20:04:45 2015
New Revision: 1675944

URL: http://svn.apache.org/r1675944
Log:
[MINSTALL-114] Use ArtifactInstaller.getLocalRepositoryBasedir() to get the actual value for debugging.

Modified:
    maven/plugins/branches/m-install-p-3.0/pom.xml
    maven/plugins/branches/m-install-p-3.0/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
    maven/plugins/branches/m-install-p-3.0/src/main/java/org/apache/maven/plugin/install/InstallMojo.java

Modified: maven/plugins/branches/m-install-p-3.0/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/m-install-p-3.0/pom.xml?rev=1675944&r1=1675943&r2=1675944&view=diff
==============================================================================
--- maven/plugins/branches/m-install-p-3.0/pom.xml (original)
+++ maven/plugins/branches/m-install-p-3.0/pom.xml Fri Apr 24 20:04:45 2015
@@ -171,8 +171,8 @@ under the License.
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-invoker-plugin</artifactId>
+              <version>1.10</version>
               <configuration>
-                <debug>true</debug>
                 <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
                 <cloneClean>true</cloneClean>
                 <pomIncludes>

Modified: maven/plugins/branches/m-install-p-3.0/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/m-install-p-3.0/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java?rev=1675944&r1=1675943&r2=1675944&view=diff
==============================================================================
--- maven/plugins/branches/m-install-p-3.0/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java (original)
+++ maven/plugins/branches/m-install-p-3.0/src/main/java/org/apache/maven/plugin/install/InstallFileMojo.java Fri Apr 24 20:04:45 2015
@@ -195,7 +195,7 @@ public class InstallFileMojo
             {
                 buildingRequest = installer.setLocalRepositoryBasedir( buildingRequest, localRepositoryPath );
                 
-                getLog().debug( "localRepoPath: " + buildingRequest.getRepositorySession().getLocalRepository().getBasedir() );
+                getLog().debug( "localRepoPath: " + installer.getLocalRepositoryBasedir( buildingRequest ) );
             }
             catch ( ArtifactInstallerException e )
             {

Modified: maven/plugins/branches/m-install-p-3.0/src/main/java/org/apache/maven/plugin/install/InstallMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/m-install-p-3.0/src/main/java/org/apache/maven/plugin/install/InstallMojo.java?rev=1675944&r1=1675943&r2=1675944&view=diff
==============================================================================
--- maven/plugins/branches/m-install-p-3.0/src/main/java/org/apache/maven/plugin/install/InstallMojo.java (original)
+++ maven/plugins/branches/m-install-p-3.0/src/main/java/org/apache/maven/plugin/install/InstallMojo.java Fri Apr 24 20:04:45 2015
@@ -165,7 +165,7 @@ public class InstallMojo
             {
 //                installer.install( pomFile, artifact, localRepository );
                 installer.install( session.getProjectBuildingRequest(),
-                                   Collections.<Artifact> singletonList( new ProjectArtifact( project ) ) );
+                                   Collections.<Artifact>singletonList( new ProjectArtifact( project ) ) );
                 installChecksums( artifact, createChecksum );
                 addMetaDataFilesForArtifact( artifact, metadataFiles, createChecksum );
             }