Repository: maven-integration-testing Updated Branches: refs/heads/master 967a3af9a -> d58940e5e
Rename as previous ITs have been named 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/637d7ad4 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/637d7ad4 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/637d7ad4 Branch: refs/heads/master Commit: 637d7ad4a01ffa91117ae9d1946ba970fdd8f9e6 Parents: 967a3af Author: Jason van Zyl <ja...@tesla.io> Authored: Thu May 29 13:51:50 2014 -0400 Committer: Jason van Zyl <ja...@tesla.io> Committed: Tue Jun 10 07:16:25 2014 -0400 ---------------------------------------------------------------------- ...enITmng5608ProfileActivationWarningTest.java | 2 +- .../mng-5608-profile-activation-warning/pom.xml | 131 +++++++++++++++++++ .../src/test/resources/mng-5608/pom.xml | 131 ------------------- 3 files changed, 132 insertions(+), 132 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/637d7ad4/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 f80dae3..4cf3c10 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 @@ -43,7 +43,7 @@ public class MavenITmng5608ProfileActivationWarningTest public void testitMNG5608() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5608" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5608-profile-activation-warning" ); Verifier verifier = newVerifier( testDir.getAbsolutePath() ); verifier.executeGoal( "validate" ); http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/637d7ad4/core-it-suite/src/test/resources/mng-5608-profile-activation-warning/pom.xml ---------------------------------------------------------------------- diff --git a/core-it-suite/src/test/resources/mng-5608-profile-activation-warning/pom.xml b/core-it-suite/src/test/resources/mng-5608-profile-activation-warning/pom.xml new file mode 100644 index 0000000..29a2ee6 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5608-profile-activation-warning/pom.xml @@ -0,0 +1,131 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.maven.its.mng5608</groupId> + <artifactId>profile-test</artifactId> + <version>1</version> + <packaging>pom</packaging> + + <name>MNG-5608 - Profile activation warning test when file specification contains ${project.basedir}</name> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.its.plugins</groupId> + <artifactId>maven-it-plugin-touch</artifactId> + <version>2.1-SNAPSHOT</version> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>touch</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + <!-- ${project.basedir} not supported for profile activation --> + <profile> + <id>mng-5608-exists-project.basedir</id> + <activation> + <file> + <exists>${project.basedir}/pom.xml</exists> + </file> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.its.plugins</groupId> + <artifactId>maven-it-plugin-touch</artifactId> + <configuration> + <fail>true</fail><!-- this profile should not be activated --> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>mng-5608-missing-project.basedir</id> + <activation> + <file> + <missing>${project.basedir}/pom.xml</missing> + </file> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.its.plugins</groupId> + <artifactId>maven-it-plugin-touch</artifactId> + <configuration> + <pluginItem>mng-5608-missing-project.basedir</pluginItem> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- for reference: ${basedir} supported for profile activation, see MNG-2363 --> + <profile> + <id>exists-basedir</id> + <activation> + <file> + <exists>${basedir}/pom.xml</exists> + </file> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.its.plugins</groupId> + <artifactId>maven-it-plugin-touch</artifactId> + <configuration> + <goalItem>exists-basedir</goalItem> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>missing-basedir</id> + <activation> + <file> + <missing>${basedir}/pom.xml</missing> + </file> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.its.plugins</groupId> + <artifactId>maven-it-plugin-touch</artifactId> + <configuration> + <fail>true</fail><!-- this profile should not be activated --> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/637d7ad4/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 deleted file mode 100644 index 29a2ee6..0000000 --- a/core-it-suite/src/test/resources/mng-5608/pom.xml +++ /dev/null @@ -1,131 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.maven.its.mng5608</groupId> - <artifactId>profile-test</artifactId> - <version>1</version> - <packaging>pom</packaging> - - <name>MNG-5608 - Profile activation warning test when file specification contains ${project.basedir}</name> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.its.plugins</groupId> - <artifactId>maven-it-plugin-touch</artifactId> - <version>2.1-SNAPSHOT</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>touch</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> - <!-- ${project.basedir} not supported for profile activation --> - <profile> - <id>mng-5608-exists-project.basedir</id> - <activation> - <file> - <exists>${project.basedir}/pom.xml</exists> - </file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.its.plugins</groupId> - <artifactId>maven-it-plugin-touch</artifactId> - <configuration> - <fail>true</fail><!-- this profile should not be activated --> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>mng-5608-missing-project.basedir</id> - <activation> - <file> - <missing>${project.basedir}/pom.xml</missing> - </file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.its.plugins</groupId> - <artifactId>maven-it-plugin-touch</artifactId> - <configuration> - <pluginItem>mng-5608-missing-project.basedir</pluginItem> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- for reference: ${basedir} supported for profile activation, see MNG-2363 --> - <profile> - <id>exists-basedir</id> - <activation> - <file> - <exists>${basedir}/pom.xml</exists> - </file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.its.plugins</groupId> - <artifactId>maven-it-plugin-touch</artifactId> - <configuration> - <goalItem>exists-basedir</goalItem> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>missing-basedir</id> - <activation> - <file> - <missing>${basedir}/pom.xml</missing> - </file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.its.plugins</groupId> - <artifactId>maven-it-plugin-touch</artifactId> - <configuration> - <fail>true</fail><!-- this profile should not be activated --> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project>
