Modified: maven/components/branches/maven-2.0.x/maven-reporting/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-reporting/pom.xml?rev=420168&r1=420167&r2=420168&view=diff ============================================================================== --- maven/components/branches/maven-2.0.x/maven-reporting/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-reporting/pom.xml Sat Jul 8 10:06:02 2006 @@ -1,4 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?><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";> +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ Copyright 2005-2006 The Apache Software Foundation. + ~ + ~ Licensed 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";> <parent> <artifactId>maven</artifactId> <groupId>org.apache.maven</groupId> @@ -9,9 +28,9 @@ <artifactId>maven-reporting</artifactId> <packaging>pom</packaging> <name>Maven Reporting</name> - <version>2.0.5-SNAPSHOT</version> + <inceptionYear>2005</inceptionYear> <modules> <module>maven-reporting-api</module> <module>maven-reporting-impl</module> </modules> -</project> \ No newline at end of file +</project>
Modified: maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml?rev=420168&r1=420167&r2=420168&view=diff ============================================================================== --- maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml Sat Jul 8 10:06:02 2006 @@ -1,14 +1,31 @@ -<?xml version="1.0" encoding="UTF-8"?><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";> +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ Copyright 2005-2006 The Apache Software Foundation. + ~ + ~ Licensed 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";> <parent> <artifactId>maven</artifactId> <groupId>org.apache.maven</groupId> <version>2.0.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.maven</groupId> <artifactId>maven-repository-metadata</artifactId> <name>Maven Repository Metadata Model</name> - <version>2.0.5-SNAPSHOT</version> <description>Maven Plugin Mapping</description> <build> <plugins> Modified: maven/components/branches/maven-2.0.x/maven-repository-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-repository-tools/pom.xml?rev=420168&r1=420167&r2=420168&view=diff ============================================================================== --- maven/components/branches/maven-2.0.x/maven-repository-tools/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-repository-tools/pom.xml Sat Jul 8 10:06:02 2006 @@ -1,60 +1,67 @@ -<model 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";> +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ Copyright 2005-2006 The Apache Software Foundation. + ~ + ~ Licensed 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</groupId> + <parent> + <artifactId>maven</artifactId> + <groupId>org.apache.maven</groupId> + <version>2.1-SNAPSHOT</version> + </parent> <artifactId>maven-repository-tools</artifactId> - <packaging>jar</packaging> <name>Maven Repo Reaper</name> <version>1.0-SNAPSHOT</version> <dependencies> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>2.0-SNAPSHOT</version> - <type>jar</type> - <scope>compile</scope> + <version>2.0.4</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>2.0-SNAPSHOT</version> - <type>jar</type> - <scope>compile</scope> + <version>2.0.4</version> </dependency> <dependency> <groupId>xstream</groupId> <artifactId>xstream</artifactId> <version>1.0-SNAPSHOT</version> - <type>jar</type> - <scope>compile</scope> </dependency> <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> <version>1.4</version> - <type>jar</type> - <scope>compile</scope> </dependency> <dependency> <groupId>xpp3</groupId> <artifactId>xpp3</artifactId> <version>1.1.3.3</version> - <type>jar</type> - <scope>compile</scope> </dependency> <dependency> <groupId>plexus</groupId> <artifactId>plexus</artifactId> <version>1.0-alpha-1</version> - <type>jar</type> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> - <version>2.0-SNAPSHOT</version> - <type>jar</type> - <scope>compile</scope> + <version>2.0.4</version> </dependency> </dependencies> -</model> +</project> Modified: maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml?rev=420168&r1=420167&r2=420168&view=diff ============================================================================== --- maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml Sat Jul 8 10:06:02 2006 @@ -1,4 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?><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";> +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ Copyright 2005-2006 The Apache Software Foundation. + ~ + ~ Licensed 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";> <parent> <artifactId>maven-script</artifactId> <groupId>org.apache.maven</groupId> @@ -7,7 +26,6 @@ <modelVersion>4.0.0</modelVersion> <artifactId>maven-script-ant</artifactId> <name>Maven Ant Mojo Support</name> - <version>2.0.5-SNAPSHOT</version> <dependencies> <dependency> <groupId>org.apache.maven</groupId> @@ -24,4 +42,4 @@ <artifactId>plexus-container-default</artifactId> </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml?rev=420168&r1=420167&r2=420168&view=diff ============================================================================== --- maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml Sat Jul 8 10:06:02 2006 @@ -1,4 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?><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";> +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ Copyright 2005-2006 The Apache Software Foundation. + ~ + ~ Licensed 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";> <parent> <artifactId>maven-script</artifactId> <groupId>org.apache.maven</groupId> @@ -7,7 +26,6 @@ <modelVersion>4.0.0</modelVersion> <artifactId>maven-script-beanshell</artifactId> <name>Maven Beanshell Mojo Support</name> - <version>2.0.5-SNAPSHOT</version> <dependencies> <dependency> <groupId>org.apache.maven</groupId> @@ -20,4 +38,4 @@ <version>1.0-alpha-7</version> </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: maven/components/branches/maven-2.0.x/maven-script/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-script/pom.xml?rev=420168&r1=420167&r2=420168&view=diff ============================================================================== --- maven/components/branches/maven-2.0.x/maven-script/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-script/pom.xml Sat Jul 8 10:06:02 2006 @@ -1,4 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?><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";> +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ Copyright 2005-2006 The Apache Software Foundation. + ~ + ~ Licensed 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";> <parent> <artifactId>maven</artifactId> <groupId>org.apache.maven</groupId> @@ -9,7 +28,6 @@ <artifactId>maven-script</artifactId> <packaging>pom</packaging> <name>Maven Script Support Root</name> - <version>2.0.5-SNAPSHOT</version> <repositories> <repository> <id>codehaus-snapshots</id> Modified: maven/components/branches/maven-2.0.x/maven-settings/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-settings/pom.xml?rev=420168&r1=420167&r2=420168&view=diff ============================================================================== --- maven/components/branches/maven-2.0.x/maven-settings/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-settings/pom.xml Sat Jul 8 10:06:02 2006 @@ -1,4 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?><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";> +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ Copyright 2005-2006 The Apache Software Foundation. + ~ + ~ Licensed 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";> <parent> <artifactId>maven</artifactId> <groupId>org.apache.maven</groupId> @@ -7,7 +26,6 @@ <modelVersion>4.0.0</modelVersion> <artifactId>maven-settings</artifactId> <name>Maven Local Settings Model</name> - <version>2.0.5-SNAPSHOT</version> <build> <plugins> <plugin> Modified: maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java?rev=420168&r1=420167&r2=420168&view=diff ============================================================================== --- maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java (original) +++ maven/components/branches/maven-2.0.x/maven-settings/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java Sat Jul 8 10:06:02 2006 @@ -176,84 +176,11 @@ for ( Iterator profiles = settings.getProfiles().iterator(); profiles.hasNext(); ) { Profile profile = (Profile) profiles.next(); - if ( profile.getActivation() != null && profile.getActivation().isActiveByDefault() ) + if ( profile.getActivation() != null && profile.getActivation().isActiveByDefault() + && !activeProfiles.contains( profile.getId() ) ) { - if ( !activeProfiles.contains( profile.getId() ) ) - { - settings.addActiveProfile( profile.getId() ); - } + settings.addActiveProfile( profile.getId() ); } - } - } - - private void setLocalRepository( Settings userSettings ) - { - // try using the local repository specified on the command line... - String localRepository = System.getProperty( MavenSettingsBuilder.ALT_LOCAL_REPOSITORY_LOCATION ); - - // otherwise, use the one in settings.xml - if ( localRepository == null || localRepository.length() < 1 ) - { - localRepository = userSettings.getLocalRepository(); - } - - // if all of the above are missing, default to ~/.m2/repository. - if ( localRepository == null || localRepository.length() < 1 ) - { - File mavenUserConfigurationDirectory = new File( userHome, ".m2" ); - if ( !mavenUserConfigurationDirectory.exists() ) - { - if ( !mavenUserConfigurationDirectory.mkdirs() ) - { - //throw a configuration exception - } - } - - localRepository = new File( mavenUserConfigurationDirectory, "repository" ).getAbsolutePath(); - } - - userSettings.setLocalRepository( localRepository ); - } - - private File getFile( String pathPattern, String basedirSysProp, String altLocationSysProp ) - { - // ------------------------------------------------------------------------------------- - // Alright, here's the justification for all the regexp wizardry below... - // - // Continuum and other server-like apps may need to locate the user-level and - // global-level settings somewhere other than ${user.home} and ${maven.home}, - // respectively. Using a simple replacement of these patterns will allow them - // to specify the absolute path to these files in a customized components.xml - // file. Ideally, we'd do full pattern-evaluation against the sysprops, but this - // is a first step. There are several replacements below, in order to normalize - // the path character before we operate on the string as a regex input, and - // in order to avoid surprises with the File construction... - // ------------------------------------------------------------------------------------- - - String path = System.getProperty( altLocationSysProp ); - - if ( StringUtils.isEmpty( path ) ) - { - // TODO: This replacing shouldn't be necessary as user.home should be in the - // context of the container and thus the value would be interpolated by Plexus - String basedir = System.getProperty( basedirSysProp ); - if ( basedir == null ) - { - basedir = System.getProperty( "user.dir" ); - } - - basedir = basedir.replaceAll( "\\\\", "/" ); - basedir = basedir.replaceAll( "\\$", "\\\\\\$" ); - - path = pathPattern.replaceAll( "\\$\\{" + basedirSysProp + "\\}", basedir ); - path = path.replaceAll( "\\\\", "/" ); - path = path.replaceAll( "//", "/" ); - - return new File( path ).getAbsoluteFile(); - } - else - { - return new File( path ).getAbsoluteFile(); } }
