You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/06/01 00:20:19 UTC
git commit: improved IT to success if settings defines additional
properties
Repository: maven-integration-testing
Updated Branches:
refs/heads/master b0a7273cf -> 67974fe93
improved IT to success if settings defines additional properties
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/67974fe9
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/67974fe9
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/67974fe9
Branch: refs/heads/master
Commit: 67974fe93741d3442ba50afabacfd64cea811edd
Parents: b0a7273
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sun Jun 1 00:20:13 2014 +0200
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sun Jun 1 00:20:13 2014 +0200
----------------------------------------------------------------------
...enITmng5608ProfileActivationWarningTest.java | 1 -
.../src/test/resources/mng-5608/pom.xml | 30 ++++++++++++++++----
2 files changed, 24 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/67974fe9/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java
index a98f659..410ee41 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5608ProfileActivationWarningTest.java
@@ -52,7 +52,6 @@ public class MavenITmng5608ProfileActivationWarningTest
// check expected profiles activated, just for sanity
Properties props = verifier.loadProperties( "target/project.properties" );
- assertEquals( "expected 2 active profiles", 2, props.size() );
assertEquals( "expected profile exists-basedir", "expected active profile",
props.getProperty( "exists-basedir" ) );
assertEquals( "expected profile mng-5608-missing-project.basedir", "expected active profile",
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/67974fe9/core-it-suite/src/test/resources/mng-5608/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/resources/mng-5608/pom.xml b/core-it-suite/src/test/resources/mng-5608/pom.xml
index dbd836f..e1d8717 100644
--- a/core-it-suite/src/test/resources/mng-5608/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5608/pom.xml
@@ -56,9 +56,18 @@ under the License.
<exists>${project.basedir}/pom.xml</exists>
</file>
</activation>
- <properties>
- <mng-5608-exists-project.basedir>unexpected active profile</mng-5608-exists-project.basedir>
- </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-touch</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <configuration>
+ <fail>true</fail><!-- this profile should not be activated -->
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<id>mng-5608-missing-project.basedir</id>
@@ -91,9 +100,18 @@ under the License.
<missing>${basedir}/pom.xml</missing>
</file>
</activation>
- <properties>
- <missing-basedir>unexpected active profile</missing-basedir>
- </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-touch</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <configuration>
+ <fail>true</fail><!-- this profile should not be activated -->
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
</project>