Author: fgiust
Date: Sun Nov 26 01:07:37 2006
New Revision: 479315
URL: http://svn.apache.org/viewvc?view=rev&rev=479315
Log:
force stable versions of plugins in test poms, to avoid downloading of
snapshots during tests
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-02/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-03/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-04/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-12/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/pom.xml
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java?view=diff&rev=479315&r1=479314&r2=479315
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java
Sun Nov 26 01:07:37 2006
@@ -118,6 +118,8 @@
}
}
+
+ System.setProperty( "MAVEN_TERMINATE_CMD", "on" );
synchronized ( AbstractEclipsePluginTestCase.class )
{
@@ -276,6 +278,8 @@
}
InvocationRequest request = buildTool.createBasicInvocationRequest(
pom, properties, goals, buildLog );
+ request.setUpdateSnapshots( false );
+ request.setShowErrors( true );
request.setDebug( true );
@@ -370,6 +374,12 @@
throws IOException
{
List expectedLines = getLines( mavenRepo, expectedFile );
+
+ if ( !actualFile.exists() )
+ {
+ throw new AssertionFailedError( "Expected file not found: " +
actualFile.getAbsolutePath() );
+ }
+
List actualLines = getLines( mavenRepo, actualFile );
String filename = actualFile.getName();
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java?view=diff&rev=479315&r1=479314&r2=479315
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
Sun Nov 26 01:07:37 2006
@@ -120,7 +120,8 @@
// new Properties(), basedir );
// jar muss reincoliert sein
- assertTrue( new File( basedir, "project-rad-1/maven-core-98.0.jar"
).exists() );
+ assertTrue( "Expected file not found:
project-rad-1/maven-core-98.0.jar",
+ new File( basedir, "project-rad-1/maven-core-98.0.jar"
).exists() );
Xpp3Dom applicationXml = Xpp3DomBuilder
.build( new FileReader( new File( basedir,
"project-rad-1/META-INF/application.xml" ) ) );
@@ -195,7 +196,8 @@
// "org.apache.maven.plugins:maven-eclipse-plugin:current:rad"
} ), eventMonitor, new ConsoleDownloadMonitor(),
// new Properties(), basedir );
- assertTrue( new File( basedir, "project-rad-1/maven-core-98.0.jar"
).exists() );
+ assertTrue( "Expected file not found:
project-rad-1/maven-core-98.0.jar",
+ new File( basedir, "project-rad-1/maven-core-98.0.jar"
).exists() );
File modulemaps = new File( basedir,
"project-rad-1/META-INF/.modulemaps" );
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-02/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-02/pom.xml?view=diff&rev=479315&r1=479314&r2=479315
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-02/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-02/pom.xml
Sun Nov 26 01:07:37 2006
@@ -18,6 +18,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
<configuration>
<target>1.4</target>
</configuration>
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-03/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-03/pom.xml?view=diff&rev=479315&r1=479314&r2=479315
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-03/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-03/pom.xml
Sun Nov 26 01:07:37 2006
@@ -48,6 +48,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-04/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-04/pom.xml?view=diff&rev=479315&r1=479314&r2=479315
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-04/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-04/pom.xml
Sun Nov 26 01:07:37 2006
@@ -25,6 +25,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
<configuration>
<target>1.4</target>
</configuration>
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/pom.xml?view=diff&rev=479315&r1=479314&r2=479315
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-05/pom.xml
Sun Nov 26 01:07:37 2006
@@ -19,6 +19,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
<configuration>
<source>1.4</source>
<target>1.4</target>
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/pom.xml?view=diff&rev=479315&r1=479314&r2=479315
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/pom.xml
Sun Nov 26 01:07:37 2006
@@ -18,6 +18,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
<configuration>
<target>1.4</target>
</configuration>
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-12/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-12/pom.xml?view=diff&rev=479315&r1=479314&r2=479315
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-12/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-12/pom.xml
Sun Nov 26 01:07:37 2006
@@ -10,6 +10,11 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>test</version>
<configuration>
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/pom.xml?view=diff&rev=479315&r1=479314&r2=479315
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-2/pom.xml
Sun Nov 26 01:07:37 2006
@@ -19,6 +19,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
<configuration>
<source>1.4</source>
<target>1.4</target>
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/pom.xml?view=diff&rev=479315&r1=479314&r2=479315
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/pom.xml
Sun Nov 26 01:07:37 2006
@@ -1,15 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <groupId>eclipse.test</groupId>
- <artifactId>project-rad-5</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>pom</packaging>
- <modules>
- <module>project-rad-1</module>
- <module>project-rad-2</module>
- <module>project-rad-3</module>
- </modules>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>eclipse.test</groupId>
+ <artifactId>project-rad-5</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>project-rad-1</module>
+ <module>project-rad-2</module>
+ <module>project-rad-3</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-5</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-ear-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ </plugins>
+ </build>
</project>
