maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdca...@apache.org
Subject svn commit: r612658 - in /maven/components/trunk: maven-embedder/src/test/error-reporting-projects/testReportAggregatedMojoFailureException/plugin/ maven-embedder/src/test/error-reporting-projects/testReportAttemptToOverrideUneditableMojoParameter/plug...
Date Thu, 17 Jan 2008 00:37:20 GMT
Author: jdcasey
Date: Wed Jan 16 16:37:19 2008
New Revision: 612658

URL: http://svn.apache.org/viewvc?rev=612658&view=rev
Log:
make things more friendly to non-standard settings and local-repo locations.

Modified:
    maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportAggregatedMojoFailureException/plugin/pom.xml
    maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportAttemptToOverrideUneditableMojoParameter/plugin/pom.xml
    maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/pom.xml
    maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/pom.xml
    maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportExtensionPluginVersionNotFound/plugin/pom.xml
    maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportIncompatibleMavenVersionForExtensionPlugin/plugin/pom.xml
    maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportInvalidDependencyVersionInExtensionPluginPOM/plugin/pom.xml
    maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportMissingRequiredMojoParameter/plugin/pom.xml
    maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportMojoExecutionException/plugin/pom.xml
    maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/activation/FileProfileActivatorTest.java

Modified: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportAggregatedMojoFailureException/plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportAggregatedMojoFailureException/plugin/pom.xml?rev=612658&r1=612657&r2=612658&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportAggregatedMojoFailureException/plugin/pom.xml
(original)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportAggregatedMojoFailureException/plugin/pom.xml
Wed Jan 16 16:37:19 2008
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.errortest</groupId>
   <artifactId>testReportAggregatedMojoFailureException-maven-plugin</artifactId>

Modified: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportAttemptToOverrideUneditableMojoParameter/plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportAttemptToOverrideUneditableMojoParameter/plugin/pom.xml?rev=612658&r1=612657&r2=612658&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportAttemptToOverrideUneditableMojoParameter/plugin/pom.xml
(original)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportAttemptToOverrideUneditableMojoParameter/plugin/pom.xml
Wed Jan 16 16:37:19 2008
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.errortest</groupId>
   <artifactId>testReportAttemptToOverrideUneditableMojoParameter-maven-plugin</artifactId>
@@ -8,7 +9,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.1-SNAPSHOT</version>
+      <version>2.0</version>
     </dependency>
   </dependencies>
   <build>

Modified: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/pom.xml?rev=612658&r1=612657&r2=612658&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/pom.xml
(original)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorConfiguringExtensionPluginRealm/plugin/pom.xml
Wed Jan 16 16:37:19 2008
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.errortest</groupId>
   <artifactId>test-maven-ext-plugin</artifactId>
@@ -8,7 +9,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.1-SNAPSHOT</version>
+      <version>2.0</version>
     </dependency>
   </dependencies>
   <build>

Modified: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/pom.xml?rev=612658&r1=612657&r2=612658&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/pom.xml
(original)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportErrorFormulatingBuildPlan/plugin/pom.xml
Wed Jan 16 16:37:19 2008
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.errortest</groupId>
   <artifactId>testReportErrorFormulatingBuildPlan-maven-plugin</artifactId>
@@ -8,7 +9,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.1-SNAPSHOT</version>
+      <version>2.0</version>
     </dependency>
   </dependencies>
   <build>

Modified: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportExtensionPluginVersionNotFound/plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportExtensionPluginVersionNotFound/plugin/pom.xml?rev=612658&r1=612657&r2=612658&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportExtensionPluginVersionNotFound/plugin/pom.xml
(original)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportExtensionPluginVersionNotFound/plugin/pom.xml
Wed Jan 16 16:37:19 2008
@@ -1,21 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.errortest</groupId>
   <artifactId>testReportIncompatibleMavenVersionForExtensionPlugin-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <version>1</version>
   
-  <!-- 
+    <!-- 
   <prerequisites>
     <maven>10</maven>
   </prerequisites>
+  
   -->
   
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.1-SNAPSHOT</version>
+      <version>2.0</version>
     </dependency>
   </dependencies>
   <build>

Modified: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportIncompatibleMavenVersionForExtensionPlugin/plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportIncompatibleMavenVersionForExtensionPlugin/plugin/pom.xml?rev=612658&r1=612657&r2=612658&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportIncompatibleMavenVersionForExtensionPlugin/plugin/pom.xml
(original)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportIncompatibleMavenVersionForExtensionPlugin/plugin/pom.xml
Wed Jan 16 16:37:19 2008
@@ -1,21 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.errortest</groupId>
   <artifactId>testReportIncompatibleMavenVersionForExtensionPlugin-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <version>1</version>
   
-  <!-- 
+    <!-- 
   <prerequisites>
     <maven>10</maven>
   </prerequisites>
+  
   -->
   
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.1-SNAPSHOT</version>
+      <version>2.0</version>
     </dependency>
   </dependencies>
   <build>

Modified: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportInvalidDependencyVersionInExtensionPluginPOM/plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportInvalidDependencyVersionInExtensionPluginPOM/plugin/pom.xml?rev=612658&r1=612657&r2=612658&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportInvalidDependencyVersionInExtensionPluginPOM/plugin/pom.xml
(original)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportInvalidDependencyVersionInExtensionPluginPOM/plugin/pom.xml
Wed Jan 16 16:37:19 2008
@@ -1,21 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.errortest</groupId>
   <artifactId>testReportIncompatibleMavenVersionForExtensionPlugin-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <version>1</version>
   
-  <!-- 
+    <!-- 
   <prerequisites>
     <maven>10</maven>
   </prerequisites>
+  
   -->
   
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.1-SNAPSHOT</version>
+      <version>2.0</version>
     </dependency>
   </dependencies>
   <build>

Modified: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportMissingRequiredMojoParameter/plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportMissingRequiredMojoParameter/plugin/pom.xml?rev=612658&r1=612657&r2=612658&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportMissingRequiredMojoParameter/plugin/pom.xml
(original)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportMissingRequiredMojoParameter/plugin/pom.xml
Wed Jan 16 16:37:19 2008
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.errortest</groupId>
   <artifactId>testReportMissingRequiredMojoParameter-maven-plugin</artifactId>
@@ -8,7 +9,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.1-SNAPSHOT</version>
+      <version>2.0</version>
     </dependency>
   </dependencies>
   <build>

Modified: maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportMojoExecutionException/plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportMojoExecutionException/plugin/pom.xml?rev=612658&r1=612657&r2=612658&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportMojoExecutionException/plugin/pom.xml
(original)
+++ maven/components/trunk/maven-embedder/src/test/error-reporting-projects/testReportMojoExecutionException/plugin/pom.xml
Wed Jan 16 16:37:19 2008
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.errortest</groupId>
   <artifactId>testReportMojoExecutionException-maven-plugin</artifactId>
@@ -8,7 +9,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.1-SNAPSHOT</version>
+      <version>2.0</version>
     </dependency>
   </dependencies>
   <build>

Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/activation/FileProfileActivatorTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/activation/FileProfileActivatorTest.java?rev=612658&r1=612657&r2=612658&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/activation/FileProfileActivatorTest.java
(original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/activation/FileProfileActivatorTest.java
Wed Jan 16 16:37:19 2008
@@ -22,6 +22,8 @@
 import org.apache.maven.model.Activation;
 import org.apache.maven.model.Profile;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.Properties;
 
 import junit.framework.TestCase;
@@ -38,21 +40,15 @@
     private FileProfileActivator activator = new FileProfileActivator();
 
     public void testFileActivationProfile()
-        throws ProfileActivationException
+        throws ProfileActivationException, IOException
     {
         org.apache.maven.model.ActivationFile activationFile = new org.apache.maven.model.ActivationFile();
 
-        // make an educated guess at the repository location...
-        String repoLocation = System.getProperty( "maven.repo.local", "${user.home}/.m2/repository"
);
-
-        repoLocation = repoLocation.replace( '\\', '/' );
-        if ( repoLocation.endsWith( "/" ) )
-        {
-            repoLocation = repoLocation.substring( 0, repoLocation.length() - 1 );
-        }
+        File tempFile = File.createTempFile( "FileProfileActivatorTest.", ".txt" );
+        tempFile.deleteOnExit();
 
         // Assume that junit exists
-        activationFile.setExists( repoLocation + "/junit/junit/3.8.1/junit-3.8.1.jar" );
+        activationFile.setExists( tempFile.getAbsolutePath() );
 
         Activation fileActivation = new Activation();
         fileActivation.setFile( activationFile );



Mime
View raw message