From 72df73f9e8308115974c3898af074ad3ad77c91d Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 15 Nov 2012 10:18:06 +0000 Subject: [PATCH 01/38] code format and add @since git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1409718 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/cli/logging/Slf4jLoggerManager.java | 70 +++++++++++-------- 1 file changed, 41 insertions(+), 29 deletions(-) diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java index 739bdc4bc5..9fd83d15be 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java @@ -7,46 +7,58 @@ /** * Use an SLF4J {@link org.slf4j.ILoggerFactory} as a backing for a Plexus {@link org.codehaus.plexus.logging.LoggerManager}. - * + * * @author Jason van Zyl + * @since 3.1 */ -public class Slf4jLoggerManager implements LoggerManager { +public class Slf4jLoggerManager + implements LoggerManager +{ - private ILoggerFactory loggerFactory; + private ILoggerFactory loggerFactory; - public Slf4jLoggerManager() { - loggerFactory = LoggerFactory.getILoggerFactory(); - } + public Slf4jLoggerManager() + { + loggerFactory = LoggerFactory.getILoggerFactory(); + } - public Logger getLoggerForComponent(String role) { - return new Slf4jLogger(loggerFactory.getLogger(role)); - } + public Logger getLoggerForComponent( String role ) + { + return new Slf4jLogger( loggerFactory.getLogger( role ) ); + } - public Logger getLoggerForComponent(String role, String hint) { - return new Slf4jLogger(loggerFactory.getLogger(role + "." + hint)); - } + public Logger getLoggerForComponent( String role, String hint ) + { + return new Slf4jLogger( loggerFactory.getLogger( role + "." + hint ) ); + } - // - // Trying to give loggers back is a bad idea. Ceki said so :-) - // - public void returnComponentLogger(String role) { - } + // + // Trying to give loggers back is a bad idea. Ceki said so :-) + // + public void returnComponentLogger( String role ) + { + } - public void returnComponentLogger(String role, String hint) { - } + public void returnComponentLogger( String role, String hint ) + { + } - public int getThreshold() { - return 0; - } + public int getThreshold() + { + return 0; + } - public void setThreshold(int threshold) { - } + public void setThreshold( int threshold ) + { + } - public void setThresholds(int threshold) { - } + public void setThresholds( int threshold ) + { + } - public int getActiveLoggerCount() { - return 0; - } + public int getActiveLoggerCount() + { + return 0; + } } From e1e683cbbb3fb75bbfdf82fb55b53990911cc3b5 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 15 Nov 2012 10:18:21 +0000 Subject: [PATCH 02/38] avoid logger with name ended with .null if no hint git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1409719 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/maven/cli/logging/Slf4jLoggerManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java index 9fd83d15be..140eccfb98 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java @@ -29,7 +29,9 @@ public Logger getLoggerForComponent( String role ) public Logger getLoggerForComponent( String role, String hint ) { - return new Slf4jLogger( loggerFactory.getLogger( role + "." + hint ) ); + return ( null == hint + ? getLoggerForComponent( role ) + : new Slf4jLogger( loggerFactory.getLogger( role + "." + hint ) ) ); } // From b766d34b70de34fe8fef178d646cc5daecb826e3 Mon Sep 17 00:00:00 2001 From: Kristian Rosenvold Date: Fri, 16 Nov 2012 21:09:49 +0000 Subject: [PATCH 03/38] [MNG-5245] Update maven plugin versions - components.xml - maven-clean-plugin up to 2.5 - maven-site-plugin up to 3.1 - default-bindings.xml - maven-install-plugin up to 2.4 - maven-resources-plugin up to 2.6 - maven-compiler-plugin up to 2.5.1 - maven-surefire-plugin up to 2.12.4 - maven-jar-plugin up to 2.4 - maven-plugin-pugin up to 3.2 - maven-war-plugin up to 2.3 - maven-ear-plugin up to 2.8 Author: Karl Heinz Marbaise git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410570 13f79535-47bb-0310-9956-ffa450edef68 --- .../resources/META-INF/plexus/components.xml | 6 +- .../META-INF/plexus/default-bindings.xml | 102 +++++++++--------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/maven-core/src/main/resources/META-INF/plexus/components.xml b/maven-core/src/main/resources/META-INF/plexus/components.xml index dcf5c7705f..07515533e5 100644 --- a/maven-core/src/main/resources/META-INF/plexus/components.xml +++ b/maven-core/src/main/resources/META-INF/plexus/components.xml @@ -106,7 +106,7 @@ under the License. - org.apache.maven.plugins:maven-clean-plugin:2.4.1:clean + org.apache.maven.plugins:maven-clean-plugin:2.5:clean @@ -129,10 +129,10 @@ under the License. - org.apache.maven.plugins:maven-site-plugin:3.0:site + org.apache.maven.plugins:maven-site-plugin:3.1:site - org.apache.maven.plugins:maven-site-plugin:3.0:deploy + org.apache.maven.plugins:maven-site-plugin:3.1:deploy diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml index 8dc69806eb..39fe4bb8a3 100644 --- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml +++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml @@ -41,7 +41,7 @@ Mappings to default lifecycle, specific for each packaging. - org.apache.maven.plugins:maven-install-plugin:2.3.1:install + org.apache.maven.plugins:maven-install-plugin:2.4:install org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy @@ -67,25 +67,25 @@ Mappings to default lifecycle, specific for each packaging. - org.apache.maven.plugins:maven-resources-plugin:2.5:resources + org.apache.maven.plugins:maven-resources-plugin:2.6:resources - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile + org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile - org.apache.maven.plugins:maven-resources-plugin:2.5:testResources + org.apache.maven.plugins:maven-resources-plugin:2.6:testResources - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile + org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile - org.apache.maven.plugins:maven-surefire-plugin:2.12.1:test + org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test - org.apache.maven.plugins:maven-jar-plugin:2.3.2:jar + org.apache.maven.plugins:maven-jar-plugin:2.4:jar - org.apache.maven.plugins:maven-install-plugin:2.3.1:install + org.apache.maven.plugins:maven-install-plugin:2.4:install org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy @@ -111,25 +111,25 @@ Mappings to default lifecycle, specific for each packaging. - org.apache.maven.plugins:maven-resources-plugin:2.5:resources + org.apache.maven.plugins:maven-resources-plugin:2.6:resources - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile + org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile - org.apache.maven.plugins:maven-resources-plugin:2.5:testResources + org.apache.maven.plugins:maven-resources-plugin:2.6:testResources - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile + org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile - org.apache.maven.plugins:maven-surefire-plugin:2.12.1:test + org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test org.apache.maven.plugins:maven-ejb-plugin:2.3:ejb - org.apache.maven.plugins:maven-install-plugin:2.3.1:install + org.apache.maven.plugins:maven-install-plugin:2.4:install org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy @@ -151,25 +151,25 @@ Mappings to default lifecycle, specific for each packaging. - org.apache.maven.plugins:maven-resources-plugin:2.5:resources + org.apache.maven.plugins:maven-resources-plugin:2.6:resources - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile + org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile - org.apache.maven.plugins:maven-resources-plugin:2.5:testResources + org.apache.maven.plugins:maven-resources-plugin:2.6:testResources - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile + org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile - org.apache.maven.plugins:maven-surefire-plugin:2.12.1:test + org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test org.apache.maven.plugins:maven-ejb3-plugin:ejb3 - org.apache.maven.plugins:maven-install-plugin:2.3.1:install + org.apache.maven.plugins:maven-install-plugin:2.4:install org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy @@ -195,29 +195,29 @@ Mappings to default lifecycle, specific for each packaging. - org.apache.maven.plugins:maven-plugin-plugin:2.9:descriptor + org.apache.maven.plugins:maven-plugin-plugin:3.2:descriptor - org.apache.maven.plugins:maven-resources-plugin:2.5:resources + org.apache.maven.plugins:maven-resources-plugin:2.6:resources - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile + org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile - org.apache.maven.plugins:maven-resources-plugin:2.5:testResources + org.apache.maven.plugins:maven-resources-plugin:2.6:testResources - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile + org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile - org.apache.maven.plugins:maven-surefire-plugin:2.12.1:test + org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test - org.apache.maven.plugins:maven-jar-plugin:2.3.1:jar, - org.apache.maven.plugins:maven-plugin-plugin:2.9:addPluginArtifactMetadata + org.apache.maven.plugins:maven-jar-plugin:2.4:jar, + org.apache.maven.plugins:maven-plugin-plugin:3.2:addPluginArtifactMetadata - org.apache.maven.plugins:maven-install-plugin:2.3.1:install + org.apache.maven.plugins:maven-install-plugin:2.4:install org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy @@ -243,25 +243,25 @@ Mappings to default lifecycle, specific for each packaging. - org.apache.maven.plugins:maven-resources-plugin:2.5:resources + org.apache.maven.plugins:maven-resources-plugin:2.6:resources - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile + org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile - org.apache.maven.plugins:maven-resources-plugin:2.5:testResources + org.apache.maven.plugins:maven-resources-plugin:2.6:testResources - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile + org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile - org.apache.maven.plugins:maven-surefire-plugin:2.12.1:test + org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test - org.apache.maven.plugins:maven-war-plugin:2.1.1:war + org.apache.maven.plugins:maven-war-plugin:2.3:war - org.apache.maven.plugins:maven-install-plugin:2.3.1:install + org.apache.maven.plugins:maven-install-plugin:2.4:install org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy @@ -287,16 +287,16 @@ Mappings to default lifecycle, specific for each packaging. - org.apache.maven.plugins:maven-ear-plugin:2.5:generate-application-xml + org.apache.maven.plugins:maven-ear-plugin:2.8:generate-application-xml org.apache.maven.plugins:maven-resources-plugin:2.4.3:resources - org.apache.maven.plugins:maven-ear-plugin:2.6:ear + org.apache.maven.plugins:maven-ear-plugin:2.8:ear - org.apache.maven.plugins:maven-install-plugin:2.3.1:install + org.apache.maven.plugins:maven-install-plugin:2.4:install org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy @@ -322,25 +322,25 @@ Mappings to default lifecycle, specific for each packaging. - org.apache.maven.plugins:maven-resources-plugin:2.5:resources + org.apache.maven.plugins:maven-resources-plugin:2.6:resources - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile + org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile - org.apache.maven.plugins:maven-resources-plugin:2.5:testResources + org.apache.maven.plugins:maven-resources-plugin:2.6:testResources - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile + org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile - org.apache.maven.plugins:maven-surefire-plugin:2.12.1:test + org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test org.apache.maven.plugins:maven-rar-plugin:2.2:rar - org.apache.maven.plugins:maven-install-plugin:2.3.1:install + org.apache.maven.plugins:maven-install-plugin:2.4:install org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy @@ -366,25 +366,25 @@ Mappings to default lifecycle, specific for each packaging. - org.apache.maven.plugins:maven-resources-plugin:2.5:resources + org.apache.maven.plugins:maven-resources-plugin:2.6:resources - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile + org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile - org.apache.maven.plugins:maven-resources-plugin:2.5:testResources + org.apache.maven.plugins:maven-resources-plugin:2.6:testResources - org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile + org.apache.maven.plugins:maven-compiler-plugin:2.5.1:testCompile - org.apache.maven.plugins:maven-surefire-plugin:2.12.1:test + org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test org.apache.maven.plugins:maven-par-plugin:par - org.apache.maven.plugins:maven-install-plugin:2.3.1:install + org.apache.maven.plugins:maven-install-plugin:2.4:install org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy From b838131093628b641d5b0b7dcc53996021b312cb Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sat, 17 Nov 2012 12:27:48 +0000 Subject: [PATCH 04/38] o code formatting o added license header git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410724 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/cli/logging/Slf4jLogger.java | 163 +++++++++++------- .../maven/cli/logging/Slf4jLoggerManager.java | 19 ++ 2 files changed, 121 insertions(+), 61 deletions(-) diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java index d467239777..e231b53255 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java @@ -1,5 +1,24 @@ package org.apache.maven.cli.logging; +/* + * 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. + */ + import org.codehaus.plexus.logging.Logger; /** @@ -7,87 +26,109 @@ * * @author Jason van Zyl */ -public class Slf4jLogger implements Logger { +public class Slf4jLogger + implements Logger +{ - private org.slf4j.Logger logger; + private org.slf4j.Logger logger; - public Slf4jLogger(org.slf4j.Logger logger) { - this.logger = logger; - } + public Slf4jLogger( org.slf4j.Logger logger ) + { + this.logger = logger; + } - public void debug(String message) { - logger.debug(message); - } + public void debug( String message ) + { + logger.debug( message ); + } - public void debug(String message, Throwable throwable) { - logger.debug(message, throwable); - } + public void debug( String message, Throwable throwable ) + { + logger.debug( message, throwable ); + } - public boolean isDebugEnabled() { - return logger.isDebugEnabled(); - } + public boolean isDebugEnabled() + { + return logger.isDebugEnabled(); + } - public void info(String message) { - logger.info(message); - } + public void info( String message ) + { + logger.info( message ); + } - public void info(String message, Throwable throwable) { - logger.info(message, throwable); - } + public void info( String message, Throwable throwable ) + { + logger.info( message, throwable ); + } - public boolean isInfoEnabled() { - return logger.isInfoEnabled(); - } + public boolean isInfoEnabled() + { + return logger.isInfoEnabled(); + } - public void warn(String message) { - logger.warn(message); - } + public void warn( String message ) + { + logger.warn( message ); + } - public void warn(String message, Throwable throwable) { - logger.warn(message, throwable); - } + public void warn( String message, Throwable throwable ) + { + logger.warn( message, throwable ); + } - public boolean isWarnEnabled() { - return logger.isWarnEnabled(); - } + public boolean isWarnEnabled() + { + return logger.isWarnEnabled(); + } - public void error(String message) { - logger.error(message); - } + public void error( String message ) + { + logger.error( message ); + } - public void error(String message, Throwable throwable) { - logger.error(message, throwable); - } + public void error( String message, Throwable throwable ) + { + logger.error( message, throwable ); + } - public boolean isErrorEnabled() { - return logger.isErrorEnabled(); - } + public boolean isErrorEnabled() + { + return logger.isErrorEnabled(); + } - public void fatalError(String message) { - logger.error(message); - } + public void fatalError( String message ) + { + logger.error( message ); + } - public void fatalError(String message, Throwable throwable) { - logger.error(message, throwable); - } + public void fatalError( String message, Throwable throwable ) + { + logger.error( message, throwable ); + } - public boolean isFatalErrorEnabled() { - return logger.isErrorEnabled(); - } + public boolean isFatalErrorEnabled() + { + return logger.isErrorEnabled(); + } - public int getThreshold() { - return 0; - } + public int getThreshold() + { + return 0; + } - public void setThreshold(int threshold) { - } + public void setThreshold( int threshold ) + { + } - public Logger getChildLogger(String name) { - return null; - } + public Logger getChildLogger( String name ) + { + return null; + } - public String getName() { - return logger.getName(); - } + public String getName() + { + return logger.getName(); + } } diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java index 140eccfb98..0197f5c730 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java @@ -1,5 +1,24 @@ package org.apache.maven.cli.logging; +/* + * 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. + */ + import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.LoggerManager; import org.slf4j.ILoggerFactory; From 5869fc11970536f7f6cf7154c6eafaf528785bdf Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 18 Nov 2012 00:58:30 +0000 Subject: [PATCH 05/38] moved CLI Options Reference to a dedicated page git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410808 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/site/apt/{index.apt.vm => cli.apt.vm} | 8 ++------ maven-embedder/src/site/apt/index.apt | 13 +++++++++++++ maven-embedder/src/site/site.xml | 4 ++++ 3 files changed, 19 insertions(+), 6 deletions(-) rename maven-embedder/src/site/apt/{index.apt.vm => cli.apt.vm} (63%) create mode 100644 maven-embedder/src/site/apt/index.apt diff --git a/maven-embedder/src/site/apt/index.apt.vm b/maven-embedder/src/site/apt/cli.apt.vm similarity index 63% rename from maven-embedder/src/site/apt/index.apt.vm rename to maven-embedder/src/site/apt/cli.apt.vm index a63b0203f8..04aa696c13 100644 --- a/maven-embedder/src/site/apt/index.apt.vm +++ b/maven-embedder/src/site/apt/cli.apt.vm @@ -1,15 +1,11 @@ ----- - ${project.name} + Maven CLI Options Reference ----- Hervé Boutemy ----- 2012-04-29 ----- -${project.name} - - ${project.description} - -Supported CLI Options +Maven CLI Options Reference %{snippet|file=${project.basedir}/target/test-classes/options.html|verbatim=false} diff --git a/maven-embedder/src/site/apt/index.apt b/maven-embedder/src/site/apt/index.apt new file mode 100644 index 0000000000..46422561f3 --- /dev/null +++ b/maven-embedder/src/site/apt/index.apt @@ -0,0 +1,13 @@ + ----- + ${project.name} + ----- + Hervé Boutemy + ----- + 2012-04-29 + ----- + +${project.name} + + ${project.description} + + See {{{./cli.html}CLI options}} reference. \ No newline at end of file diff --git a/maven-embedder/src/site/site.xml b/maven-embedder/src/site/site.xml index 3a16bf98b5..71dc6c8492 100644 --- a/maven-embedder/src/site/site.xml +++ b/maven-embedder/src/site/site.xml @@ -30,6 +30,10 @@ under the License. + + + + From b1dbec59abc3d68853271ee0b26e168f362ef457 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 18 Nov 2012 02:23:48 +0000 Subject: [PATCH 06/38] added developer documentation about logging APIs git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410815 13f79535-47bb-0310-9956-ffa450edef68 --- maven-embedder/pom.xml | 2 +- maven-embedder/src/site/apt/index.apt | 6 +++- maven-embedder/src/site/apt/logging.apt | 39 +++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 maven-embedder/src/site/apt/logging.apt diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index b0cee82675..587398f371 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -22,7 +22,7 @@ maven-embedder Maven Embedder - Maven embeddable component, with CLI support. + Maven embeddable component, with CLI and logging support. diff --git a/maven-embedder/src/site/apt/index.apt b/maven-embedder/src/site/apt/index.apt index 46422561f3..cde7affdf3 100644 --- a/maven-embedder/src/site/apt/index.apt +++ b/maven-embedder/src/site/apt/index.apt @@ -10,4 +10,8 @@ ${project.name} ${project.description} - See {{{./cli.html}CLI options}} reference. \ No newline at end of file +* References + + * {{{./cli.html}CLI options}}, + + * {{{./logging.html}logging API}}. diff --git a/maven-embedder/src/site/apt/logging.apt b/maven-embedder/src/site/apt/logging.apt new file mode 100644 index 0000000000..e2830c4c88 --- /dev/null +++ b/maven-embedder/src/site/apt/logging.apt @@ -0,0 +1,39 @@ + ----- + Maven Logging + ----- + Hervé Boutemy + ----- + 2012-04-29 + ----- + +Maven Logging + + Maven uses + {{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/package-summary.html}Plexus + Container logging API}}, like any other Plexus components, ie + {{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/LoggerManager.html}LoggerManager}} + / {{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/Logger.html}Logger}}. + + Starting with Maven 3.1.0, instead of implementing the API itself, + Maven maps to {{{http://slf4j.org/apidocs/}SLF4J API}}'s {{{http://slf4j.org/apidocs/org/slf4j/ILoggerFactory.html}ILoggerFactory}} + / {{{http://slf4j.org/apidocs/org/slf4j/Logger.html}Logger}} through + {{{./apidocs/org/apache/maven/cli/logging/Slf4jLoggerManager.html}Slf4jLoggerManager}} + / {{{./apidocs/org/apache/maven/cli/logging/Slf4jLogger.html}Slf4jLogger}}. + +* Getting Logger Instance + + Plexus Logger can be injected in Plexus component using Plexus annotations + ++------ +import org.codehaus.plexus.logging.Logger; +import org.codehaus.plexus.component.annotations.Component; +import org.codehaus.plexus.component.annotations.Requirement; + +@Component( role = MyComponent.class ) +public class DefaultMyComponent + implements MyComponent +{ + @Requirement + private Logger logger; +} ++------ From 7892b6d493c93f70794f78daf22d1bc764a051d8 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 18 Nov 2012 02:29:00 +0000 Subject: [PATCH 07/38] added Reference menu git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410816 13f79535-47bb-0310-9956-ffa450edef68 --- src/site/site.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/site/site.xml b/src/site/site.xml index 099518f211..291d8ced9f 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -56,6 +56,13 @@ under the License. + + + + + + + From aac56f0f9728c6d338eda989ab28f4fbffdafcd3 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 18 Nov 2012 12:59:14 +0000 Subject: [PATCH 08/38] require Velocity filtering git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410883 13f79535-47bb-0310-9956-ffa450edef68 --- maven-embedder/src/site/apt/{index.apt => index.apt.vm} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename maven-embedder/src/site/apt/{index.apt => index.apt.vm} (100%) diff --git a/maven-embedder/src/site/apt/index.apt b/maven-embedder/src/site/apt/index.apt.vm similarity index 100% rename from maven-embedder/src/site/apt/index.apt rename to maven-embedder/src/site/apt/index.apt.vm From 7def319030e4173e0337524b9057c0dd6a381556 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 18 Nov 2012 13:29:18 +0000 Subject: [PATCH 09/38] [MNG-5380] preserve whitespace in Maven plugin configuration when elemnt has xml:space="preserve" partial fix, Modello 1.6 is required but I can't deploy it git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410886 13f79535-47bb-0310-9956-ffa450edef68 --- maven-model/src/main/mdo/maven.mdo | 12 +++++++----- pom.xml | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo index 389a081b49..3603660162 100644 --- a/maven-model/src/main/mdo/maven.mdo +++ b/maven-model/src/main/mdo/maven.mdo @@ -2591,16 +2591,18 @@ combine.children - or combine.self attributes to the children of the configuration element: +

The configuration as DOM object.

+

By default, every element content is trimmed, but starting with Maven 3.1.0, you can add + xml:space="preserve" to elements you want to preserve whitespace.

+

You can control how child POMs inherit configuration from parent POMs by adding combine.children + or combine.self attributes to the children of the configuration element:

  • combine.children: available values are merge (default) and append,
  • combine.self: available values are merge (default) and override.
- See POM Reference documentation and +

See POM Reference documentation and Xpp3DomUtils - for more information. + for more information.

]]> configuration diff --git a/pom.xml b/pom.xml index d6df7c73f9..2f05f13645 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 3.8.2 1.5.5 1.14 - 2.0.6 + 3.0.9-SNAPSHOT 2.3.0 2.3-SNAPSHOT 1.3 From d707fa5b819b696d3891c932e75481ff7efb03d2 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Mon, 19 Nov 2012 06:58:42 +0000 Subject: [PATCH 10/38] plexus-utils 3.0.9 released git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1411083 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2f05f13645..36c8b3de64 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 3.8.2 1.5.5 1.14 - 3.0.9-SNAPSHOT + 3.0.9 2.3.0 2.3-SNAPSHOT 1.3 From 21c2429519e7c8dd0416be4fb617af56df0138d3 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Mon, 19 Nov 2012 19:50:04 +0000 Subject: [PATCH 11/38] added link to plexus-container-default javadoc git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1411369 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 36c8b3de64..781f2493b2 100644 --- a/pom.xml +++ b/pom.xml @@ -484,6 +484,7 @@ true http://sonatype.github.com/sonatype-aether/apidocs/ + http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/ From 731fa826e575fa2e52158b1a08e91a5b47ad07c9 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Tue, 20 Nov 2012 06:30:12 +0000 Subject: [PATCH 12/38] [MNG-5380] [MNG-5336] use Modello 1.6, which adds xml:space="preserve" support for DOM and fixes xdoc propoerties output git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1411559 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 781f2493b2..8388b9248e 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 2.3-SNAPSHOT 1.3 1.7 - 1.4.1 + 1.6 1.3 1.13.1 1.7.2 From 1e41eff172fba89eb5fea1d64bae70c32239a606 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Tue, 20 Nov 2012 16:58:42 +0000 Subject: [PATCH 13/38] update to Wagon 2.3 through the staging repo so we can validate 2.3 is good with master git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1411743 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8388b9248e..3834e96ace 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 1.14 3.0.9 2.3.0 - 2.3-SNAPSHOT + 2.3 1.3 1.7 1.6 From 0098ceb9fc87ba3a27dec293ddc2300d8668fc2d Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Tue, 20 Nov 2012 17:20:20 +0000 Subject: [PATCH 14/38] use staging repository in the POM to test Wagon 2.3, this is wrong but until the Jenkins/Nexus setup is figured out this will keep the build working git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1411752 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index 3834e96ace..6167a1eaed 100644 --- a/pom.xml +++ b/pom.xml @@ -565,4 +565,12 @@ + + + wagon-2.3-stage + wagon-2.3-stage + https://repository.apache.org/content/repositories/maven-055/ + + + From 6417401054a693fd653416521aacf7c50575b252 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Wed, 21 Nov 2012 19:59:14 +0000 Subject: [PATCH 15/38] [MNG-5380] check that whitespace can be preserved in Maven plugin configuration when reading pom (still need to check if content is not trimmed when injected into plugin) git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412261 13f79535-47bb-0310-9956-ffa450edef68 --- .../model/building/DefaultModelBuilderFactoryTest.java | 6 ++++++ .../src/test/resources/poms/factory/simple.xml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderFactoryTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderFactoryTest.java index f85996d94b..142e062768 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderFactoryTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderFactoryTest.java @@ -21,6 +21,8 @@ import java.io.File; +import org.codehaus.plexus.util.xml.Xpp3Dom; + import junit.framework.TestCase; /** @@ -49,6 +51,10 @@ public void testCompleteWiring() assertNotNull( result ); assertNotNull( result.getEffectiveModel() ); assertEquals( "activated", result.getEffectiveModel().getProperties().get( "profile.file" ) ); + Xpp3Dom conf = (Xpp3Dom) result.getEffectiveModel().getBuild().getPlugins().get( 0 ).getConfiguration(); + System.out.println( conf ); + assertEquals( "1.5", conf.getChild( "source" ).getValue() ); + assertEquals( " 1.5 ", conf.getChild( "target" ).getValue() ); } } diff --git a/maven-model-builder/src/test/resources/poms/factory/simple.xml b/maven-model-builder/src/test/resources/poms/factory/simple.xml index 8912298a07..71900731c9 100644 --- a/maven-model-builder/src/test/resources/poms/factory/simple.xml +++ b/maven-model-builder/src/test/resources/poms/factory/simple.xml @@ -37,8 +37,8 @@ under the License. maven-compiler-plugin 2.1 - 1.5 - 1.5 + 1.5 + 1.5 From ca584199a5faec2cbfde56567b0730bb631fe7f3 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Wed, 21 Nov 2012 20:00:50 +0000 Subject: [PATCH 16/38] removed stdout output git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412263 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/model/building/DefaultModelBuilderFactoryTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderFactoryTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderFactoryTest.java index 142e062768..90b65a4c92 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderFactoryTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderFactoryTest.java @@ -52,7 +52,6 @@ public void testCompleteWiring() assertNotNull( result.getEffectiveModel() ); assertEquals( "activated", result.getEffectiveModel().getProperties().get( "profile.file" ) ); Xpp3Dom conf = (Xpp3Dom) result.getEffectiveModel().getBuild().getPlugins().get( 0 ).getConfiguration(); - System.out.println( conf ); assertEquals( "1.5", conf.getChild( "source" ).getValue() ); assertEquals( " 1.5 ", conf.getChild( "target" ).getValue() ); } From 4e52800a1bf5ac0e7d326b069520df53c6ce06e2 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Wed, 21 Nov 2012 21:36:19 +0000 Subject: [PATCH 17/38] [MNG-5380] check that whitespace can be preserved in Maven plugin configuration when building MavenProject (still need to check if content is not trimmed when injected into plugin) git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412310 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/maven/project/PomConstructionTest.java | 3 ++- .../org/apache/maven/project/harness/Xpp3DomNodePointer.java | 4 ++-- .../reporting-plugin-config/sub/pom.xml | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java index 26990d3190..8012124fe0 100644 --- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java @@ -1083,9 +1083,10 @@ public void testReportingPluginConfig() { PomTestWrapper pom = buildPom( "reporting-plugin-config/sub" ); - assertEquals( 2, ( (List) pom.getValue( "reporting/plugins[1]/configuration/stringParams" ) ).size() ); + assertEquals( 3, ( (List) pom.getValue( "reporting/plugins[1]/configuration/stringParams" ) ).size() ); assertEquals( "parentParam", pom.getValue( "reporting/plugins[1]/configuration/stringParams[1]/stringParam[1]" ) ); assertEquals( "childParam", pom.getValue( "reporting/plugins[1]/configuration/stringParams[1]/stringParam[2]" ) ); + assertEquals( " preserve space ", pom.getValue( "reporting/plugins[1]/configuration/stringParams[1]/stringParam[3]" ) ); assertEquals( "true", pom.getValue( "reporting/plugins[1]/configuration/booleanParam" ) ); } diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java index a628edcd0e..59ce300eac 100644 --- a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java +++ b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java @@ -78,14 +78,14 @@ public int compareChildNodePointers( NodePointer pointer1, NodePointer pointer2 @Override public Object getValue() { - return getValue(node); + return getValue( node ); } private static Object getValue( Xpp3Dom node ) { if ( node.getValue() != null ) { - return node.getValue().trim(); + return node.getValue(); } else { diff --git a/maven-core/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml b/maven-core/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml index e6018dd604..b0768271f5 100644 --- a/maven-core/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml +++ b/maven-core/src/test/resources-project-builder/reporting-plugin-config/sub/pom.xml @@ -36,8 +36,9 @@ maven-it-plugin-configuration 2.1-SNAPSHOT - - childParam + + childParam + preserve space From 325972aed054d4c4f4e33e16d56b2a08af436a98 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Thu, 22 Nov 2012 02:24:16 +0000 Subject: [PATCH 18/38] MNG-5376: Account for changes between the Apple and Oracle JDKs on OSX git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412409 13f79535-47bb-0310-9956-ffa450edef68 --- apache-maven/src/bin/mvn | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index 04c292fe03..6dd9d5ebd3 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -54,12 +54,24 @@ case "`uname`" in CYGWIN*) cygwin=true ;; MINGW*) mingw=true;; Darwin*) darwin=true - if [ -z "$JAVA_VERSION" ] ; then - JAVA_VERSION="CurrentJDK" - fi - if [ -z "$JAVA_HOME" ] ; then - JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home + + # + # Look for the Apple JDKs first to preserve the existing behaviour, and then look + # for the new JDKs provided by Oracle. + # + if [[ -z "$JAVA_HOME" && -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ]] ; then + # + # Apple JDKs + # + JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home fi + + if [[ -z "$JAVA_HOME" && -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ]] ; then + # + # Oracle JDKs + # + JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi ;; esac From c4703d24375921c1e7f498b7c7f75638b30dc14e Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Fri, 23 Nov 2012 07:17:37 +0000 Subject: [PATCH 19/38] added info about direct SLF4J use git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412765 13f79535-47bb-0310-9956-ffa450edef68 --- maven-embedder/src/site/apt/logging.apt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/maven-embedder/src/site/apt/logging.apt b/maven-embedder/src/site/apt/logging.apt index e2830c4c88..2caf177579 100644 --- a/maven-embedder/src/site/apt/logging.apt +++ b/maven-embedder/src/site/apt/logging.apt @@ -37,3 +37,16 @@ public class DefaultMyComponent private Logger logger; } +------ + + Starting with Maven 3.1.0, SLF4J Logger can be used directly too, without Plexus. Of course, this will only work when run under + Maven 3.1.0, then this technique can be used safely only in Maven core components. + ++----- +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class Wombat +{ + final Logger logger = LoggerFactory.getLogger(Wombat.class); +} ++----- From a71baa4579bb35930aa4a64c6b4fb8a997518d39 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Fri, 23 Nov 2012 07:45:43 +0000 Subject: [PATCH 20/38] added notes about logger name, with Plexus Logger API that cannot follow logger name as class name convention :( git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412766 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/cli/logging/Slf4jLogger.java | 12 +++++++- .../maven/cli/logging/Slf4jLoggerManager.java | 29 +++++++++++++++++-- maven-embedder/src/site/apt/logging.apt | 13 +++++++++ 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java index e231b53255..a2b9bca5be 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java @@ -22,7 +22,8 @@ import org.codehaus.plexus.logging.Logger; /** - * Adapt an SLF4J logger to a Plexus logger. + * Adapt an SLF4J logger to a Plexus logger, ignoring Plexus logger API parts that are not classical and + * probably not really used. * * @author Jason van Zyl */ @@ -112,15 +113,24 @@ public boolean isFatalErrorEnabled() return logger.isErrorEnabled(); } + /** + * Warning: ignored (always return 0). + */ public int getThreshold() { return 0; } + /** + * Warning: ignored. + */ public void setThreshold( int threshold ) { } + /** + * Warning: ignored (always return 0). + */ public Logger getChildLogger( String name ) { return null; diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java index 0197f5c730..f30ea8f68e 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java @@ -25,7 +25,8 @@ import org.slf4j.LoggerFactory; /** - * Use an SLF4J {@link org.slf4j.ILoggerFactory} as a backing for a Plexus {@link org.codehaus.plexus.logging.LoggerManager}. + * Use an SLF4J {@link org.slf4j.ILoggerFactory} as a backing for a Plexus {@link org.codehaus.plexus.logging.LoggerManager}, + * ignoring Plexus logger API parts that are not classical and probably not really used. * * @author Jason van Zyl * @since 3.1 @@ -46,37 +47,61 @@ public Logger getLoggerForComponent( String role ) return new Slf4jLogger( loggerFactory.getLogger( role ) ); } + /** + * The logger name for a component with a non-null hint is role.hint. + * Warning: this does not conform to logger name as class name convention. + * (and what about null and default hint equivalence?) + */ public Logger getLoggerForComponent( String role, String hint ) { return ( null == hint ? getLoggerForComponent( role ) - : new Slf4jLogger( loggerFactory.getLogger( role + "." + hint ) ) ); + : new Slf4jLogger( loggerFactory.getLogger( role + '.' + hint ) ) ); } // // Trying to give loggers back is a bad idea. Ceki said so :-) + // notice to self: what was this method supposed to do? // + /** + * Warning: ignored. + */ public void returnComponentLogger( String role ) { } + /** + * Warning: ignored. + */ public void returnComponentLogger( String role, String hint ) { } + /** + * Warning: ignored (always return 0). + */ public int getThreshold() { return 0; } + /** + * Warning: ignored. + */ public void setThreshold( int threshold ) { } + /** + * Warning: ignored. + */ public void setThresholds( int threshold ) { } + /** + * Warning: ignored (always return 0). + */ public int getActiveLoggerCount() { return 0; diff --git a/maven-embedder/src/site/apt/logging.apt b/maven-embedder/src/site/apt/logging.apt index 2caf177579..cca01bf974 100644 --- a/maven-embedder/src/site/apt/logging.apt +++ b/maven-embedder/src/site/apt/logging.apt @@ -50,3 +50,16 @@ public class Wombat final Logger logger = LoggerFactory.getLogger(Wombat.class); } +----- + +* Logger Name + + Before Maven 3.1.0, with logging implementation done in Maven, logger name wasn't used: they are as-is, without clear definition. + + Starting with Maven 3.1.0, logging implementation can be of greatest use if logger names are well defined. This definition still + needs to be defined and implemented: + + * classical "class name" pattern? + + * Maven-specific name hierarchy? + + * a mix (some with class name, some with Maven-specific hierarchy)? From f45e5f1084fc7d8ae0ca386d8351a8b36e01abd2 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Fri, 23 Nov 2012 21:41:40 +0000 Subject: [PATCH 21/38] wagon 2.3 will be in central shortly, remove from the POM for the release git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413074 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pom.xml b/pom.xml index 6167a1eaed..3b97b69e1f 100644 --- a/pom.xml +++ b/pom.xml @@ -564,13 +564,4 @@ - - - - wagon-2.3-stage - wagon-2.3-stage - https://repository.apache.org/content/repositories/maven-055/ - - - From 63fd9ed4d82a110720182de5c8c779f5745eb7da Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Sat, 24 Nov 2012 17:22:54 +0000 Subject: [PATCH 22/38] MNG-5376: Account for changes between the Apple and Oracle JDKs on OSX git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413208 13f79535-47bb-0310-9956-ffa450edef68 --- apache-maven/src/bin/mvn | 3 +-- apache-maven/src/bin/mvnDebug | 21 ++++++++++++++++----- apache-maven/src/bin/mvnyjp | 26 +++++++++++++++++++------- 3 files changed, 36 insertions(+), 14 deletions(-) diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index 6dd9d5ebd3..ecebe9f393 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -53,8 +53,7 @@ mingw=false case "`uname`" in CYGWIN*) cygwin=true ;; MINGW*) mingw=true;; - Darwin*) darwin=true - + Darwin*) darwin=true # # Look for the Apple JDKs first to preserve the existing behaviour, and then look # for the new JDKs provided by Oracle. diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug index 04babaa036..b7fffc7bb4 100755 --- a/apache-maven/src/bin/mvnDebug +++ b/apache-maven/src/bin/mvnDebug @@ -58,12 +58,23 @@ case "`uname`" in CYGWIN*) cygwin=true ;; MINGW*) mingw=true;; Darwin*) darwin=true - if [ -z "$JAVA_VERSION" ] ; then - JAVA_VERSION="CurrentJDK" - fi - if [ -z "$JAVA_HOME" ] ; then - JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home + # + # Look for the Apple JDKs first to preserve the existing behaviour, and then look + # for the new JDKs provided by Oracle. + # + if [[ -z "$JAVA_HOME" && -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ]] ; then + # + # Apple JDKs + # + JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home fi + + if [[ -z "$JAVA_HOME" && -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ]] ; then + # + # Oracle JDKs + # + JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi ;; esac diff --git a/apache-maven/src/bin/mvnyjp b/apache-maven/src/bin/mvnyjp index 4c22d51363..99154db73d 100755 --- a/apache-maven/src/bin/mvnyjp +++ b/apache-maven/src/bin/mvnyjp @@ -61,15 +61,27 @@ mingw=false case "`uname`" in CYGWIN*) cygwin=true ;; MINGW*) mingw=true;; - Darwin*) darwin=true - if [ -z "$JAVA_VERSION" ] ; then - JAVA_VERSION="CurrentJDK" - fi - if [ -z "$JAVA_HOME" ] ; then - JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home + Darwin*) darwin=true + # + # Look for the Apple JDKs first to preserve the existing behaviour, and then look + # for the new JDKs provided by Oracle. + # + if [[ -z "$JAVA_HOME" && -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ]] ; then + # + # Apple JDKs + # + JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home fi + + if [[ -z "$JAVA_HOME" && -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ]] ; then + # + # Oracle JDKs + # + JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi + if [ -z "$YJP_HOME" ]; then - YJP_HOME=/Applications/YourKit.app + YJP_HOME=/Applications/YourKit_Java_Profiler_11.0.9.app fi YJPLIB=$YJP_HOME/bin/mac/libyjpagent.jnilib ;; From 8ca2e32a0c08df3cf31b7ac04a9641e0643ecd4e Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sat, 24 Nov 2012 22:01:41 +0000 Subject: [PATCH 23/38] add init-git-svn.sh script: how to setup your clone to be able to use git svn git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413275 13f79535-47bb-0310-9956-ffa450edef68 --- init-git-svn.sh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100755 init-git-svn.sh diff --git a/init-git-svn.sh b/init-git-svn.sh new file mode 100755 index 0000000000..28ea5be9be --- /dev/null +++ b/init-git-svn.sh @@ -0,0 +1,4 @@ +cd .git;wget http://git.apache.org/authors.txt; cd .. +git config svn.authorsfile ".git/authors.txt" +git svn init --prefix=origin/ --tags=tags --trunk=trunk --branches=branches https://svn.apache.org/repos/asf/maven/maven-3 +git svn rebase From 1d4d1df865f01f548da93d348d370691f31bf680 Mon Sep 17 00:00:00 2001 From: Benson Margulies Date: Sun, 25 Nov 2012 02:26:42 +0000 Subject: [PATCH 24/38] MNG-5387: Add ability to replace an artifact in mid-build o change MavenProject#addArtifact to use the *last* version of a given artifact passed to it instead of the first. o add comments. git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413286 13f79535-47bb-0310-9956-ffa450edef68 --- .../project/DefaultMavenProjectHelper.java | 25 +++---- .../apache/maven/project/MavenProject.java | 71 +++++++++++++------ .../maven/project/MavenProjectHelper.java | 36 ++++++++++ 3 files changed, 95 insertions(+), 37 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java index 37061c86f9..2b9444f025 100644 --- a/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java +++ b/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java @@ -19,9 +19,6 @@ * under the License. */ -import java.io.File; -import java.util.List; - import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.handler.ArtifactHandler; import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager; @@ -31,6 +28,9 @@ import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.logging.AbstractLogEnabled; +import java.io.File; +import java.util.List; + @SuppressWarnings( "deprecation" ) @Component( role = MavenProjectHelper.class ) public class DefaultMavenProjectHelper @@ -90,20 +90,15 @@ public void attachArtifact( MavenProject project, File artifactFile, String arti attachArtifact( project, artifact ); } + /** + * Add an attached artifact or replace the file for an existing artifact. + * @see MavenProject#addAttachedArtifact(org.apache.maven.artifact.Artifact) + * @param project project reference. + * @param artifact artifact to add or replace. + */ public void attachArtifact( MavenProject project, Artifact artifact ) { - try - { - project.addAttachedArtifact( artifact ); - } - catch ( DuplicateArtifactAttachmentException dae ) - { - getLogger().warn( dae.getMessage() ); - - // We can throw this because it's unchecked, and won't change the MavenProjectHelper API, which would break - // backward compat if it did. - throw dae; - } + project.addAttachedArtifact( artifact ); } public void addResource( MavenProject project, String resourceDirectory, List includes, List excludes ) diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java index db31299054..5090c3e4f7 100644 --- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java +++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java @@ -15,22 +15,6 @@ * the License. */ -import java.io.File; -import java.io.IOException; -import java.io.Writer; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - import org.apache.maven.RepositoryUtils; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.ArtifactUtils; @@ -75,6 +59,22 @@ import org.sonatype.aether.graph.DependencyFilter; import org.sonatype.aether.repository.RemoteRepository; +import java.io.File; +import java.io.IOException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + /** * The concern of the project is provide runtime values based on the model. *

@@ -1449,19 +1449,46 @@ public Map> getInjectedProfileIds() return this.injectedProfileIds; } + private String logStringForArtifactFile( Artifact a ) + { + if ( a.getFile() != null ) + { + return a.getFile().getAbsolutePath(); + } + else + { + return "(no path)"; + } + } + + /** + * Add or replace an artifact. + * In spite of the 'throws' declaration on this API, this method has never thrown an exception since Maven 3.0.x. + * Historically, it logged and ignored a second addition of the same g/a/v/c/t. Now it replaces the file for + * the artifact, so that plugins (e.g. shade) can change the pathname of the file for a particular set of + * coordinates. + * @param artifact the artifact to add or replace. + * @throws DuplicateArtifactAttachmentException + */ public void addAttachedArtifact( Artifact artifact ) throws DuplicateArtifactAttachmentException { List attachedArtifacts = getAttachedArtifacts(); - - if ( attachedArtifacts.contains( artifact ) ) + for ( int ax = 0; ax < attachedArtifacts.size(); ax++ ) { - if ( logger != null ) + Artifact a = attachedArtifacts.get( ax ); + if ( a.equals( artifact )) { - logger.warn( "Artifact " + artifact + " already attached to project, ignoring duplicate" ); + if ( logger != null ) + { + logger.debug( String.format( "Replacing attached artifact %s. Old path %s, new path %s. ", + a, + logStringForArtifactFile( a ), + logStringForArtifactFile( artifact ) ) ); + } + attachedArtifacts.set( ax, artifact ); + return; } - return; - //throw new DuplicateArtifactAttachmentException( this, artifact ); } getAttachedArtifacts().add( artifact ); diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProjectHelper.java b/maven-core/src/main/java/org/apache/maven/project/MavenProjectHelper.java index 58b4b2248e..406bbf25b8 100644 --- a/maven-core/src/main/java/org/apache/maven/project/MavenProjectHelper.java +++ b/maven-core/src/main/java/org/apache/maven/project/MavenProjectHelper.java @@ -22,18 +22,54 @@ import java.io.File; import java.util.List; +/** + * Convenience interface for plugins to add or replace artifacts and resources on projects. + */ public interface MavenProjectHelper { String ROLE = MavenProjectHelper.class.getName(); + /** + * See {@link #attachArtifact(MavenProject, String, String, java.io.File)}, but with type set to null. + * @param project project reference. + * @param artifactFile artifact file. + * @param artifactClassifier artifact classifier. + */ void attachArtifact( MavenProject project, File artifactFile, String artifactClassifier ); + /** + * * See {@link #attachArtifact(MavenProject, String, String, java.io.File)}, but with classifier set to null. + * @param project project reference. + * @param artifactType artifact type. + * @param artifactFile arrifact file. + */ void attachArtifact( MavenProject project, String artifactType, File artifactFile ); + /** + * Add or replace an artifact to the current project. + * @param project the project reference. + * @param artifactType the type (e.g. jar) or null. + * @param artifactClassifier the classifier or null. + * @param artifactFile the file for the artifact. + */ void attachArtifact( MavenProject project, String artifactType, String artifactClassifier, File artifactFile ); + /** + * Add a resource directory to the project. + * @param project project reference. + * @param resourceDirectory directory. + * @param includes include patterns. + * @param excludes exclude patterns. + */ void addResource( MavenProject project, String resourceDirectory, List includes, List excludes ); + /** + * Add a test resource directory to the project. + * @param project project reference. + * @param resourceDirectory directory. + * @param includes include patterns. + * @param excludes exclude patterns. + */ void addTestResource( MavenProject project, String resourceDirectory, List includes, List excludes ); } From 451c43152b8939a699dfa5db4fc4ca8676182462 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Sun, 25 Nov 2012 03:12:49 +0000 Subject: [PATCH 25/38] cleanup of the class realm purging git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413287 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/plugin/DefaultPluginRealmCache.java | 21 ++++++++++++++++++- .../java/org/apache/maven/cli/MavenCli.java | 18 ++++------------ 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java index 896236741e..c821ae90ad 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java @@ -29,7 +29,9 @@ import org.apache.maven.model.Plugin; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.classworlds.realm.ClassRealm; +import org.codehaus.plexus.classworlds.realm.NoSuchRealmException; import org.codehaus.plexus.component.annotations.Component; +import org.codehaus.plexus.personality.plexus.lifecycle.phase.Disposable; import org.sonatype.aether.RepositorySystemSession; import org.sonatype.aether.graph.DependencyFilter; import org.sonatype.aether.repository.LocalRepository; @@ -41,7 +43,7 @@ */ @Component( role = PluginRealmCache.class ) public class DefaultPluginRealmCache - implements PluginRealmCache + implements PluginRealmCache, Disposable { protected static class CacheKey @@ -179,6 +181,18 @@ public CacheRecord put( Key key, ClassRealm pluginRealm, List pluginAr public void flush() { + for ( CacheRecord record : cache.values() ) + { + ClassRealm realm = record.realm; + try + { + realm.getWorld().disposeRealm( realm.getId() ); + } + catch ( NoSuchRealmException e ) + { + // ignore + } + } cache.clear(); } @@ -197,4 +211,9 @@ public void register( MavenProject project, CacheRecord record ) // default cache does not track plugin usage } + public void dispose() + { + flush(); + } + } diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index 10d21a2b84..45ea1309cd 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -55,6 +55,7 @@ import org.apache.maven.lifecycle.LifecycleExecutionException; import org.apache.maven.lifecycle.internal.LifecycleWeaveBuilder; import org.apache.maven.model.building.ModelProcessor; +import org.apache.maven.plugin.PluginRealmCache; import org.apache.maven.project.MavenProject; import org.apache.maven.properties.internal.EnvironmentUtils; import org.apache.maven.settings.building.DefaultSettingsBuildingRequest; @@ -112,9 +113,6 @@ public class MavenCli private ClassWorld classWorld; - // Per-instance container supports fast embedded execution of core ITs - private DefaultPlexusContainer container; - private LoggerManager plexusLoggerManager; private ILoggerFactory slf4jLoggerFactory; @@ -197,7 +195,7 @@ public int doMain( String[] args, String workingDirectory, PrintStream stdout, P // TODO: need to externalize CliRequest public int doMain( CliRequest cliRequest ) { - PlexusContainer localContainer = this.container; + PlexusContainer localContainer = null; try { initialize( cliRequest ); @@ -235,7 +233,7 @@ public int doMain( CliRequest cliRequest ) } finally { - if ( localContainer != this.container ) + if (localContainer != null) { localContainer.dispose(); } @@ -377,10 +375,8 @@ private PlexusContainer container( CliRequest cliRequest ) cliRequest.classWorld = new ClassWorld( "plexus.core", Thread.currentThread().getContextClassLoader() ); } - DefaultPlexusContainer container = this.container; + DefaultPlexusContainer container = null; - if ( container == null ) - { ContainerConfiguration cc = new DefaultContainerConfiguration() .setClassWorld( cliRequest.classWorld ) .setRealm( setupContainerRealm( cliRequest ) ) @@ -405,12 +401,6 @@ protected void configure() customizeContainer( container ); - if ( cliRequest.classWorld == classWorld ) - { - this.container = container; - } - } - container.getLoggerManager().setThresholds( cliRequest.request.getLoggingLevel() ); Thread.currentThread().setContextClassLoader( container.getContainerRealm() ); From 8a0d8ecb12c609b3831fa43d4bb0b75dae3291f2 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 25 Nov 2012 10:48:50 +0000 Subject: [PATCH 26/38] code format git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413323 13f79535-47bb-0310-9956-ffa450edef68 --- maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index 45ea1309cd..f6378201ec 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -875,7 +875,7 @@ else if ( profileAction.startsWith( "+" ) ) { transferListener = new QuietMavenTransferListener(); } - else if ( request.isInteractiveMode() && !cliRequest.commandLine.hasOption( CLIManager.LOG_FILE )) + else if ( request.isInteractiveMode() && !cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) ) { // // If we're logging to a file then we don't want the console transfer listener as it will spew From 9009b8f8589e85d66915f535b471a664b69a9db5 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 25 Nov 2012 11:04:16 +0000 Subject: [PATCH 27/38] fixed errors reported by Checkstyle git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413335 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/DefaultArtifactFilterManager.java | 4 +- .../java/org/apache/maven/DefaultMaven.java | 45 +++++++------------ .../DefaultProjectDependenciesResolver.java | 6 +-- .../maven/ProjectBuildFailureException.java | 19 ++++++++ .../java/org/apache/maven/ReactorReader.java | 6 +-- .../metadata/io/MetadataReader.java | 2 +- .../exception/DefaultExceptionHandler.java | 6 ++- .../apache/maven/cli/CLIReportingUtils.java | 4 +- .../java/org/apache/maven/cli/MavenCli.java | 4 +- .../BatchModeMavenTransferListener.java | 4 +- 10 files changed, 54 insertions(+), 46 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java index 55a576075f..9d772f70b4 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java @@ -37,7 +37,7 @@ * @author Jason van Zyl * @todo this should probably be a component with some dynamic control of filtering */ -@Component(role = ArtifactFilterManager.class) +@Component( role = ArtifactFilterManager.class ) public class DefaultArtifactFilterManager implements ArtifactFilterManager { @@ -90,7 +90,7 @@ public class DefaultArtifactFilterManager * wagon from their plugin realm. */ - DEFAULT_EXCLUSIONS = Collections.unmodifiableSet( artifacts); + DEFAULT_EXCLUSIONS = Collections.unmodifiableSet( artifacts ); } protected Set excludedArtifacts = new HashSet( DEFAULT_EXCLUSIONS ); diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java index bdfacbf55c..e80185bbda 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -1,18 +1,22 @@ package org.apache.maven; /* - * 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. + * 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. */ import java.io.File; @@ -79,26 +83,11 @@ import org.sonatype.aether.ConfigurationProperties; import org.sonatype.aether.RepositorySystem; import org.sonatype.aether.RepositorySystemSession; -import org.sonatype.aether.collection.DependencyGraphTransformer; -import org.sonatype.aether.collection.DependencyManager; -import org.sonatype.aether.collection.DependencySelector; -import org.sonatype.aether.collection.DependencyTraverser; import org.sonatype.aether.repository.Authentication; import org.sonatype.aether.repository.LocalRepository; import org.sonatype.aether.repository.RepositoryPolicy; import org.sonatype.aether.repository.WorkspaceReader; import org.sonatype.aether.util.DefaultRepositorySystemSession; -import org.sonatype.aether.util.graph.manager.ClassicDependencyManager; -import org.sonatype.aether.util.graph.selector.AndDependencySelector; -import org.sonatype.aether.util.graph.selector.ExclusionDependencySelector; -import org.sonatype.aether.util.graph.selector.OptionalDependencySelector; -import org.sonatype.aether.util.graph.selector.ScopeDependencySelector; -import org.sonatype.aether.util.graph.transformer.ChainedDependencyGraphTransformer; -import org.sonatype.aether.util.graph.transformer.NearestVersionConflictResolver; -import org.sonatype.aether.util.graph.transformer.ConflictMarker; -import org.sonatype.aether.util.graph.transformer.JavaDependencyContextRefiner; -import org.sonatype.aether.util.graph.transformer.JavaEffectiveScopeCalculator; -import org.sonatype.aether.util.graph.traverser.FatArtifactTraverser; import org.sonatype.aether.util.repository.ChainedWorkspaceReader; import org.sonatype.aether.util.repository.DefaultAuthenticationSelector; import org.sonatype.aether.util.repository.DefaultMirrorSelector; @@ -107,7 +96,7 @@ /** * @author Jason van Zyl */ -@Component(role = Maven.class) +@Component( role = Maven.class ) public class DefaultMaven implements Maven { diff --git a/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java b/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java index 4d6fa14bee..d511d1d04e 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java @@ -42,7 +42,7 @@ import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; -@Component(role = ProjectDependenciesResolver.class) +@Component( role = ProjectDependenciesResolver.class ) public class DefaultProjectDependenciesResolver implements ProjectDependenciesResolver { @@ -97,8 +97,8 @@ private Set resolveImpl( Collection projects, return resolved; } - if ( ( scopesToCollect == null || scopesToCollect.isEmpty() ) && - ( scopesToResolve == null || scopesToResolve.isEmpty() ) ) + if ( ( scopesToCollect == null || scopesToCollect.isEmpty() ) + && ( scopesToResolve == null || scopesToResolve.isEmpty() ) ) { return resolved; } diff --git a/maven-core/src/main/java/org/apache/maven/ProjectBuildFailureException.java b/maven-core/src/main/java/org/apache/maven/ProjectBuildFailureException.java index 1e9509842b..480f9c5a5a 100644 --- a/maven-core/src/main/java/org/apache/maven/ProjectBuildFailureException.java +++ b/maven-core/src/main/java/org/apache/maven/ProjectBuildFailureException.java @@ -1,5 +1,24 @@ package org.apache.maven; +/* + * 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. + */ + import org.apache.maven.plugin.MojoFailureException; /** diff --git a/maven-core/src/main/java/org/apache/maven/ReactorReader.java b/maven-core/src/main/java/org/apache/maven/ReactorReader.java index 9afe864765..4e1a638f47 100644 --- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java +++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java @@ -43,9 +43,9 @@ class ReactorReader implements WorkspaceReader { - private final static Collection JAR_LIKE_TYPES = Arrays.asList( "jar", "test-jar", "ejb-client" ); + private static final Collection JAR_LIKE_TYPES = Arrays.asList( "jar", "test-jar", "ejb-client" ); - private final static Collection COMPILE_PHASE_TYPES = Arrays.asList( "jar", "ejb-client" ); + private static final Collection COMPILE_PHASE_TYPES = Arrays.asList( "jar", "ejb-client" ); private Map projectsByGAV; @@ -103,7 +103,7 @@ else if ( !hasBeenPackaged( project ) ) } else { - String type = artifact.getProperty( "type", ""); + String type = artifact.getProperty( "type", "" ); if ( project.hasLifecyclePhase( "compile" ) && COMPILE_PHASE_TYPES.contains( type ) ) { return new File( project.getBuild().getOutputDirectory() ); diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java index 7f554e4346..232246fd1d 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/MetadataReader.java @@ -39,7 +39,7 @@ public interface MetadataReader * The key for the option to enable strict parsing. This option is of type {@link Boolean} and defaults to {@code * true}. If {@code false}, unknown elements will be ignored instead of causing a failure. */ - final String IS_STRICT = "org.apache.maven.artifact.repository.metadata.io.isStrict"; + String IS_STRICT = "org.apache.maven.artifact.repository.metadata.io.isStrict"; /** * Reads the metadata from the specified file. diff --git a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java index ddbe038fe1..6066593f7b 100644 --- a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java +++ b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java @@ -179,9 +179,11 @@ private String getReference( Throwable exception ) reference = MojoExecutionException.class.getSimpleName(); Throwable cause = exception.getCause(); - if ( cause instanceof IOException ) { + if ( cause instanceof IOException ) + { cause = cause.getCause(); - if ( cause instanceof ConnectException ) { + if ( cause instanceof ConnectException ) + { reference = ConnectException.class.getSimpleName(); } } diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java index a88a0abaa8..0f8262b102 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java @@ -21,8 +21,6 @@ import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; -import java.io.PrintStream; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; @@ -51,7 +49,7 @@ public final class CLIReportingUtils public static String showVersion() { - String LS = System.getProperty("line.separator"); + final String LS = System.getProperty( "line.separator" ); Properties properties = getBuildProperties(); StringBuffer version = new StringBuffer(); version.append( createMavenVersionString( properties ) ).append( LS ); diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index f6378201ec..772f984494 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -283,7 +283,7 @@ private void cli( CliRequest cliRequest ) if ( cliRequest.commandLine.hasOption( CLIManager.VERSION ) ) { - System.out.println(CLIReportingUtils.showVersion()); + System.out.println( CLIReportingUtils.showVersion() ); throw new ExitException( 0 ); } } @@ -417,7 +417,7 @@ protected void configure() eventSpyDispatcher.init( eventSpyContext ); // refresh logger in case container got customized by spy - slf4jLogger = slf4jLoggerFactory.getLogger(this.getClass().getName()); + slf4jLogger = slf4jLoggerFactory.getLogger( this.getClass().getName() ); maven = container.lookup( Maven.class ); diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java index ca65d943a7..0e20f17f8d 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/BatchModeMavenTransferListener.java @@ -1,7 +1,5 @@ package org.apache.maven.cli.transfer; -import java.io.PrintStream; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -21,6 +19,8 @@ * under the License. */ +import java.io.PrintStream; + public class BatchModeMavenTransferListener extends AbstractMavenTransferListener { From becf420bfa4fcac07f294e82ca1ffddae729e1a8 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Sun, 25 Nov 2012 17:50:48 +0000 Subject: [PATCH 28/38] - export JAVA_HOME if it is not set or it commands, like javadoc, that expect it don't work very well git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413378 13f79535-47bb-0310-9956-ffa450edef68 --- apache-maven/src/bin/mvn | 10 +++++----- apache-maven/src/bin/mvnDebug | 10 +++++----- apache-maven/src/bin/mvnyjp | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index ecebe9f393..d9a2d75b1a 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -62,14 +62,14 @@ case "`uname`" in # # Apple JDKs # - JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home fi if [[ -z "$JAVA_HOME" && -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ]] ; then - # - # Oracle JDKs - # - JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + # + # Oracle JDKs + # + export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home fi ;; esac diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug index b7fffc7bb4..14f76b1ad9 100755 --- a/apache-maven/src/bin/mvnDebug +++ b/apache-maven/src/bin/mvnDebug @@ -66,14 +66,14 @@ case "`uname`" in # # Apple JDKs # - JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home fi if [[ -z "$JAVA_HOME" && -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ]] ; then - # - # Oracle JDKs - # - JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + # + # Oracle JDKs + # + export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home fi ;; esac diff --git a/apache-maven/src/bin/mvnyjp b/apache-maven/src/bin/mvnyjp index 99154db73d..d42bc87184 100755 --- a/apache-maven/src/bin/mvnyjp +++ b/apache-maven/src/bin/mvnyjp @@ -70,14 +70,14 @@ case "`uname`" in # # Apple JDKs # - JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home fi if [[ -z "$JAVA_HOME" && -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ]] ; then - # - # Oracle JDKs - # - JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + # + # Oracle JDKs + # + export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home fi if [ -z "$YJP_HOME" ]; then From 7815ab87ad8397747c5980a1cfc1db3541aee391 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Sun, 25 Nov 2012 17:59:36 +0000 Subject: [PATCH 29/38] [maven-release-plugin] prepare release maven-3.1.0 git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413379 13f79535-47bb-0310-9956-ffa450edef68 --- apache-maven/pom.xml | 2 +- maven-aether-provider/pom.xml | 2 +- maven-artifact/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml | 2 +- maven-embedder/pom.xml | 2 +- maven-model-builder/pom.xml | 2 +- maven-model/pom.xml | 2 +- maven-plugin-api/pom.xml | 2 +- maven-repository-metadata/pom.xml | 2 +- maven-settings-builder/pom.xml | 2 +- maven-settings/pom.xml | 2 +- pom.xml | 8 ++++---- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index ce547e777e..aeb177ffa8 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -21,7 +21,7 @@ org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 apache-maven diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml index 6c611771d8..720ebd4a2e 100644 --- a/maven-aether-provider/pom.xml +++ b/maven-aether-provider/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-aether-provider diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index 2b1256e426..2ac838edab 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-artifact diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 3bdb1aa53c..f58bbf05fb 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-compat diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 41e2079298..ad494a3cc7 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-core diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 587398f371..8708ce5f4e 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-embedder diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index a5b1aa196f..868bed97d9 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-model-builder diff --git a/maven-model/pom.xml b/maven-model/pom.xml index f00f6b034c..fc42596f75 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-model diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml index 227f574526..9bfe8a38bc 100644 --- a/maven-plugin-api/pom.xml +++ b/maven-plugin-api/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-plugin-api diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml index 18da94ccb6..70e2f2fd31 100644 --- a/maven-repository-metadata/pom.xml +++ b/maven-repository-metadata/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-repository-metadata diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml index 4538b2da9c..a1cd161815 100644 --- a/maven-settings-builder/pom.xml +++ b/maven-settings-builder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-settings-builder diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml index 01fbd886f8..b4abe63319 100644 --- a/maven-settings/pom.xml +++ b/maven-settings/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-settings diff --git a/pom.xml b/pom.xml index 3b97b69e1f..d568ed2076 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ maven - 3.1-SNAPSHOT + 3.1.0 pom Apache Maven @@ -84,9 +84,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/maven-3/trunk - scm:svn:https://svn.apache.org/repos/asf/maven/maven-3/trunk - http://svn.apache.org/viewvc/maven/maven-3/trunk + scm:svn:http://svn.apache.org/repos/asf/maven/maven-3/tags/maven-3.1.0 + scm:svn:https://svn.apache.org/repos/asf/maven/maven-3/tags/maven-3.1.0 + http://svn.apache.org/viewvc/maven/maven-3/tags/maven-3.1.0 jira From 84b15b971bae90773b29c609b5554ed0afd9edee Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Sun, 25 Nov 2012 17:59:53 +0000 Subject: [PATCH 30/38] [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413381 13f79535-47bb-0310-9956-ffa450edef68 --- apache-maven/pom.xml | 2 +- maven-aether-provider/pom.xml | 2 +- maven-artifact/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml | 2 +- maven-embedder/pom.xml | 2 +- maven-model-builder/pom.xml | 2 +- maven-model/pom.xml | 2 +- maven-plugin-api/pom.xml | 2 +- maven-repository-metadata/pom.xml | 2 +- maven-settings-builder/pom.xml | 2 +- maven-settings/pom.xml | 2 +- pom.xml | 8 ++++---- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index aeb177ffa8..7a10084c34 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -21,7 +21,7 @@ org.apache.maven maven - 3.1.0 + 3.1.1-SNAPSHOT apache-maven diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml index 720ebd4a2e..7d54bafea1 100644 --- a/maven-aether-provider/pom.xml +++ b/maven-aether-provider/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1.0 + 3.1.1-SNAPSHOT maven-aether-provider diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index 2ac838edab..1b59f93417 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1.0 + 3.1.1-SNAPSHOT maven-artifact diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index f58bbf05fb..582d5a952f 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1.0 + 3.1.1-SNAPSHOT maven-compat diff --git a/maven-core/pom.xml b/maven-core/pom.xml index ad494a3cc7..9ab0bed9e2 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1.0 + 3.1.1-SNAPSHOT maven-core diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 8708ce5f4e..f2f0baf589 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1.0 + 3.1.1-SNAPSHOT maven-embedder diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index 868bed97d9..ac7f8c3331 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1.0 + 3.1.1-SNAPSHOT maven-model-builder diff --git a/maven-model/pom.xml b/maven-model/pom.xml index fc42596f75..8ce7653ea0 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1.0 + 3.1.1-SNAPSHOT maven-model diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml index 9bfe8a38bc..0ce243d6cb 100644 --- a/maven-plugin-api/pom.xml +++ b/maven-plugin-api/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1.0 + 3.1.1-SNAPSHOT maven-plugin-api diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml index 70e2f2fd31..70e06201cf 100644 --- a/maven-repository-metadata/pom.xml +++ b/maven-repository-metadata/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1.0 + 3.1.1-SNAPSHOT maven-repository-metadata diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml index a1cd161815..3d2c093e28 100644 --- a/maven-settings-builder/pom.xml +++ b/maven-settings-builder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1.0 + 3.1.1-SNAPSHOT maven-settings-builder diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml index b4abe63319..a35920b252 100644 --- a/maven-settings/pom.xml +++ b/maven-settings/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1.0 + 3.1.1-SNAPSHOT maven-settings diff --git a/pom.xml b/pom.xml index d568ed2076..6fafe2ea4b 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ maven - 3.1.0 + 3.1.1-SNAPSHOT pom Apache Maven @@ -84,9 +84,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/maven-3/tags/maven-3.1.0 - scm:svn:https://svn.apache.org/repos/asf/maven/maven-3/tags/maven-3.1.0 - http://svn.apache.org/viewvc/maven/maven-3/tags/maven-3.1.0 + scm:svn:http://svn.apache.org/repos/asf/maven/maven-3/trunk + scm:svn:https://svn.apache.org/repos/asf/maven/maven-3/trunk + http://svn.apache.org/viewvc/maven/maven-3/trunk jira From b5f1798f2da478ae60ceb0ac5c4935c75827b82d Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Sun, 25 Nov 2012 19:07:27 +0000 Subject: [PATCH 31/38] - revert the release as we're missing MNG-5381 git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413389 13f79535-47bb-0310-9956-ffa450edef68 --- apache-maven/pom.xml | 2 +- maven-aether-provider/pom.xml | 2 +- maven-artifact/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml | 2 +- maven-embedder/pom.xml | 2 +- maven-model-builder/pom.xml | 2 +- maven-model/pom.xml | 2 +- maven-plugin-api/pom.xml | 2 +- maven-repository-metadata/pom.xml | 2 +- maven-settings-builder/pom.xml | 2 +- maven-settings/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 7a10084c34..ce547e777e 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -21,7 +21,7 @@ org.apache.maven maven - 3.1.1-SNAPSHOT + 3.1-SNAPSHOT apache-maven diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml index 7d54bafea1..6c611771d8 100644 --- a/maven-aether-provider/pom.xml +++ b/maven-aether-provider/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1.1-SNAPSHOT + 3.1-SNAPSHOT maven-aether-provider diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index 1b59f93417..2b1256e426 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1.1-SNAPSHOT + 3.1-SNAPSHOT maven-artifact diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 582d5a952f..3bdb1aa53c 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1.1-SNAPSHOT + 3.1-SNAPSHOT maven-compat diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 9ab0bed9e2..41e2079298 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1.1-SNAPSHOT + 3.1-SNAPSHOT maven-core diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index f2f0baf589..587398f371 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1.1-SNAPSHOT + 3.1-SNAPSHOT maven-embedder diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index ac7f8c3331..a5b1aa196f 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1.1-SNAPSHOT + 3.1-SNAPSHOT maven-model-builder diff --git a/maven-model/pom.xml b/maven-model/pom.xml index 8ce7653ea0..f00f6b034c 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1.1-SNAPSHOT + 3.1-SNAPSHOT maven-model diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml index 0ce243d6cb..227f574526 100644 --- a/maven-plugin-api/pom.xml +++ b/maven-plugin-api/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1.1-SNAPSHOT + 3.1-SNAPSHOT maven-plugin-api diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml index 70e06201cf..18da94ccb6 100644 --- a/maven-repository-metadata/pom.xml +++ b/maven-repository-metadata/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1.1-SNAPSHOT + 3.1-SNAPSHOT maven-repository-metadata diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml index 3d2c093e28..4538b2da9c 100644 --- a/maven-settings-builder/pom.xml +++ b/maven-settings-builder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1.1-SNAPSHOT + 3.1-SNAPSHOT maven-settings-builder diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml index a35920b252..01fbd886f8 100644 --- a/maven-settings/pom.xml +++ b/maven-settings/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1.1-SNAPSHOT + 3.1-SNAPSHOT maven-settings diff --git a/pom.xml b/pom.xml index 6fafe2ea4b..3b97b69e1f 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ maven - 3.1.1-SNAPSHOT + 3.1-SNAPSHOT pom Apache Maven From d3756b95cc9c373ec27567093588d2eb21d2d2c1 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Sun, 25 Nov 2012 19:09:44 +0000 Subject: [PATCH 32/38] MNG-5381: Restore MavenSession.getRepositoryCache() for Tycho users so they are not forced to upgrade to 3.1 git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413391 13f79535-47bb-0310-9956-ffa450edef68 --- .../artifact/repository/RepositoryCache.java | 58 +++++++++++++++++++ .../resolver/ArtifactResolutionRequest.java | 9 +++ .../apache/maven/execution/MavenSession.java | 11 ++++ 3 files changed, 78 insertions(+) create mode 100644 maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java new file mode 100644 index 0000000000..3afe33d359 --- /dev/null +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/RepositoryCache.java @@ -0,0 +1,58 @@ +package org.apache.maven.artifact.repository; + +/* + * 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. + */ + +/** + * Caches auxiliary data used during repository access like already processed metadata. The data in the cache is meant + * for exclusive consumption by the repository system and is opaque to the cache implementation. + * + * @author Benjamin Bentmann + */ +@Deprecated +// +// Used by Tycho and will break users and force them to upgrade to Maven 3.1 so we should really leave +// this here, possibly indefinitely. +// +public interface RepositoryCache +{ + + /** + * Puts the specified data into the cache. Warning: The cache will directly save the provided + * reference. If the cached data is mutable, i.e. could be modified after being put into the cache, the caller is + * responsible for creating a copy of the original data and store the copy in the cache. + * + * @param request The repository request from which this cache was retrieved, must not be {@code null}. + * @param key The key to use associate the data with, must not be {@code null}. + * @param data The data to store in the cache, may be {@code null}. + */ + void put( RepositoryRequest request, Object key, Object data ); + + /** + * Gets the specified data from the cache. Warning: The cache will directly return the saved + * reference. If the cached data is to be modified after its retrieval, the caller is responsible to create a copy + * of the returned data and use this instead of the cache record. + * + * @param request The repository request from which this cache was retrieved, must not be {@code null}. + * @param key The key to use for lookup of the data, must not be {@code null}. + * @return The requested data or {@code null} if none was present in the cache. + */ + Object get( RepositoryRequest request, Object key ); + +} diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java index fe8d1f2845..890b466211 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java @@ -26,6 +26,7 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.repository.RepositoryCache; import org.apache.maven.artifact.repository.RepositoryRequest; import org.apache.maven.artifact.resolver.filter.ArtifactFilter; import org.apache.maven.settings.Mirror; @@ -317,4 +318,12 @@ public List getProxies() return proxies; } + // + // Used by Tycho and will break users and force them to upgrade to Maven 3.1 so we should really leave + // this here, possibly indefinitely. + // + public ArtifactResolutionRequest setCache( RepositoryCache cache ) + { + return this; + } } diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java index 21ac3881bc..30ff3332d9 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java +++ b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java @@ -28,6 +28,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.repository.RepositoryCache; import org.apache.maven.monitor.event.EventDispatcher; import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.project.MavenProject; @@ -381,4 +382,14 @@ public RepositorySystemSession getRepositorySession() return repositorySession; } + @Deprecated + // + // Used by Tycho and will break users and force them to upgrade to Maven 3.1 so we should really leave + // this here, possibly indefinitely. + // + public RepositoryCache getRepositoryCache() + { + return null; + } + } From a284ef279c38a968490ae933d07f71b7bab83209 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Sun, 25 Nov 2012 19:23:04 +0000 Subject: [PATCH 33/38] - keep git init script out of the source distribution git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413393 13f79535-47bb-0310-9956-ffa450edef68 --- apache-maven/src/main/assembly/src.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/apache-maven/src/main/assembly/src.xml b/apache-maven/src/main/assembly/src.xml index 634e92250e..8e6d6451ed 100644 --- a/apache-maven/src/main/assembly/src.xml +++ b/apache-maven/src/main/assembly/src.xml @@ -32,6 +32,7 @@ under the License. **/*.log **/.gitignore **/.gitattributes + init-git-svn.sh From 614e7bd17374e9016108e098e3cef9dbec0c4483 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 25 Nov 2012 21:02:47 +0000 Subject: [PATCH 34/38] separate SLF4J export from JSR-330 git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413416 13f79535-47bb-0310-9956-ffa450edef68 --- .../classrealm/DefaultClassRealmManager.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index b1c6d9e6ae..0db5b4b29f 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java @@ -183,6 +183,12 @@ private void importMavenApi( Map imports ) // classworlds (for legacy code) imports.put( "org.codehaus.classworlds", coreRealm ); + // plexus-utils (for DOM-type fields in maven-model) + imports.put( "org.codehaus.plexus.util.xml.Xpp3Dom", coreRealm ); + imports.put( "org.codehaus.plexus.util.xml.pull.XmlPullParser", coreRealm ); + imports.put( "org.codehaus.plexus.util.xml.pull.XmlPullParserException", coreRealm ); + imports.put( "org.codehaus.plexus.util.xml.pull.XmlSerializer", coreRealm ); + // plexus-container, plexus-component-annotations imports.put( "org.codehaus.plexus.*", coreRealm ); imports.put( "org.codehaus.plexus.component", coreRealm ); @@ -193,17 +199,10 @@ private void importMavenApi( Map imports ) imports.put( "org.codehaus.plexus.logging", coreRealm ); imports.put( "org.codehaus.plexus.personality", coreRealm ); - // plexus-utils (for maven-model) - imports.put( "org.codehaus.plexus.util.xml.Xpp3Dom", coreRealm ); - imports.put( "org.codehaus.plexus.util.xml.pull.XmlPullParser", coreRealm ); - imports.put( "org.codehaus.plexus.util.xml.pull.XmlPullParserException", coreRealm ); - imports.put( "org.codehaus.plexus.util.xml.pull.XmlSerializer", coreRealm ); - // javax.inject, sisu-inject (JSR-330) imports.put( "javax.inject.*", coreRealm ); imports.put( "javax.enterprise.inject.*", coreRealm ); imports.put( "org.sonatype.inject.*", coreRealm ); - imports.put( "org.slf4j.*", coreRealm ); // com.google // @@ -218,6 +217,9 @@ private void importMavenApi( Map imports ) // imports.put( "com.google.inject.name.*", coreRealm ); // imports.put( "com.google.inject.spi.*", coreRealm ); // imports.put( "com.google.inject.util.*", coreRealm ); + + // SLF4J + imports.put( "org.slf4j.*", coreRealm ); } /** From 567cd137871f36fc3863d5233c5b9c61b6b5059b Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 25 Nov 2012 21:23:34 +0000 Subject: [PATCH 35/38] fixed typos git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413425 13f79535-47bb-0310-9956-ffa450edef68 --- maven-embedder/src/site/apt/logging.apt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/maven-embedder/src/site/apt/logging.apt b/maven-embedder/src/site/apt/logging.apt index cca01bf974..cb860d0748 100644 --- a/maven-embedder/src/site/apt/logging.apt +++ b/maven-embedder/src/site/apt/logging.apt @@ -24,7 +24,7 @@ Maven Logging Plexus Logger can be injected in Plexus component using Plexus annotations -+------ ++------+ import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; @@ -36,20 +36,20 @@ public class DefaultMyComponent @Requirement private Logger logger; } -+------ ++------+ Starting with Maven 3.1.0, SLF4J Logger can be used directly too, without Plexus. Of course, this will only work when run under Maven 3.1.0, then this technique can be used safely only in Maven core components. -+----- ++-----+ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class Wombat +public class MyClass { - final Logger logger = LoggerFactory.getLogger(Wombat.class); + final Logger logger = LoggerFactory.getLogger( MyClass.class ); } -+----- ++-----+ * Logger Name From 527cee25ef3a4817a55857aa742c92efd91c33d8 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Mon, 26 Nov 2012 03:50:32 +0000 Subject: [PATCH 36/38] - Look for older setups as well, thanks to @mcculls for spotting this git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413474 13f79535-47bb-0310-9956-ffa450edef68 --- apache-maven/src/bin/mvn | 7 +++++++ apache-maven/src/bin/mvnDebug | 7 +++++++ apache-maven/src/bin/mvnyjp | 12 +++++++----- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index d9a2d75b1a..f535d389c7 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -58,6 +58,13 @@ case "`uname`" in # Look for the Apple JDKs first to preserve the existing behaviour, and then look # for the new JDKs provided by Oracle. # + if [[ -z "$JAVA_HOME" && -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ]] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home + fi + if [[ -z "$JAVA_HOME" && -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ]] ; then # # Apple JDKs diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug index 14f76b1ad9..43a09cc5bf 100755 --- a/apache-maven/src/bin/mvnDebug +++ b/apache-maven/src/bin/mvnDebug @@ -62,6 +62,13 @@ case "`uname`" in # Look for the Apple JDKs first to preserve the existing behaviour, and then look # for the new JDKs provided by Oracle. # + if [[ -z "$JAVA_HOME" && -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ]] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home + fi + if [[ -z "$JAVA_HOME" && -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ]] ; then # # Apple JDKs diff --git a/apache-maven/src/bin/mvnyjp b/apache-maven/src/bin/mvnyjp index d42bc87184..ec2f7e0736 100755 --- a/apache-maven/src/bin/mvnyjp +++ b/apache-maven/src/bin/mvnyjp @@ -66,6 +66,13 @@ case "`uname`" in # Look for the Apple JDKs first to preserve the existing behaviour, and then look # for the new JDKs provided by Oracle. # + if [[ -z "$JAVA_HOME" && -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ]] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home + fi + if [[ -z "$JAVA_HOME" && -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ]] ; then # # Apple JDKs @@ -79,11 +86,6 @@ case "`uname`" in # export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home fi - - if [ -z "$YJP_HOME" ]; then - YJP_HOME=/Applications/YourKit_Java_Profiler_11.0.9.app - fi - YJPLIB=$YJP_HOME/bin/mac/libyjpagent.jnilib ;; esac From 29c9b29f68fef9e8bb1ba6ec6e008aac9cf60b49 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Mon, 26 Nov 2012 05:07:15 +0000 Subject: [PATCH 37/38] [maven-release-plugin] prepare release maven-3.1.0 git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413479 13f79535-47bb-0310-9956-ffa450edef68 --- apache-maven/pom.xml | 2 +- maven-aether-provider/pom.xml | 2 +- maven-artifact/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml | 2 +- maven-embedder/pom.xml | 2 +- maven-model-builder/pom.xml | 2 +- maven-model/pom.xml | 2 +- maven-plugin-api/pom.xml | 2 +- maven-repository-metadata/pom.xml | 2 +- maven-settings-builder/pom.xml | 2 +- maven-settings/pom.xml | 2 +- pom.xml | 8 ++++---- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index ce547e777e..aeb177ffa8 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -21,7 +21,7 @@ org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 apache-maven diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml index 6c611771d8..720ebd4a2e 100644 --- a/maven-aether-provider/pom.xml +++ b/maven-aether-provider/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-aether-provider diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index 2b1256e426..2ac838edab 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-artifact diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 3bdb1aa53c..f58bbf05fb 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-compat diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 41e2079298..ad494a3cc7 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-core diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 587398f371..8708ce5f4e 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-embedder diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index a5b1aa196f..868bed97d9 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-model-builder diff --git a/maven-model/pom.xml b/maven-model/pom.xml index f00f6b034c..fc42596f75 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-model diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml index 227f574526..9bfe8a38bc 100644 --- a/maven-plugin-api/pom.xml +++ b/maven-plugin-api/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-plugin-api diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml index 18da94ccb6..70e2f2fd31 100644 --- a/maven-repository-metadata/pom.xml +++ b/maven-repository-metadata/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-repository-metadata diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml index 4538b2da9c..a1cd161815 100644 --- a/maven-settings-builder/pom.xml +++ b/maven-settings-builder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-settings-builder diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml index 01fbd886f8..b4abe63319 100644 --- a/maven-settings/pom.xml +++ b/maven-settings/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1-SNAPSHOT + 3.1.0 maven-settings diff --git a/pom.xml b/pom.xml index 3b97b69e1f..d568ed2076 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ maven - 3.1-SNAPSHOT + 3.1.0 pom Apache Maven @@ -84,9 +84,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/maven-3/trunk - scm:svn:https://svn.apache.org/repos/asf/maven/maven-3/trunk - http://svn.apache.org/viewvc/maven/maven-3/trunk + scm:svn:http://svn.apache.org/repos/asf/maven/maven-3/tags/maven-3.1.0 + scm:svn:https://svn.apache.org/repos/asf/maven/maven-3/tags/maven-3.1.0 + http://svn.apache.org/viewvc/maven/maven-3/tags/maven-3.1.0 jira From fcffe3c9d5ceb65c229b07f60ad4d215f5cd05e2 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Mon, 26 Nov 2012 05:07:28 +0000 Subject: [PATCH 38/38] [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413481 13f79535-47bb-0310-9956-ffa450edef68 --- apache-maven/pom.xml | 2 +- maven-aether-provider/pom.xml | 2 +- maven-artifact/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml | 2 +- maven-embedder/pom.xml | 2 +- maven-model-builder/pom.xml | 2 +- maven-model/pom.xml | 2 +- maven-plugin-api/pom.xml | 2 +- maven-repository-metadata/pom.xml | 2 +- maven-settings-builder/pom.xml | 2 +- maven-settings/pom.xml | 2 +- pom.xml | 8 ++++---- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index aeb177ffa8..ce547e777e 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -21,7 +21,7 @@ org.apache.maven maven - 3.1.0 + 3.1-SNAPSHOT apache-maven diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml index 720ebd4a2e..6c611771d8 100644 --- a/maven-aether-provider/pom.xml +++ b/maven-aether-provider/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1.0 + 3.1-SNAPSHOT maven-aether-provider diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index 2ac838edab..2b1256e426 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1.0 + 3.1-SNAPSHOT maven-artifact diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index f58bbf05fb..3bdb1aa53c 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1.0 + 3.1-SNAPSHOT maven-compat diff --git a/maven-core/pom.xml b/maven-core/pom.xml index ad494a3cc7..41e2079298 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1.0 + 3.1-SNAPSHOT maven-core diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 8708ce5f4e..587398f371 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1.0 + 3.1-SNAPSHOT maven-embedder diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index 868bed97d9..a5b1aa196f 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -16,7 +16,7 @@ org.apache.maven maven - 3.1.0 + 3.1-SNAPSHOT maven-model-builder diff --git a/maven-model/pom.xml b/maven-model/pom.xml index fc42596f75..f00f6b034c 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1.0 + 3.1-SNAPSHOT maven-model diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml index 9bfe8a38bc..227f574526 100644 --- a/maven-plugin-api/pom.xml +++ b/maven-plugin-api/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1.0 + 3.1-SNAPSHOT maven-plugin-api diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml index 70e2f2fd31..18da94ccb6 100644 --- a/maven-repository-metadata/pom.xml +++ b/maven-repository-metadata/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1.0 + 3.1-SNAPSHOT maven-repository-metadata diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml index a1cd161815..4538b2da9c 100644 --- a/maven-settings-builder/pom.xml +++ b/maven-settings-builder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1.0 + 3.1-SNAPSHOT maven-settings-builder diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml index b4abe63319..01fbd886f8 100644 --- a/maven-settings/pom.xml +++ b/maven-settings/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven - 3.1.0 + 3.1-SNAPSHOT maven-settings diff --git a/pom.xml b/pom.xml index d568ed2076..3b97b69e1f 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ maven - 3.1.0 + 3.1-SNAPSHOT pom Apache Maven @@ -84,9 +84,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/maven-3/tags/maven-3.1.0 - scm:svn:https://svn.apache.org/repos/asf/maven/maven-3/tags/maven-3.1.0 - http://svn.apache.org/viewvc/maven/maven-3/tags/maven-3.1.0 + scm:svn:http://svn.apache.org/repos/asf/maven/maven-3/trunk + scm:svn:https://svn.apache.org/repos/asf/maven/maven-3/trunk + http://svn.apache.org/viewvc/maven/maven-3/trunk jira