maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject git commit: 3 ITs are now ok with maven-reporting-exec 1.1 used by maven-site-plugin 3.2
Date Fri, 19 Apr 2013 12:03:39 GMT
Updated Branches:
  refs/heads/master 3f94086b3 -> dcaaf42a6


3 ITs are now ok with maven-reporting-exec 1.1 used by maven-site-plugin
3.2

Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/dcaaf42a
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/dcaaf42a
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/dcaaf42a

Branch: refs/heads/master
Commit: dcaaf42a6fdbf7eb56445a1fa8c9f0e31afc6932
Parents: 3f94086
Author: Hervé Boutemy <hboutemy@apache.org>
Authored: Fri Apr 19 14:03:36 2013 +0200
Committer: Hervé Boutemy <hboutemy@apache.org>
Committed: Fri Apr 19 14:03:36 2013 +0200

----------------------------------------------------------------------
 .../org/apache/maven/it/IntegrationTestSuite.java  |    9 +++++----
 ...avenITmng3372DirectInvocationOfPluginsTest.java |    2 +-
 .../it/MavenITmng3684BuildPluginParameterTest.java |    2 +-
 ...g3703ExecutionProjectWithRelativePathsTest.java |    2 +-
 .../src/test/resources/mng-3684/project/pom.xml    |   15 +++++++++++++++
 .../src/test/resources/mng-3703/project/pom.xml    |   15 +++++++++++++++
 .../src/test/resources/mng-3743/project/pom.xml    |   11 +++++++++++
 7 files changed, 49 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dcaaf42a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index 6db7ff8..d7e25d3 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -109,13 +109,14 @@ public class IntegrationTestSuite
         //suite.addTestSuite( MavenITmng5208EventSpyParallelTest.class );
         
         
+        // -------------------------------------------------------------------------------------------------------------
         // These do not work as a result of the Eclipse Aether change. They are directly
using the Site and Dependency plugins
-        // 
-        //MavenITmng3743ForkWithPluginManagementTest>AbstractMavenIntegrationTestCase.runTest:220->testitMNG3743:58
» Verification
-        //MavenITmng3703ExecutionProjectWithRelativePathsTest>AbstractMavenIntegrationTestCase.runTest:220->testForkFromReport:86
» Verification
-        //MavenITmng3684BuildPluginParameterTest>AbstractMavenIntegrationTestCase.runTest:220->testitMNG3684:63
» Verification
+        // -------------------------------------------------------------------------------------------------------------
         //MavenITmng3372DirectInvocationOfPluginsTest>AbstractMavenIntegrationTestCase.runTest:220->testDependencyTreeInvocation:83
» Verification
+        //suite.addTestSuite( MavenITmng3372DirectInvocationOfPluginsTest.class ); dependency:tree
requires maven-dependency-tree 2.1
         //MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest>AbstractMavenIntegrationTestCase.runTest:220->testit:56
? Verification
+        //suite.addTestSuite( MavenITmng5019StringBasedCompLookupFromChildPluginRealmTest.class
);
+
         suite.addTestSuite( MavenITmng5445LegacyStringSearchModelInterpolatorTest.class );
         suite.addTestSuite( MavenITmng5387ArtifactReplacementPlugin.class );
         suite.addTestSuite( MavenITmng5382Jsr330Plugin.class );

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dcaaf42a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
index 9693ae3..14e076f 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
@@ -36,7 +36,7 @@ public class MavenITmng3372DirectInvocationOfPluginsTest
 
     public MavenITmng3372DirectInvocationOfPluginsTest()
     {
-        super( "(2.0.5,3.1-SNAPSHOT)" );
+        super( "(2.0.5,)" );
     }
 
     public void testitMNG3372()

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dcaaf42a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
index 35b7ee1..43fc78d 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java
@@ -36,7 +36,7 @@ public class MavenITmng3684BuildPluginParameterTest
 {
     public MavenITmng3684BuildPluginParameterTest()
     {
-        super( "(2.0.9,3.1-SNAPSHOT)" );
+        super( "(2.0.9,)" );
     }
     
     public void testitMNG3684 ()

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dcaaf42a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
index b0c4433..356310c 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
@@ -36,7 +36,7 @@ public class MavenITmng3703ExecutionProjectWithRelativePathsTest
 {
     public MavenITmng3703ExecutionProjectWithRelativePathsTest()
     {
-        super( "[2.1.0-M1,3.1-SNAPSHOT)" ); // only test in 2.1.0+
+        super( "[2.1.0-M1,)" ); // only test in 2.1.0+
     }
 
     public void testForkFromMojo()

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dcaaf42a/core-it-suite/src/test/resources/mng-3684/project/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-3684/project/pom.xml b/core-it-suite/src/test/resources/mng-3684/project/pom.xml
index 06aba49..c92f003 100644
--- a/core-it-suite/src/test/resources/mng-3684/project/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3684/project/pom.xml
@@ -7,6 +7,21 @@
   <version>1</version>
   
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.2</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.reporting</groupId>
+              <artifactId>maven-reporting-exec</artifactId>
+              <version>1.1</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.its.mng3684</groupId>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dcaaf42a/core-it-suite/src/test/resources/mng-3703/project/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-3703/project/pom.xml b/core-it-suite/src/test/resources/mng-3703/project/pom.xml
index 04424a5..ad090a9 100644
--- a/core-it-suite/src/test/resources/mng-3703/project/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3703/project/pom.xml
@@ -15,6 +15,21 @@
   </dependencies>
   
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.2</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.reporting</groupId>
+              <artifactId>maven-reporting-exec</artifactId>
+              <version>1.1</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.its.mng3703</groupId>

http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/dcaaf42a/core-it-suite/src/test/resources/mng-3743/project/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-3743/project/pom.xml b/core-it-suite/src/test/resources/mng-3743/project/pom.xml
index d934ec6..a53eb08 100644
--- a/core-it-suite/src/test/resources/mng-3743/project/pom.xml
+++ b/core-it-suite/src/test/resources/mng-3743/project/pom.xml
@@ -24,6 +24,17 @@
     <pluginManagement>
       <plugins>
         <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.2</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.reporting</groupId>
+              <artifactId>maven-reporting-exec</artifactId>
+              <version>1.1</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+        <plugin>
           <groupId>org.apache.maven.its.mng3743</groupId>
           <artifactId>mavenit-mng3743-check-plugin</artifactId>
           <configuration>


Mime
View raw message