You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/02/01 15:59:40 UTC
svn commit: r739771 [9/10] - in /maven/components/branches/MNG-3932: ./
apache-maven/ apache-maven/src/ apache-maven/src/.cd/ apache-maven/src/bin/
apache-maven/src/conf/ apache-maven/src/main/
apache-maven/src/main/assembly/ apache-maven/src/site/ apa...
Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/pom.xml Sun Feb 1 14:59:32 2009
@@ -0,0 +1,56 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng3916</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1</version>
+ <packaging>pom</packaging>
+
+ <name>Maven Integration Test :: MNG-3943</name>
+ <description>
+ Test that plugin executions are properly merged during inheritance, even if the child uses a different
+ plugin version than the parent.
+ </description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-a</artifactId>
+ <!-- NOTE: Use different version than child -->
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>parent-1</id>
+ <phase>parent-1</phase>
+ </execution>
+ <execution>
+ <id>parent-2</id>
+ <phase>parent-2</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-version-insensitive/sub/pom.xml Sun Feb 1 14:59:32 2009
@@ -0,0 +1,59 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.mng3916</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1</version>
+ </parent>
+
+ <artifactId>child</artifactId>
+
+ <name>Maven Integration Test :: MNG-3943</name>
+ <description>
+ Test that plugin executions are properly merged during inheritance, even if the child uses a different
+ plugin version than the parent.
+ </description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-a</artifactId>
+ <!-- NOTE: Use different version than parent -->
+ <version>2.0</version>
+ <executions>
+ <execution>
+ <id>child-1</id>
+ <phase>child-1</phase>
+ </execution>
+ <execution>
+ <id>child-2</id>
+ <phase>child-2</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/pom.xml Sun Feb 1 14:59:32 2009
@@ -0,0 +1,55 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng3916</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1</version>
+ <packaging>pom</packaging>
+
+ <name>Maven Integration Test :: MNG-3916</name>
+ <description>
+ Test that plugin executions are properly merged during inheritance, even if the child plugin section has no
+ version.
+ </description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-a</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>parent-1</id>
+ <phase>parent-1</phase>
+ </execution>
+ <execution>
+ <id>parent-2</id>
+ <phase>parent-2</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging-wo-version/sub/pom.xml Sun Feb 1 14:59:32 2009
@@ -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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.mng3916</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1</version>
+ </parent>
+
+ <artifactId>child</artifactId>
+
+ <name>Maven Integration Test :: MNG-3916</name>
+ <description>
+ Test that plugin executions are properly merged during inheritance, even if the child plugin section has no
+ version.
+ </description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-a</artifactId>
+ <!-- NOTE: <version> element deliberately omitted here -->
+ <executions>
+ <execution>
+ <id>child-1</id>
+ <phase>child-1</phase>
+ </execution>
+ <execution>
+ <id>child-2</id>
+ <phase>child-2</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/pom.xml Sun Feb 1 14:59:32 2009
@@ -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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng3938</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1</version>
+ <packaging>pom</packaging>
+
+ <name>Maven Integration Test :: MNG-3938</name>
+ <description>
+ Test that plugin executions with the same id are merged during inheritance, especially executions using the
+ default id, regardless whether the id is given explicitly by the user or implicitly assumed from defaults.
+ </description>
+
+ <build>
+ <!-- This project uses plugin management for the test plugin -->
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-a</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <!-- NOTE: Implicitly reference "default" id here, i.e. omit the <id> element -->
+ <phase>parent-default</phase>
+ </execution>
+ <execution>
+ <id>non-default</id>
+ <phase>parent-non-default</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/w-plugin-mngt/sub/pom.xml Sun Feb 1 14:59:32 2009
@@ -0,0 +1,59 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.mng3938</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1</version>
+ </parent>
+
+ <artifactId>child</artifactId>
+
+ <name>Maven Integration Test :: MNG-3938</name>
+ <description>
+ Test that plugin executions with the same id are merged during inheritance, especially executions using the
+ default id, regardless whether the id is given explicitly by the user or implicitly assumed from defaults.
+ </description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-a</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <!-- NOTE: Explicitly reference "default" id here -->
+ <id>default</id>
+ <phase>child-default</phase>
+ </execution>
+ <execution>
+ <id>non-default</id>
+ <phase>child-non-default</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/pom.xml Sun Feb 1 14:59:32 2009
@@ -0,0 +1,56 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng3938</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1</version>
+ <packaging>pom</packaging>
+
+ <name>Maven Integration Test :: MNG-3938</name>
+ <description>
+ Test that plugin executions with the same id are merged during inheritance, especially executions using the
+ default id, regardless whether the id is given explicitly by the user or implicitly assumed from defaults.
+ </description>
+
+ <build>
+ <!-- This project does not use plugin management for the test plugin -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-a</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <!-- NOTE: Implicitly reference "default" id here, i.e. omit the <id> element -->
+ <phase>parent-default</phase>
+ </execution>
+ <execution>
+ <id>non-default</id>
+ <phase>parent-non-default</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-merging/wo-plugin-mngt/sub/pom.xml Sun Feb 1 14:59:32 2009
@@ -0,0 +1,59 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.mng3938</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1</version>
+ </parent>
+
+ <artifactId>child</artifactId>
+
+ <name>Maven Integration Test :: MNG-3938</name>
+ <description>
+ Test that plugin executions with the same id are merged during inheritance, especially executions using the
+ default id, regardless whether the id is given explicitly by the user or implicitly assumed from defaults.
+ </description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-a</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <!-- NOTE: Explicitly reference "default" id here -->
+ <id>default-execution-id</id>
+ <phase>child-default</phase>
+ </execution>
+ <execution>
+ <id>non-default</id>
+ <phase>child-non-default</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/w-plugin-mngt/pom.xml Sun Feb 1 14:59:32 2009
@@ -0,0 +1,76 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng3887</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+ <packaging>pom</packaging>
+
+ <name>Maven Integration Test :: MNG-3887</name>
+ <description>
+ Test that multiple plugin executions bound to the same phase are executed in the order given by the POM.
+ </description>
+
+ <build>
+ <!-- This project uses plugin management for the test plugin -->
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-a</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-a</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>b</id>
+ <phase>validate</phase>
+ </execution>
+ <execution>
+ <id>a</id>
+ <phase>validate</phase>
+ </execution>
+ <execution>
+ <id>d</id>
+ <phase>validate</phase>
+ </execution>
+ <execution>
+ <id>c</id>
+ <phase>validate</phase>
+ </execution>
+ <execution>
+ <id>e</id>
+ <phase>validate</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-order/wo-plugin-mngt/pom.xml Sun Feb 1 14:59:32 2009
@@ -0,0 +1,67 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng3887</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+ <packaging>pom</packaging>
+
+ <name>Maven Integration Test :: MNG-3887</name>
+ <description>
+ Test that multiple plugin executions bound to the same phase are executed in the order given by the POM.
+ </description>
+
+ <build>
+ <!-- This project does not use plugin management for the test plugin -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-a</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>b</id>
+ <phase>validate</phase>
+ </execution>
+ <execution>
+ <id>a</id>
+ <phase>validate</phase>
+ </execution>
+ <execution>
+ <id>d</id>
+ <phase>validate</phase>
+ </execution>
+ <execution>
+ <id>c</id>
+ <phase>validate</phase>
+ </execution>
+ <execution>
+ <id>e</id>
+ <phase>validate</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/w-plugin-mngt/pom.xml Sun Feb 1 14:59:32 2009
@@ -0,0 +1,72 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng4000</groupId>
+ <artifactId>test2</artifactId>
+ <version>0.1</version>
+
+ <name>Maven Integration Test :: MNG-4000</name>
+ <description>
+ Test that plugin executions without id are not lost among other plugin executions.
+ </description>
+
+ <build>
+ <!-- NOTE: This test uses plugin management for the IT plugin. -->
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-log-file</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-log-file</artifactId>
+ <configuration>
+ <logFile>target/exec.log</logFile>
+ <string>exec</string>
+ </configuration>
+ <executions>
+ <execution>
+ <id>exec-1</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>log-string</goal>
+ </goals>
+ </execution>
+ <execution>
+ <!-- NOTE: <id> deliberately omitted here! -->
+ <phase>validate</phase>
+ <goals>
+ <goal>log-string</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-exec-w-and-wo-id/wo-plugin-mngt/pom.xml Sun Feb 1 14:59:32 2009
@@ -0,0 +1,64 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng4000</groupId>
+ <artifactId>test1</artifactId>
+ <version>0.1</version>
+
+ <name>Maven Integration Test :: MNG-4000</name>
+ <description>
+ Test that plugin executions without id are not lost among other plugin executions.
+ </description>
+
+ <build>
+ <!-- NOTE: This test does not use plugin management for the IT plugin. -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-log-file</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <configuration>
+ <logFile>target/exec.log</logFile>
+ <string>exec</string>
+ </configuration>
+ <executions>
+ <execution>
+ <id>exec-1</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>log-string</goal>
+ </goals>
+ </execution>
+ <execution>
+ <!-- NOTE: <id> deliberately omitted here! -->
+ <phase>validate</phase>
+ <goals>
+ <goal>log-string</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-order/nexus-parent.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-order/nexus-parent.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-order/nexus-parent.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-order/nexus-parent.xml Sun Feb 1 14:59:32 2009
@@ -0,0 +1,18 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus-parent</artifactId>
+ <version>8-SNAPSHOT</version>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>${plexus.version}</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
\ No newline at end of file
Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-order/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-order/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-order/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/plugin-order/pom.xml Sun Feb 1 14:59:32 2009
@@ -0,0 +1,27 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus-parent</artifactId>
+ <version>8-SNAPSHOT</version>
+ <relativePath>nexus-parent.xml</relativePath>
+ </parent>
+
+ <groupId>org.sonatype.nexus</groupId>
+ <artifactId>nexus-indexer</artifactId>
+ <version>1.1.3-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/single-configuration-inheritance/jetty-parent.xml Sun Feb 1 14:59:32 2009
@@ -0,0 +1,37 @@
+<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.mortbay.jetty</groupId>
+ <artifactId>jetty-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Jetty :: Administrative Parent</name>
+ <version>7</version>
+
+ <build>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <executions>
+ <execution>
+ <id>enforce-java</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[2.0.6,)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>[1.5,)</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/single-configuration-inheritance/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/single-configuration-inheritance/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/single-configuration-inheritance/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/single-configuration-inheritance/pom.xml Sun Feb 1 14:59:32 2009
@@ -0,0 +1,41 @@
+<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>
+ <parent>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-parent</artifactId>
+ <version>7</version>
+ <relativePath>jetty-parent.xml</relativePath>
+ </parent>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>project</artifactId>
+ <packaging>pom</packaging>
+ <name>Jetty Server Project</name>
+ <version>6.1.12</version>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-java</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>2.0.6</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>[1.4,)</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/child/pom.xml Sun Feb 1 14:59:32 2009
@@ -0,0 +1,104 @@
+<?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>
+
+ <parent>
+ <groupId>org.apache.maven.its.mng3831</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <groupId>org.apache.maven.its.mng3831.child</groupId>
+ <artifactId>child</artifactId>
+ <version>2.0-alpha-1</version>
+ <packaging>jar</packaging>
+
+ <name>child-name</name>
+ <description>child-desc</description>
+ <url>http://child.org/</url>
+ <inceptionYear>2008</inceptionYear>
+ <organization>
+ <name>child-org-name</name>
+ </organization>
+
+ <prerequisites>
+ <maven>2.0.0</maven>
+ </prerequisites>
+
+ <scm>
+ <url>http://scm.org/</url>
+ </scm>
+ <issueManagement>
+ <url>http://issue.org/</url>
+ </issueManagement>
+ <ciManagement>
+ <url>http://ci.org/</url>
+ </ciManagement>
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <name>child-dist-repo</name>
+ <url>http://dist.org/</url>
+ </repository>
+ <site>
+ <id>maven-core-it</id>
+ <name>child-site</name>
+ <url>http://site.org/</url>
+ </site>
+ </distributionManagement>
+
+ <properties>
+ <!-- this is where we collect all the interpolated values for the POM dump -->
+ <projectDir>${basedir}</projectDir>
+ <projectGroupId>${groupId}</projectGroupId>
+ <projectArtifactId>${artifactId}</projectArtifactId>
+ <projectVersion>${version}</projectVersion>
+ <projectPackaging>${packaging}</projectPackaging>
+ <projectName>${name}</projectName>
+ <projectDesc>${description}</projectDesc>
+ <projectUrl>${url}</projectUrl>
+ <projectYear>${inceptionYear}</projectYear>
+ <projectOrgName>${organization.name}</projectOrgName>
+ <projectPrereqMvn>${prerequisites.maven}</projectPrereqMvn>
+ <projectScmUrl>${scm.url}</projectScmUrl>
+ <projectIssueUrl>${issueManagement.url}</projectIssueUrl>
+ <projectCiUrl>${ciManagement.url}</projectCiUrl>
+ <projectDistRepoName>${distributionManagement.repository.name}</projectDistRepoName>
+ <projectDistRepoUrl>${distributionManagement.repository.url}</projectDistRepoUrl>
+ <projectDistSiteUrl>${distributionManagement.site.url}</projectDistSiteUrl>
+ <projectBuildOut>${build.outputDirectory}</projectBuildOut>
+ <projectSiteOut>${reporting.outputDirectory}</projectSiteOut>
+ <parentGroupId>${parent.groupId}</parentGroupId>
+ <parentArtifactId>${parent.artifactId}</parentArtifactId>
+ <parentVersion>${parent.version}</parentVersion>
+ </properties>
+
+ <build>
+ <outputDirectory>target/bin</outputDirectory>
+ </build>
+
+ <reporting>
+ <outputDirectory>target/doc</outputDirectory>
+ </reporting>
+
+</project>
Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/unprefixed-expression-interpolation/pom.xml Sun Feb 1 14:59:32 2009
@@ -0,0 +1,36 @@
+<?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.its.mng3831</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+
+ <name>Maven Integration Test :: MNG-3831</name>
+ <description>Test POM interpolation with expressions of the form $ { * } (ugly but real)</description>
+
+ <modules>
+ <module>parent/child</module>
+ </modules>
+</project>
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/url-inheritance/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/url-inheritance/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/url-inheritance/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/url-inheritance/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/url-inheritance/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/url-inheritance/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/url-inheritance/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/url-inheritance/pom.xml Sun Feb 1 14:59:32 2009
@@ -0,0 +1,74 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.mng3846</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1</version>
+ <packaging>pom</packaging>
+
+ <name>Maven Integration Test :: MNG-3846</name>
+ <description>
+ Test that inheritance of certain URLs automatically appends the child's artifact id.
+ </description>
+
+ <url>http://parent.url/</url>
+ <organization>
+ <name>parent-org</name>
+ <url>http://parent.url/org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>parent-license</name>
+ <url>http://parent.url/license.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <scm>
+ <url>http://parent.url/viewvc</url>
+ <connection>http://parent.url/scm</connection>
+ <developerConnection>https://parent.url/scm</developerConnection>
+ </scm>
+ <issueManagement>
+ <url>http://parent.url/issues</url>
+ </issueManagement>
+ <ciManagement>
+ <url>http://parent.url/ci</url>
+ </ciManagement>
+ <distributionManagement>
+ <repository>
+ <url>http://parent.url/dist</url>
+ <id>parent.distros</id>
+ </repository>
+ <snapshotRepository>
+ <url>http://parent.url/snaps</url>
+ <id>parent.snaps</id>
+ </snapshotRepository>
+ <site>
+ <url>http://parent.url/site</url>
+ <id>parent.site</id>
+ </site>
+ <downloadUrl>http://parent.url/download</downloadUrl>
+ </distributionManagement>
+</project>
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/url-inheritance/sub/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/url-inheritance/sub/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/url-inheritance/sub/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/url-inheritance/sub/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/url-inheritance/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/url-inheritance/sub/pom.xml?rev=739771&view=auto
==============================================================================
--- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/url-inheritance/sub/pom.xml (added)
+++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/url-inheritance/sub/pom.xml Sun Feb 1 14:59:32 2009
@@ -0,0 +1,35 @@
+<?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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- NOTE: The base directory name of this project deliberately does not match its artifact id! -->
+
+ <parent>
+ <groupId>org.apache.maven.its.mng3846</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1</version>
+ </parent>
+
+ <artifactId>child</artifactId>
+ <name>Child Project</name>
+</project>
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/xml-coalesce-text/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/xml-coalesce-text/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/xml-coalesce-text/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/xml-coalesce-text/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%