[maven] 01/06: Merge tag 'upstream/3.0.5'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven.

commit 9b2f65a7e795e56f84f15fb3396e3b1572276f03
Merge: d18d2bd b82c56f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 21 16:47:36 2013 +0200

    Merge tag 'upstream/3.0.5'
    
    Upstream version 3.0.5

 .gitignore                        |    1 +
 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                |   89 +++++++++++--------------------------
 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                           |   31 +++++++++----
 14 files changed, 59 insertions(+), 84 deletions(-)

diff --cc .gitignore
index 9339b64,adc6c00..ca5efa1
--- a/.gitignore
+++ b/.gitignore
@@@ -7,6 -7,6 +7,7 @@@ bin
  # Intellij
  *.ipr
  *.iml
+ .idea
  
  .DS_Store
 +.pc

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven.git