Copied: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProfilePropertiesProcessor.java (from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProfilePropertiesProcessor.java?p2=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProfilePropertiesProcessor.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java&r1=764415&r2=764568&rev=764568&view=diff ============================================================================== --- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java (original) +++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProfilePropertiesProcessor.java Mon Apr 13 19:14:44 2009 @@ -1,4 +1,4 @@ -package org.apache.maven.project.processor; +package org.apache.maven.project.builder; import java.util.Properties;
Propchange: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProfilePropertiesProcessor.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Apr 13 19:14:44 2009 @@ -0,0 +1,7 @@ +/maven/components/branches/MNG-3932-1/maven-project/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java:746145-746157 +/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java:680477 +/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631 +/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java:739385,741841,747468,748815,749612 +/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java:738973-739966 +/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java:738757-738972 +/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProfilePropertiesProcessor.java:688587-696625,696644-699681 Copied: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProfilesModuleProcessor.java (from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProfilesModuleProcessor.java?p2=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProfilesModuleProcessor.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java&r1=764415&r2=764568&rev=764568&view=diff ============================================================================== --- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java (original) +++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProfilesModuleProcessor.java Mon Apr 13 19:14:44 2009 @@ -1,4 +1,4 @@ - package org.apache.maven.project.processor; + package org.apache.maven.project.builder; /* * Licensed to the Apache Software Foundation (ASF) under one Propchange: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProfilesModuleProcessor.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProfilesModuleProcessor.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Apr 13 19:14:44 2009 @@ -0,0 +1,7 @@ +/maven/components/branches/MNG-3932-1/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java:746145-746157 +/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java:680477 +/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631 +/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java:739385,741841,747468,748815,749612 +/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java:738973-739966 +/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java:738757-738972 +/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesModuleProcessor.java:688587-696625,696644-699681 Copied: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProfilesProcessor.java (from r764415, maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProfilesProcessor.java?p2=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProfilesProcessor.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java&r1=764415&r2=764568&rev=764568&view=diff ============================================================================== --- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java (original) +++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProfilesProcessor.java Mon Apr 13 19:14:44 2009 @@ -1,4 +1,4 @@ -package org.apache.maven.project.processor; +package org.apache.maven.project.builder; /* * Licensed to the Apache Software Foundation (ASF) under one Propchange: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProfilesProcessor.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProfilesProcessor.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Apr 13 19:14:44 2009 @@ -0,0 +1,7 @@ +/maven/components/branches/MNG-3932-1/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java:746145-746157 +/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java:680477 +/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631 +/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java:739385,741841,747468,748815,749612 +/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java:738973-739966 +/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java:738757-738972 +/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProfilesProcessor.java:688587-696625,696644-699681
