maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rfscho...@apache.org
Subject svn commit: r1422564 - in /maven/plugins/trunk/maven-deploy-plugin/src/test: java/org/apache/maven/plugin/deploy/stubs/ resources/unit/basic-deploy-pom/ resources/unit/basic-deploy-test/ resources/unit/basic-deploy-with-attached-artifacts/
Date Sun, 16 Dec 2012 12:12:32 GMT
Author: rfscholte
Date: Sun Dec 16 12:12:31 2012
New Revision: 1422564

URL: http://svn.apache.org/viewvc?rev=1422564&view=rev
Log:
Now tests also succeed under Eclipse

Modified:
    maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/ArtifactRepositoryStub.java
    maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-pom/plugin-config.xml
    maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-test/plugin-config.xml
    maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-with-attached-artifacts/plugin-config.xml

Modified: maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/ArtifactRepositoryStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/ArtifactRepositoryStub.java?rev=1422564&r1=1422563&r2=1422564&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/ArtifactRepositoryStub.java
(original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/test/java/org/apache/maven/plugin/deploy/stubs/ArtifactRepositoryStub.java
Sun Dec 16 12:12:31 2012
@@ -35,6 +35,8 @@ public class ArtifactRepositoryStub
     
     private String url;
     
+    private String basedir = System.getProperty( "basedir" );
+
     public String pathOf( Artifact artifact )
     {
         return getLayout().pathOf( artifact );
@@ -57,12 +59,12 @@ public class ArtifactRepositoryStub
     
     public void setAppendToUrl( String dir )
     {
-        this.url = "file://" + System.getProperty( "basedir" ) + "/target/remote-repo/" +
dir;
+        this.url = "file://" + basedir + "/target/remote-repo/" + dir;
     }
     
     public String getBasedir()
     {
-        return System.getProperty( "basedir" );
+        return basedir;
     }
     
     public String getProtocol()

Modified: maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-pom/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-pom/plugin-config.xml?rev=1422564&r1=1422563&r2=1422564&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-pom/plugin-config.xml
(original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-pom/plugin-config.xml
Sun Dec 16 12:12:31 2012
@@ -35,7 +35,9 @@ under the License.
             <packaging>pom</packaging>
             <artifact implementation="org.apache.maven.plugin.deploy.stubs.DeployArtifactStub"
/>
             <attachedArtifacts />
-            <deploymentRepository implementation="org.apache.maven.plugin.deploy.stubs.ArtifactRepositoryStub"
/>
+            <deploymentRepository implementation="org.apache.maven.plugin.deploy.stubs.ArtifactRepositoryStub">
+              <basedir>${basedir}</basedir>
+            </deploymentRepository>
           </project>
           <updateReleaseInfo>true</updateReleaseInfo>
         </configuration>

Modified: maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-test/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-test/plugin-config.xml?rev=1422564&r1=1422563&r2=1422564&view=diff
==============================================================================
Binary files - no diff available.

Modified: maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-with-attached-artifacts/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-with-attached-artifacts/plugin-config.xml?rev=1422564&r1=1422563&r2=1422564&view=diff
==============================================================================
--- maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-with-attached-artifacts/plugin-config.xml
(original)
+++ maven/plugins/trunk/maven-deploy-plugin/src/test/resources/unit/basic-deploy-with-attached-artifacts/plugin-config.xml
Sun Dec 16 12:12:31 2012
@@ -39,7 +39,9 @@ under the License.
             <attachedArtifacts>
               <attachedArtifact implementation="org.apache.maven.plugin.deploy.stubs.AttachedArtifactStub"
/>
             </attachedArtifacts>
-            <deploymentRepository implementation="org.apache.maven.plugin.deploy.stubs.ArtifactRepositoryStub"
/>
+            <deploymentRepository implementation="org.apache.maven.plugin.deploy.stubs.ArtifactRepositoryStub">
+              <basedir>${basedir}</basedir>
+            </deploymentRepository>
           </project>
           <updateReleaseInfo>true</updateReleaseInfo>
         </configuration>



Mime
View raw message