Author: olamy
Date: Tue Apr 17 21:03:34 2012
New Revision: 1327279
URL: http://svn.apache.org/viewvc?rev=1327279&view=rev
Log:
oups missed to add
Added:
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-inherit/
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-inherit/pom.xml
(with props)
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-inherit/src/
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-inherit/src/it/
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-inherit/src/it/project/
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-inherit/src/it/project/pom.xml
(with props)
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/pom.xml
(with props)
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/src/
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/src/it/
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/src/it/project/
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/src/it/project/pom.xml
(with props)
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/src/it/settings.xml
(with props)
Added: maven/plugins/trunk/maven-invoker-plugin/src/it/settings-inherit/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/settings-inherit/pom.xml?rev=1327279&view=auto
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/settings-inherit/pom.xml
(added)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/settings-inherit/pom.xml
Tue Apr 17 21:03:34 2012
@@ -0,0 +1,58 @@
+<?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/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.invoker</groupId>
+ <artifactId>settings-inherit</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <description>Test to check that the settings.xml from the calling process is
inherited.</description>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <cloneClean>true</cloneClean>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-inherit/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-inherit/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-inherit/src/it/project/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/settings-inherit/src/it/project/pom.xml?rev=1327279&view=auto
==============================================================================
---
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-inherit/src/it/project/pom.xml
(added)
+++
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-inherit/src/it/project/pom.xml
Tue Apr 17 21:03:34 2012
@@ -0,0 +1,60 @@
+<?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/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>project</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0.1</version>
+ <executions>
+ <execution>
+ <id>enforce-property</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>it.settings-inherit</property>
+ <message>Property not present - settings.xml from calling
process not inherited!</message>
+ <regex>(exists)$</regex>
+ </requireProperty>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-inherit/src/it/project/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-inherit/src/it/project/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/pom.xml?rev=1327279&view=auto
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/pom.xml
(added)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/pom.xml Tue
Apr 17 21:03:34 2012
@@ -0,0 +1,60 @@
+<?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/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.invoker</groupId>
+ <artifactId>settings-merge</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <description>Test to check that the settings.xml from the calling process is
merged with the
+ one specified for m-invoker-p.</description>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <cloneClean>true</cloneClean>
+ <settingsFile>src/it/settings.xml</settingsFile>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/src/it/project/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/src/it/project/pom.xml?rev=1327279&view=auto
==============================================================================
---
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/src/it/project/pom.xml
(added)
+++
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/src/it/project/pom.xml
Tue Apr 17 21:03:34 2012
@@ -0,0 +1,87 @@
+<?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/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>project</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0.1</version>
+ <executions>
+ <execution>
+ <id>verify-properties</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>it.settings-merge.1</property>
+ <message>Property not present - settings.xml from calling
process not merged!</message>
+ <regex>(exists)$</regex>
+ </requireProperty>
+ <requireProperty>
+ <property>it.settings-merge.2</property>
+ <message>Property not present - specified settings.xml not
merged!</message>
+ <regex>(exists)$</regex>
+ </requireProperty>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>verify-server</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ def server = settings.servers.find{
it.id.equals('dummy-it-settings-merge') }
+ if( !server.password.equals('overridden') )
+ throw new
org.apache.maven.plugin.MojoExecutionException("Incorrect server password -
specified settings.xml not merged/dominant")
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/src/it/project/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/src/it/project/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/src/it/settings.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/src/it/settings.xml?rev=1327279&view=auto
==============================================================================
---
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/src/it/settings.xml
(added)
+++
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/src/it/settings.xml
Tue Apr 17 21:03:34 2012
@@ -0,0 +1,42 @@
+<?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.
+-->
+
+<settings>
+ <servers>
+ <server>
+ <id>dummy-it-settings-merge</id>
+ <username>user</username>
+ <password>overridden</password>
+ </server>
+ </servers>
+
+ <profiles>
+ <profile>
+ <id>it-properties</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <it.settings-merge.2>exists</it.settings-merge.2>
+ </properties>
+ </profile>
+ </profiles>
+</settings>
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/src/it/settings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-invoker-plugin/src/it/settings-merge/src/it/settings.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
