Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/profile-injected-dependencies/ ------------------------------------------------------------------------------ bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/profile-injected-dependencies/ ------------------------------------------------------------------------------ bugtraq:message = Issue id: %BUGID% Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/profile-injected-dependencies/ ------------------------------------------------------------------------------ bugtraq:number = false Propchange: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/profile-injected-dependencies/ ------------------------------------------------------------------------------ bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Added: maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/profile-injected-dependencies/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/profile-injected-dependencies/pom.xml?rev=743240&view=auto ============================================================================== --- maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/profile-injected-dependencies/pom.xml (added) +++ maven/components/branches/MNG-3932/maven-project/src/test/resources-project-builder/profile-injected-dependencies/pom.xml Wed Feb 11 05:49:07 2009 @@ -0,0 +1,75 @@ +<?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.mng1412</groupId> + <artifactId>test</artifactId> + <version>0.1-SNAPSHOT</version> + + <name>Maven Integration Test :: MNG-1412</name> + <description> + Check that dependencies are available in classpath in same order as declared in POM. + </description> + + <dependencies> + <!-- model dependencies first, in the order given --> + <dependency> + <groupId>org.apache.maven.its.mng1412</groupId> + <artifactId>a</artifactId> + <version>0.1</version> + </dependency> + <dependency> + <groupId>org.apache.maven.its.mng1412</groupId> + <artifactId>c</artifactId> + <version>0.1</version> + </dependency> + <dependency> + <groupId>org.apache.maven.its.mng1412</groupId> + <artifactId>b</artifactId> + <version>0.1</version> + </dependency> + </dependencies> + + <profiles> + <profile> + <id>mng-1412</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <!-- profile dependencies last, in the order given --> + <dependencies> + <dependency> + <!-- deliberately respecifying this dep to check merging behavior --> + <groupId>org.apache.maven.its.mng1412</groupId> + <artifactId>a</artifactId> + <version>0.1</version> + </dependency> + <dependency> + <groupId>org.apache.maven.its.mng1412</groupId> + <artifactId>d</artifactId> + <version>0.1</version> + </dependency> + </dependencies> + </profile> + </profiles> +</project> Modified: maven/components/branches/MNG-3932/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/pom.xml?rev=743240&r1=743239&r2=743240&view=diff ============================================================================== --- maven/components/branches/MNG-3932/pom.xml (original) +++ maven/components/branches/MNG-3932/pom.xml Wed Feb 11 05:49:07 2009 @@ -48,17 +48,17 @@ <doxiaVersion>1.0-alpha-9</doxiaVersion> <easyMockVersion>1.2_Java1.3</easyMockVersion> <junitVersion>3.8.1</junitVersion> - <plexusVersion>1.0-beta-3.0.5</plexusVersion> + <plexusVersion>1.0-beta-3.0.6</plexusVersion> <plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion> <plexusInterpolationVersion>1.1</plexusInterpolationVersion> <plexusPluginManagerVersion>1.0-alpha-1</plexusPluginManagerVersion> - <plexusUtilsVersion>1.5.6</plexusUtilsVersion> + <plexusUtilsVersion>1.5.8</plexusUtilsVersion> <wagonVersion>1.0-beta-4</wagonVersion> <modelBuilderVersion>1.3</modelBuilderVersion> <mercuryVersion>1.0.0-alpha-2</mercuryVersion> <mercuryMp3Version>1.0-alpha-1</mercuryMp3Version> <woodstoxVersion>3.2.6</woodstoxVersion> - <modelloVersion>1.0-alpha-22</modelloVersion> + <modelloVersion>1.0.1-SNAPSHOT</modelloVersion> <jxpathVersion>1.3</jxpathVersion> </properties> <issueManagement> @@ -218,6 +218,11 @@ <artifactId>maven-assembly-plugin</artifactId> <version>2.2-beta-2</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.4-SNAPSHOT</version> + </plugin> </plugins> </pluginManagement> </build> @@ -406,11 +411,11 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>commons-jxpath</groupId> - <artifactId>commons-jxpath</artifactId> + <dependency> + <groupId>commons-jxpath</groupId> + <artifactId>commons-jxpath</artifactId> <version>${jxpathVersion}</version> - </dependency> + </dependency> <!-- Mercury --> <dependency> @@ -423,11 +428,11 @@ <artifactId>mercury-external</artifactId> <version>${mercuryVersion}</version> </dependency> - <dependency> - <groupId>org.sonatype.mercury</groupId> - <artifactId>mercury-mp3-cli</artifactId> + <dependency> + <groupId>org.sonatype.mercury</groupId> + <artifactId>mercury-mp3-cli</artifactId> <version>${mercuryMp3Version}</version> - </dependency> + </dependency> <!-- Mercury test dependencies --> <dependency>