You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2016/06/02 22:08:46 UTC
[01/50] maven git commit: [MNG-5984] Maven core extension resolution
ignores repositories from activeByDefault profiles in settings.xml [Forced
Update!]
Repository: maven
Updated Branches:
refs/heads/slf4j-gossip b9e9d329e -> ad7508ce2 (forced update)
[MNG-5984] Maven core extension resolution ignores repositories from activeByDefault profiles in settings.xml
o Updated to process command line options before processing any
settings. Profile activation needs to be performed with any
options already in effect.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c940b841
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c940b841
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c940b841
Branch: refs/heads/slf4j-gossip
Commit: c940b84107d6df72d625529a7df3402ef6b4e12b
Parents: 425289c
Author: Christian Schulte <sc...@apache.org>
Authored: Fri Feb 26 18:31:58 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Fri Feb 26 18:31:58 2016 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/maven/settings/SettingsUtils.java | 2 +-
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/c940b841/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java b/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java
index 8da696e..16ccdb6 100644
--- a/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/settings/SettingsUtils.java
@@ -139,7 +139,7 @@ public final class SettingsUtils
profile.setId( settingsProfile.getId() );
- profile.setSource( "settings.xml" );
+ profile.setSource( org.apache.maven.model.Profile.SOURCE_SETTINGS );
Activation settingsActivation = settingsProfile.getActivation();
http://git-wip-us.apache.org/repos/asf/maven/blob/c940b841/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
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 04f504e..93b25d6 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
@@ -280,9 +280,9 @@ public class MavenCli
properties( cliRequest );
localContainer = container( cliRequest );
commands( cliRequest );
+ populateRequest( cliRequest );
configure( cliRequest );
toolchains( cliRequest );
- populateRequest( cliRequest );
encryption( cliRequest );
repository( cliRequest );
return execute( cliRequest );
[03/50] maven git commit: [MNG-5984] Maven core extension resolution
ignores repositories from activeByDefault profiles in settings.xml
Posted by hb...@apache.org.
[MNG-5984] Maven core extension resolution ignores repositories from activeByDefault profiles in settings.xml
o Updated to make any repositories from settings available to the model resolver
used to resolve core extensions.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5a4d5481
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5a4d5481
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5a4d5481
Branch: refs/heads/slf4j-gossip
Commit: 5a4d54810378e0abf28d7cc6768d74d4d3a5cc2b
Parents: 62374f5
Author: Christian Schulte <sc...@apache.org>
Authored: Fri Feb 26 22:57:45 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Fri Feb 26 22:57:45 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/maven/cli/MavenCli.java | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/5a4d5481/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
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 93af417..c5a2256 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
@@ -296,6 +296,7 @@ public class MavenCli
populateRequest( cliRequest );
encryption( cliRequest );
repository( cliRequest );
+ profiles( cliRequest );
return execute( cliRequest );
}
catch ( ExitException e )
@@ -670,6 +671,10 @@ public class MavenCli
request = executionRequestPopulator.populateDefaults( request );
+ profileSelector = container.lookup( ProfileSelector.class );
+
+ profiles( request );
+
BootstrapCoreExtensionManager resolver = container.lookup( BootstrapCoreExtensionManager.class );
return Collections.unmodifiableList( resolver.loadCoreExtensions( request, providedArtifacts,
@@ -866,9 +871,16 @@ public class MavenCli
{
cliRequest.request.setUseLegacyLocalRepository( true );
}
+ }
- // Adds repositories from settings profiles.
- final MavenExecutionRequest request = cliRequest.getRequest();
+ private void profiles( final CliRequest request )
+ {
+ this.profiles( request.getRequest() );
+ }
+
+ private void profiles( final MavenExecutionRequest request )
+ {
+ // Adds repositories from profiles.
final DefaultProfileActivationContext profileActivationContext = new DefaultProfileActivationContext();
profileActivationContext.setActiveProfileIds( request.getActiveProfiles() );
profileActivationContext.setInactiveProfileIds( request.getInactiveProfiles() );
[14/50] maven git commit: [MNG-6003] Drastically reduce JAVA_HOME
discovery code
Posted by hb...@apache.org.
[MNG-6003] Drastically reduce JAVA_HOME discovery code
All special handling has been removed. JAVA_HOME must be set properly by
the user if necessary. Error messages have been graciously borrowed from
the Tomcat start scripts.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/6c4627bd
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6c4627bd
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6c4627bd
Branch: refs/heads/slf4j-gossip
Commit: 6c4627bd463dc080cb00c01a27b4ff830cbd5702
Parents: 70e2afd
Author: Michael Osipov <mi...@apache.org>
Authored: Fri Apr 15 22:17:15 2016 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Tue May 3 21:17:57 2016 +0200
----------------------------------------------------------------------
apache-maven/src/bin/mvn | 84 ++++-----------------------------------
apache-maven/src/bin/mvn.cmd | 54 ++++++++++++-------------
2 files changed, 34 insertions(+), 104 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/6c4627bd/apache-maven/src/bin/mvn
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 672efbf..2a88df2 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -41,52 +41,12 @@ fi
# OS specific support. $var _must_ be set to either true or false.
cygwin=false;
-darwin=false;
mingw=false;
case "`uname`" in
CYGWIN*) cygwin=true;;
MINGW*) mingw=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.
- #
- 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
- #
- export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
- fi
-
- if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then
- #
- # Oracle JDKs
- #
- export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
- fi
-
- if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
- #
- # Apple JDKs
- #
- export JAVA_HOME=`/usr/libexec/java_home`
- fi
- ;;
esac
-if [ -z "$JAVA_HOME" ] ; then
- if [ -r /etc/gentoo-release ] ; then
- JAVA_HOME=`java-config --jre-home`
- fi
-fi
-
## resolve links - $0 may be a link to Maven's home
PRG="$0"
@@ -129,49 +89,19 @@ if $mingw ; then
# TODO classpath?
fi
-if [ -z "$JAVA_HOME" ]; then
- javaExecutable="`which javac`"
- if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
- # readlink(1) is not available as standard on Solaris 10.
- readLink=`which readlink`
- if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
- if $darwin ; then
- javaHome="`dirname \"$javaExecutable\"`"
- javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
- else
- javaExecutable="`readlink -f \"$javaExecutable\"`"
- fi
- javaHome="`dirname \"$javaExecutable\"`"
- javaHome=`expr "$javaHome" : '\(.*\)/bin'`
- JAVA_HOME="$javaHome"
- export JAVA_HOME
- fi
- fi
-fi
-
-if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- else
- JAVACMD="`which java`"
- fi
+if [ -z "$JAVA_HOME" ] ; then
+ JAVACMD="`which java`"
+else
+ JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
- echo "Error: JAVA_HOME is not defined correctly." >&2
- echo " We cannot execute $JAVACMD" >&2
+ echo "The JAVA_HOME environment variable is not defined correctly" >&2
+ echo "This environment variable is needed to run this program" >&2
+ echo "NB: JAVA_HOME should point to a JDK not a JRE" >&2
exit 1
fi
-if [ -z "$JAVA_HOME" ] ; then
- echo "Warning: JAVA_HOME environment variable is not set."
-fi
-
CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
CLASSWORLDS_JAR=`echo "${MAVEN_HOME}"/boot/plexus-classworlds-*.jar`
http://git-wip-us.apache.org/repos/asf/maven/blob/6c4627bd/apache-maven/src/bin/mvn.cmd
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index 9023459..274b065 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -30,10 +30,10 @@
@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
@echo off
@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+@if "%MAVEN_BATCH_ECHO%"=="on" echo %MAVEN_BATCH_ECHO%
@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPre
@REM check for pre script, once with legacy .bat ending and once with .cmd ending
if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat"
if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd"
@@ -44,24 +44,19 @@ if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd"
set ERROR_CODE=0
@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
+if not "%JAVA_HOME%"=="" goto OkJHome
+for %%i in (java.exe) do set "JAVACMD=%%~$PATH:i"
+goto checkJCmd
:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto chkMHome
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
+set "JAVACMD=%JAVA_HOME%\bin\java.exe"
+
+:checkJCmd
+if exist "%JAVACMD%" goto chkMHome
+
+echo The JAVA_HOME environment variable is not defined correctly >&2
+echo This environment variable is needed to run this program >&2
+echo NB: JAVA_HOME should point to a JDK not a JRE >&2
goto error
:chkMHome
@@ -114,7 +109,7 @@ cd "%EXEC_DIR%"
:endDetectBaseDir
set "jvmConfig=\.mvn\jvm.config"
-if not exist "%MAVEN_PROJECTBASEDIR%%jvmConfig%" goto endReadAdditionalConfig
+if not exist "%MAVEN_PROJECTBASEDIR%%jvmConfig%" goto endReadAdditionalConfig
@setlocal EnableExtensions EnableDelayedExpansion
for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
@@ -122,13 +117,18 @@ for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do s
:endReadAdditionalConfig
-set MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-
-for %%i in ("%MAVEN_HOME%"\boot\plexus-classworlds-*) do set CLASSWORLDS_JAR="%%i"
-
set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+for %%i in ("%MAVEN_HOME%"\boot\plexus-classworlds-*) do set CLASSWORLDS_JAR="%%i"
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%MAVEN_HOME%\bin\m2.conf" "-Dmaven.home=%MAVEN_HOME%" "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
+"%JAVACMD%" ^
+ %JVM_CONFIG_MAVEN_PROPS% ^
+ %MAVEN_OPTS% ^
+ %MAVEN_DEBUG_OPTS% ^
+ -classpath %CLASSWORLDS_JAR% ^
+ "-Dclassworlds.conf=%MAVEN_HOME%\bin\m2.conf" ^
+ "-Dmaven.home=%MAVEN_HOME%" ^
+ "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+ %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
if ERRORLEVEL 1 goto error
goto end
@@ -138,15 +138,15 @@ set ERROR_CODE=1
:end
@endlocal & set ERROR_CODE=%ERROR_CODE%
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
@REM check for post script, once with legacy .bat ending and once with .cmd ending
if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
:skipRcPost
@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
+if "%MAVEN_BATCH_PAUSE%"=="on" pause
-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
exit /B %ERROR_CODE%
[39/50] maven git commit: [MNG-5951] add an option to avoid path
addition to inherited URLs
Posted by hb...@apache.org.
[MNG-5951] add an option to avoid path addition to inherited URLs
This is done as child.inherit.append.path XML attribute on 3 locations:
- project, for project.url
- project.distributionManagement.site for its url
- project.scm, for the 3 scm urls in one unique config
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/bd825c53
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/bd825c53
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/bd825c53
Branch: refs/heads/slf4j-gossip
Commit: bd825c5350b0e0ec10f53667767274004afb5e0d
Parents: 9c13922
Author: Herv� Boutemy <hb...@apache.org>
Authored: Wed Dec 23 14:49:20 2015 +0100
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Mon May 30 21:45:47 2016 +0200
----------------------------------------------------------------------
.../DefaultInheritanceAssembler.java | 5 +-
.../maven/model/merge/MavenModelMerger.java | 12 +--
.../DefaultInheritanceAssemblerTest.java | 10 ++
.../poms/inheritance/no-append-urls-child.xml | 34 ++++++
.../inheritance/no-append-urls-expected.xml | 50 +++++++++
.../poms/inheritance/no-append-urls-parent.xml | 50 +++++++++
maven-model/src/main/mdo/maven.mdo | 106 ++++++++++++++++++-
7 files changed, 256 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/bd825c53/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
index 58d93a7..c59c7a4 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
@@ -139,12 +139,13 @@ public class DefaultInheritanceAssembler
{
@Override
- protected String extrapolateChildUrl( String parentUrl, Map<Object, Object> context )
+ protected String extrapolateChildUrl( String parentUrl, boolean appendPath, Map<Object, Object> context )
{
Object childDirectory = context.get( CHILD_DIRECTORY );
Object childPathAdjustment = context.get( CHILD_PATH_ADJUSTMENT );
- if ( StringUtils.isBlank( parentUrl ) || childDirectory == null || childPathAdjustment == null )
+ if ( StringUtils.isBlank( parentUrl ) || childDirectory == null || childPathAdjustment == null
+ || !appendPath )
{
return parentUrl;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/bd825c53/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java b/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
index 0007af5..cae9d73 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
@@ -102,7 +102,7 @@ public class MavenModelMerger
}
else if ( target.getUrl() == null )
{
- target.setUrl( extrapolateChildUrl( src, context ) );
+ target.setUrl( extrapolateChildUrl( src, source.isChildInheritAppendPath(), context ) );
target.setLocation( "url", source.getLocation( "url" ) );
}
}
@@ -466,7 +466,7 @@ public class MavenModelMerger
}
else if ( target.getUrl() == null )
{
- target.setUrl( extrapolateChildUrl( src, context ) );
+ target.setUrl( extrapolateChildUrl( src, source.isChildInheritAppendPath(), context ) );
target.setLocation( "url", source.getLocation( "url" ) );
}
}
@@ -485,7 +485,7 @@ public class MavenModelMerger
}
else if ( target.getUrl() == null )
{
- target.setUrl( extrapolateChildUrl( src, context ) );
+ target.setUrl( extrapolateChildUrl( src, source.isChildInheritAppendPath(), context ) );
target.setLocation( "url", source.getLocation( "url" ) );
}
}
@@ -504,7 +504,7 @@ public class MavenModelMerger
}
else if ( target.getConnection() == null )
{
- target.setConnection( extrapolateChildUrl( src, context ) );
+ target.setConnection( extrapolateChildUrl( src, source.isChildInheritAppendPath(), context ) );
target.setLocation( "connection", source.getLocation( "connection" ) );
}
}
@@ -524,7 +524,7 @@ public class MavenModelMerger
}
else if ( target.getDeveloperConnection() == null )
{
- target.setDeveloperConnection( extrapolateChildUrl( src, context ) );
+ target.setDeveloperConnection( extrapolateChildUrl( src, source.isChildInheritAppendPath(), context ) );
target.setLocation( "developerConnection", source.getLocation( "developerConnection" ) );
}
}
@@ -670,7 +670,7 @@ public class MavenModelMerger
return exclusion.getGroupId() + ':' + exclusion.getArtifactId();
}
- protected String extrapolateChildUrl( String parentUrl, Map<Object, Object> context )
+ protected String extrapolateChildUrl( String parentUrl, boolean appendPath, Map<Object, Object> context )
{
return parentUrl;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/bd825c53/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
index 9d88f5f..d49e8df 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
@@ -98,6 +98,16 @@ public class DefaultInheritanceAssemblerTest
}
/**
+ * MNG-5951 child.inherit.append.path="false" test
+ * @throws Exception
+ */
+ public void testNoAppendUrls()
+ throws Exception
+ {
+ testInheritance( "no-append-urls" );
+ }
+
+ /**
* Tricky case: flat directory structure, but child directory != artifactId.
* Model interpolation does not give same result when calculated from build or from repo...
* This is why MNG-5000 fix in code is marked as bad practice (uses file names)
http://git-wip-us.apache.org/repos/asf/maven/blob/bd825c53/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-child.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-child.xml b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-child.xml
new file mode 100644
index 0000000..d7cc4d0
--- /dev/null
+++ b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-child.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>inheritance</groupId>
+ <artifactId>parent</artifactId>
+ <version>11-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>inheritance</artifactId><!-- same as directory name -->
+ <name>Model urls inheritance test child</name>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/bd825c53/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-expected.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-expected.xml b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-expected.xml
new file mode 100644
index 0000000..d2a8cfe
--- /dev/null
+++ b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-expected.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>inheritance</groupId>
+ <artifactId>parent</artifactId>
+ <version>11-SNAPSHOT</version>
+ </parent>
+
+ <groupId>inheritance</groupId>
+ <artifactId>inheritance</artifactId>
+ <version>11-SNAPSHOT</version>
+ <name>Model urls inheritance test child</name>
+ <description>MNG-5951 child.inherit.append.path="false" for each url to avoid automatic path addition when inheriting</description>
+
+ <!-- 5 inherited urls without anything added to parent -->
+ <url>http://www.apache.org/path/to/parent/</url>
+ <scm>
+ <connection>scm:my-scm:http://domain.org/base</connection>
+ <developerConnection>scm:my-scm:https://domain.org/base/</developerConnection>
+ <url>https://domain.org/base</url>
+ </scm>
+ <distributionManagement>
+ <site>
+ <url>scp://scp.domain.org/base/</url>
+ </site>
+ </distributionManagement>
+</project>
http://git-wip-us.apache.org/repos/asf/maven/blob/bd825c53/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-parent.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-parent.xml b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-parent.xml
new file mode 100644
index 0000000..e8bc165
--- /dev/null
+++ b/maven-model-builder/src/test/resources/poms/inheritance/no-append-urls-parent.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ child.inherit.append.path="false">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>inheritance</groupId>
+ <artifactId>parent</artifactId>
+ <version>11-SNAPSHOT</version>
+
+ <name>Model urls inheritance test parent</name>
+ <description>MNG-5951 child.inherit.append.path="false" for each url to avoid automatic path addition when inheriting</description>
+
+ <modules>
+ <module>../inheritance</module>
+ </modules>
+
+ <!-- 5 urls in the pom to configure for not adding path -->
+ <url>http://www.apache.org/path/to/parent/</url>
+ <scm child.inherit.append.path="false">
+ <connection>scm:my-scm:http://domain.org/base</connection>
+ <developerConnection>scm:my-scm:https://domain.org/base/</developerConnection>
+ <url>https://domain.org/base</url>
+ </scm>
+ <distributionManagement>
+ <site child.inherit.append.path="false">
+ <url>scp://scp.domain.org/base/</url>
+ </site>
+ </distributionManagement>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/bd825c53/maven-model/src/main/mdo/maven.mdo
----------------------------------------------------------------------
diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo
index 5eba3ea..a737fe9 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -245,7 +245,21 @@
<description>
<![CDATA[
The URL to the project's homepage.
- <br /><b>Default value is</b>: parent value [+ path adjustment] + artifactId
+ <br /><b>Default value is</b>: parent value [+ path adjustment] + artifactId, or just parent value if
+ <code>child.urls.inherit.append.path="false"</code>
+ ]]>
+ </description>
+ <type>String</type>
+ </field>
+ <field xml.attribute="true" xml.tagName="child.inherit.append.path">
+ <name>childInheritAppendPath</name>
+ <version>4.0.0+</version>
+ <description>
+ <![CDATA[
+ When childs inherit from urls, append path or not?. Note: While the type
+ of this field is <code>String</code> for technical reasons, the semantic type is actually
+ <code>Boolean</code>
+ <br /><b>Default value is</b>: <code>true</code>
]]>
</description>
<type>String</type>
@@ -630,6 +644,24 @@
]]>
</code>
</codeSegment>
+ <codeSegment>
+ <version>4.0.0+</version>
+ <code>
+ <![CDATA[
+
+ public boolean isChildInheritAppendPath()
+ {
+ return ( childInheritAppendPath != null ) ? Boolean.parseBoolean( childInheritAppendPath ) : true;
+ }
+
+ public void setChildInheritAppendPath( boolean childInheritAppendPath )
+ {
+ this.childInheritAppendPath = String.valueOf( childInheritAppendPath );
+ }
+
+ ]]>
+ </code>
+ </codeSegment>
</codeSegments>
</class>
<class java.clone="deep">
@@ -2172,12 +2204,46 @@
<description>
<![CDATA[
The URL to the project's browsable SCM repository, such as ViewVC or Fisheye.
- <br /><b>Default value is</b>: parent value [+ path adjustment] + artifactId
+ <br /><b>Default value is</b>: parent value [+ path adjustment] + artifactId, or just parent value if
+ <code>child.urls.inherit.append.path="false"</code>
+ ]]>
+ </description>
+ <type>String</type>
+ </field>
+ <field xml.attribute="true" xml.tagName="child.inherit.append.path">
+ <name>childInheritAppendPath</name>
+ <version>4.0.0+</version>
+ <description>
+ <![CDATA[
+ When childs inherit from urls, append path or not?. Note: While the type
+ of this field is <code>String</code> for technical reasons, the semantic type is actually
+ <code>Boolean</code>
+ <br /><b>Default value is</b>: <code>true</code>
]]>
</description>
<type>String</type>
</field>
</fields>
+ <codeSegments>
+ <codeSegment>
+ <version>4.0.0+</version>
+ <code>
+ <![CDATA[
+
+ public boolean isChildInheritAppendPath()
+ {
+ return ( childInheritAppendPath != null ) ? Boolean.parseBoolean( childInheritAppendPath ) : true;
+ }
+
+ public void setChildInheritAppendPath( boolean childInheritAppendPath )
+ {
+ this.childInheritAppendPath = String.valueOf( childInheritAppendPath );
+ }
+
+ ]]>
+ </code>
+ </codeSegment>
+ </codeSegments>
</class>
<class>
<name>FileSet</name>
@@ -2605,12 +2671,46 @@
<description>
<![CDATA[
The url of the location where website is deployed, in the form <code>protocol://hostname/path</code>.
- <br /><b>Default value is</b>: parent value [+ path adjustment] + artifactId
+ <br /><b>Default value is</b>: parent value [+ path adjustment] + artifactId, or just parent value if
+ <code>child.urls.inherit.append.path="false"</code>
+ ]]>
+ </description>
+ <type>String</type>
+ </field>
+ <field xml.attribute="true" xml.tagName="child.inherit.append.path">
+ <name>childInheritAppendPath</name>
+ <version>4.0.0+</version>
+ <description>
+ <![CDATA[
+ When childs inherit from urls, append path or not?. Note: While the type
+ of this field is <code>String</code> for technical reasons, the semantic type is actually
+ <code>Boolean</code>
+ <br /><b>Default value is</b>: <code>true</code>
]]>
</description>
<type>String</type>
</field>
</fields>
+ <codeSegments>
+ <codeSegment>
+ <version>4.0.0+</version>
+ <code>
+ <![CDATA[
+
+ public boolean isChildInheritAppendPath()
+ {
+ return ( childInheritAppendPath != null ) ? Boolean.parseBoolean( childInheritAppendPath ) : true;
+ }
+
+ public void setChildInheritAppendPath( boolean childInheritAppendPath )
+ {
+ this.childInheritAppendPath = String.valueOf( childInheritAppendPath );
+ }
+
+ ]]>
+ </code>
+ </codeSegment>
+ </codeSegments>
</class>
<class java.clone="deep">
[35/50] maven git commit: updated parent pom
Posted by hb...@apache.org.
updated parent pom
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e076fd26
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e076fd26
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e076fd26
Branch: refs/heads/slf4j-gossip
Commit: e076fd26454c466dfdca117d5038e9921f0034cd
Parents: ead1654
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sat May 28 21:59:52 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Sat May 28 21:59:52 2016 +0200
----------------------------------------------------------------------
pom.xml | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/e076fd26/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9eadbe2..2ba3018 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>27</version>
+ <version>30</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
@@ -475,11 +475,6 @@ under the License.
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <version>1.1</version>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
[27/50] maven git commit: Add a ProjectArtifactsCache similar to
PluginArtifactsCache
Posted by hb...@apache.org.
Add a ProjectArtifactsCache similar to PluginArtifactsCache
Signed-off-by: Jason van Zyl <ja...@vanzyl.ca>
closes #82
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7277a846
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7277a846
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7277a846
Branch: refs/heads/slf4j-gossip
Commit: 7277a8464ba453aeacb82b22ffd966c9fb17c620
Parents: 4b35102
Author: Anton Tanasenko <at...@gmail.com>
Authored: Wed May 18 18:40:28 2016 +0300
Committer: Jason van Zyl <ja...@vanzyl.ca>
Committed: Thu May 19 20:40:10 2016 -0400
----------------------------------------------------------------------
.../internal/LifecycleDependencyResolver.java | 34 ++-
.../plugin/DefaultProjectArtifactsCache.java | 256 +++++++++++++++++++
.../maven/plugin/ProjectArtifactsCache.java | 90 +++++++
3 files changed, 377 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/7277a846/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
index 0947ed3..d83a8f4 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
@@ -37,6 +37,7 @@ import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.eventspy.internal.EventSpyDispatcher;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.LifecycleExecutionException;
+import org.apache.maven.plugin.ProjectArtifactsCache;
import org.apache.maven.project.DefaultDependencyResolutionRequest;
import org.apache.maven.project.DependencyResolutionException;
import org.apache.maven.project.DependencyResolutionResult;
@@ -75,6 +76,9 @@ public class LifecycleDependencyResolver
@Inject
private EventSpyDispatcher eventSpyDispatcher;
+
+ @Inject
+ private ProjectArtifactsCache projectArtifactsCache;
public LifecycleDependencyResolver()
{
@@ -123,9 +127,33 @@ public class LifecycleDependencyResolver
throw new LifecycleExecutionException( e );
}
}
-
- Set<Artifact> artifacts =
- getDependencies( project, scopesToCollect, scopesToResolve, session, aggregating, projectArtifacts );
+
+ Set<Artifact> artifacts;
+ ProjectArtifactsCache.Key cacheKey = projectArtifactsCache.createKey( project, scopesToCollect,
+ scopesToResolve, aggregating, session.getRepositorySession() );
+ ProjectArtifactsCache.CacheRecord recordArtifacts;
+ recordArtifacts = projectArtifactsCache.get( cacheKey );
+
+ if ( recordArtifacts != null )
+ {
+ artifacts = recordArtifacts.artifacts;
+ }
+ else
+ {
+ try
+ {
+ artifacts = getDependencies( project, scopesToCollect, scopesToResolve, session, aggregating,
+ projectArtifacts );
+ recordArtifacts = projectArtifactsCache.put( cacheKey, artifacts );
+ }
+ catch ( LifecycleExecutionException e )
+ {
+ projectArtifactsCache.put( cacheKey, e );
+ projectArtifactsCache.register( project, cacheKey, recordArtifacts );
+ throw e;
+ }
+ }
+ projectArtifactsCache.register( project, cacheKey, recordArtifacts );
project.setResolvedArtifacts( artifacts );
http://git-wip-us.apache.org/repos/asf/maven/blob/7277a846/maven-core/src/main/java/org/apache/maven/plugin/DefaultProjectArtifactsCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultProjectArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultProjectArtifactsCache.java
new file mode 100644
index 0000000..1eaa627
--- /dev/null
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultProjectArtifactsCache.java
@@ -0,0 +1,256 @@
+package org.apache.maven.plugin;
+
+/*
+ * 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.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.commons.lang3.Validate;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.lifecycle.LifecycleExecutionException;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.component.annotations.Component;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.repository.LocalRepository;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.repository.WorkspaceRepository;
+
+/**
+ * @author Igor Fedorenko
+ * @author Benjamin Bentmann
+ * @author Anton Tanasenko
+ */
+@Component( role = ProjectArtifactsCache.class )
+public class DefaultProjectArtifactsCache
+ implements ProjectArtifactsCache
+{
+
+ protected static class CacheKey
+ implements Key
+ {
+
+ private final String groupId;
+
+ private final String artifactId;
+
+ private final String version;
+
+ private final Set<String> dependencyArtifacts;
+
+ private final WorkspaceRepository workspace;
+
+ private final LocalRepository localRepo;
+
+ private final List<RemoteRepository> repositories;
+
+ private final Set<String> collect;
+
+ private final Set<String> resolve;
+
+ private boolean aggregating;
+
+ private final int hashCode;
+
+ public CacheKey( MavenProject project, List<RemoteRepository> repositories,
+ Collection<String> scopesToCollect, Collection<String> scopesToResolve, boolean aggregating,
+ RepositorySystemSession session )
+ {
+
+ groupId = project.getGroupId();
+ artifactId = project.getArtifactId();
+ version = project.getVersion();
+
+ Set<String> deps = new HashSet<>();
+ if ( project.getDependencyArtifacts() != null )
+ {
+ for ( Artifact dep: project.getDependencyArtifacts() )
+ {
+ deps.add( dep.toString() );
+ }
+ }
+ dependencyArtifacts = Collections.unmodifiableSet( deps );
+
+ workspace = CacheUtils.getWorkspace( session );
+ this.localRepo = session.getLocalRepository();
+ this.repositories = new ArrayList<>( repositories.size() );
+ for ( RemoteRepository repository : repositories )
+ {
+ if ( repository.isRepositoryManager() )
+ {
+ this.repositories.addAll( repository.getMirroredRepositories() );
+ }
+ else
+ {
+ this.repositories.add( repository );
+ }
+ }
+ collect = scopesToCollect == null
+ ? Collections.<String>emptySet()
+ : Collections.unmodifiableSet( new HashSet<>( scopesToCollect ) );
+ resolve = scopesToResolve == null
+ ? Collections.<String>emptySet()
+ : Collections.unmodifiableSet( new HashSet<>( scopesToResolve ) );
+ this.aggregating = aggregating;
+
+ int hash = 17;
+ hash = hash * 31 + hash( groupId );
+ hash = hash * 31 + hash( artifactId );
+ hash = hash * 31 + hash( version );
+ hash = hash * 31 + hash( dependencyArtifacts );
+ hash = hash * 31 + hash( workspace );
+ hash = hash * 31 + hash( localRepo );
+ hash = hash * 31 + CacheUtils.repositoriesHashCode( repositories );
+ hash = hash * 31 + hash( collect );
+ hash = hash * 31 + hash( resolve );
+ hash = hash * 31 + hash( aggregating );
+ this.hashCode = hash;
+ }
+
+ @Override
+ public String toString()
+ {
+ return groupId + ":" + artifactId + ":" + version;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return hashCode;
+ }
+
+ private static int hash( Object obj )
+ {
+ return obj != null ? obj.hashCode() : 0;
+ }
+
+ @Override
+ public boolean equals( Object o )
+ {
+ if ( o == this )
+ {
+ return true;
+ }
+
+ if ( !( o instanceof CacheKey ) )
+ {
+ return false;
+ }
+
+ CacheKey that = (CacheKey) o;
+
+ return eq( groupId, that.groupId ) && eq( artifactId, that.artifactId ) && eq( version, that.version )
+ && eq( dependencyArtifacts, that.dependencyArtifacts )
+ && eq( workspace, that.workspace ) && eq( localRepo, that.localRepo )
+ && CacheUtils.repositoriesEquals( repositories, that.repositories ) && eq( collect, that.collect )
+ && eq( resolve, that.resolve ) && aggregating == that.aggregating;
+ }
+
+ private static <T> boolean eq( T s1, T s2 )
+ {
+ return s1 != null ? s1.equals( s2 ) : s2 == null;
+ }
+
+ }
+
+ protected final Map<Key, CacheRecord> cache = new ConcurrentHashMap<>();
+
+ public Key createKey( MavenProject project, Collection<String> scopesToCollect,
+ Collection<String> scopesToResolve, boolean aggregating, RepositorySystemSession session )
+ {
+ return new CacheKey( project, project.getRemoteProjectRepositories(), scopesToCollect, scopesToResolve,
+ aggregating, session );
+ }
+
+ public CacheRecord get( Key key )
+ throws LifecycleExecutionException
+ {
+ CacheRecord cacheRecord = cache.get( key );
+
+ if ( cacheRecord != null && cacheRecord.exception != null )
+ {
+ throw cacheRecord.exception;
+ }
+
+ return cacheRecord;
+ }
+
+ public CacheRecord put( Key key, Set<Artifact> projectArtifacts )
+ {
+ Validate.notNull( projectArtifacts, "projectArtifacts cannot be null" );
+
+ assertUniqueKey( key );
+
+ CacheRecord record =
+ new CacheRecord( Collections.unmodifiableSet( new HashSet<>( projectArtifacts ) ) );
+
+ cache.put( key, record );
+
+ return record;
+ }
+
+ protected void assertUniqueKey( Key key )
+ {
+ if ( cache.containsKey( key ) )
+ {
+ throw new IllegalStateException( "Duplicate artifact resolution result for project " + key );
+ }
+ }
+
+ public CacheRecord put( Key key, LifecycleExecutionException exception )
+ {
+ Validate.notNull( exception, "exception cannot be null" );
+
+ assertUniqueKey( key );
+
+ CacheRecord record = new CacheRecord( exception );
+
+ cache.put( key, record );
+
+ return record;
+ }
+
+ public void flush()
+ {
+ cache.clear();
+ }
+
+ protected static int pluginHashCode( Plugin plugin )
+ {
+ return CacheUtils.pluginHashCode( plugin );
+ }
+
+ protected static boolean pluginEquals( Plugin a, Plugin b )
+ {
+ return CacheUtils.pluginEquals( a, b );
+ }
+
+ public void register( MavenProject project, Key cacheKey, CacheRecord record )
+ {
+ // default cache does not track record usage
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/maven/blob/7277a846/maven-core/src/main/java/org/apache/maven/plugin/ProjectArtifactsCache.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/ProjectArtifactsCache.java b/maven-core/src/main/java/org/apache/maven/plugin/ProjectArtifactsCache.java
new file mode 100644
index 0000000..42a95e5
--- /dev/null
+++ b/maven-core/src/main/java/org/apache/maven/plugin/ProjectArtifactsCache.java
@@ -0,0 +1,90 @@
+package org.apache.maven.plugin;
+
+/*
+ * 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.util.Collection;
+import java.util.Set;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.lifecycle.LifecycleExecutionException;
+import org.apache.maven.project.MavenProject;
+import org.eclipse.aether.RepositorySystemSession;
+/**
+ * Caches project artifacts. <strong>Warning:</strong> This is an internal utility interface that is only public for
+ * technical reasons, it is not part of the public API. In particular, this interface can be changed or deleted without
+ * prior notice.
+ *
+ * @author Igor Fedorenko
+ * @author Benjamin Bentmann
+ * @author Anton Tanasenko
+ */
+public interface ProjectArtifactsCache
+{
+
+ /**
+ * A cache key.
+ */
+ interface Key
+ {
+ // marker interface for cache keys
+ }
+
+ static class CacheRecord
+ {
+
+ public final Set<Artifact> artifacts;
+
+ public final LifecycleExecutionException exception;
+
+ public CacheRecord( Set<Artifact> artifacts )
+ {
+ this.artifacts = artifacts;
+ this.exception = null;
+ }
+
+ public CacheRecord( LifecycleExecutionException exception )
+ {
+ this.artifacts = null;
+ this.exception = exception;
+ }
+ }
+
+ Key createKey( MavenProject project, Collection<String> scopesToCollect, Collection<String> scopesToResolve,
+ boolean aggregating, RepositorySystemSession session );
+
+ CacheRecord get( Key key ) throws LifecycleExecutionException;
+
+ CacheRecord put( Key key, Set<Artifact> pluginArtifacts );
+
+ CacheRecord put( Key key, LifecycleExecutionException e );
+
+ void flush();
+
+ /**
+ * Registers the specified cache record for usage with the given project. Integrators can use the information
+ * collected from this method in combination with a custom cache implementation to dispose unused records from the
+ * cache.
+ *
+ * @param project The project that employs the plugin realm, must not be {@code null}.
+ * @param record The cache record being used for the project, must not be {@code null}.
+ */
+ void register( MavenProject project, Key cacheKey, CacheRecord record );
+
+}
[18/50] maven git commit: [MNG-6017] Removing ArtifactHandler for par
LifeCycle o Removed ArtifactHandler configuration for par lifeclyce which has
been removed in Maven 3.3.9 See MNG-5892
Posted by hb...@apache.org.
[MNG-6017] Removing ArtifactHandler for par LifeCycle
o Removed ArtifactHandler configuration for par lifeclyce
which has been removed in Maven 3.3.9
See MNG-5892
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f70e22ea
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f70e22ea
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f70e22ea
Branch: refs/heads/slf4j-gossip
Commit: f70e22ead6342e0dc68a3421c8b534e7b7bf6a8d
Parents: d3da8c2
Author: Karl Heinz Marbaise <kh...@apache.org>
Authored: Thu May 5 22:40:18 2016 +0200
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Thu May 5 22:40:18 2016 +0200
----------------------------------------------------------------------
.../resources/META-INF/plexus/artifact-handlers.xml | 14 --------------
maven-core/src/site/apt/artifact-handlers.apt | 2 --
2 files changed, 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/f70e22ea/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
index d03404b..2f26ce2 100644
--- a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
@@ -190,19 +190,5 @@ Artifact handlers are required by the dependency resolution mechanism.
</configuration>
</component>
- <!--
- | PAR
- |-->
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>par</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
- <configuration>
- <type>par</type>
- <includesDependencies>true</includesDependencies>
- <language>java</language>
- <addedToClasspath>false</addedToClasspath>
- </configuration>
- </component>
</components>
</component-set>
http://git-wip-us.apache.org/repos/asf/maven/blob/f70e22ea/maven-core/src/site/apt/artifact-handlers.apt
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/artifact-handlers.apt b/maven-core/src/site/apt/artifact-handlers.apt
index 4d3a557..1a4b344 100644
--- a/maven-core/src/site/apt/artifact-handlers.apt
+++ b/maven-core/src/site/apt/artifact-handlers.apt
@@ -45,8 +45,6 @@ Default Artifact Handlers Reference
*--------------------+------------+------------+---------------+-----------+---------------------+-----------------------+
| <<<rar>>> | <= type> | <= type> | | java | | <<<true>>> |
*--------------------+------------+------------+---------------+-----------+---------------------+-----------------------+
-| <<<par>>> | <= type> | <= type> | | java | | <<<true>>> |
-*--------------------+------------+------------+---------------+-----------+---------------------+-----------------------+
| <<<java-source>>> | <<<jar>>> | <= type> | <<<sources>>> | java | | |
*--------------------+------------+------------+---------------+-----------+---------------------+-----------------------+
| <<<javadoc>>> | <<<jar>>> | <= type> | <<<javadoc>>> | java | <<<true>>> | |
[48/50] maven git commit: Hook up gossip as slf4j backend and
implement customized color renderer
Posted by hb...@apache.org.
Hook up gossip as slf4j backend and implement customized color renderer
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8781dc31
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8781dc31
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8781dc31
Branch: refs/heads/slf4j-gossip
Commit: 8781dc31249b2f0fc2d84fdde07bebc93e0ead16
Parents: 35da0dc
Author: Jason Dillon <ja...@planet57.com>
Authored: Mon May 16 12:34:21 2016 -0700
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Thu Jun 2 23:41:45 2016 +0200
----------------------------------------------------------------------
apache-maven/pom.xml | 8 +-
maven-embedder/pom.xml | 10 ++
.../cli/logging/impl/gossip/ColorRenderer.java | 160 +++++++++++++++++++
.../impl/gossip/GossipConfiguration.java | 61 +++++++
.../maven/slf4j-configuration.properties | 1 +
.../org.sonatype.gossip/config.properties | 67 ++++++++
pom.xml | 10 ++
7 files changed, 315 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/8781dc31/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 9405df8..80250ca 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -92,8 +92,12 @@ under the License.
<artifactId>aether-transport-wagon</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <groupId>org.sonatype.gossip</groupId>
+ <artifactId>gossip-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fusesource.jansi</groupId>
+ <artifactId>jansi</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/maven/blob/8781dc31/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 71dcf90..73555b8 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -89,6 +89,16 @@ under the License.
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>org.sonatype.gossip</groupId>
+ <artifactId>gossip-slf4j</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.fusesource.jansi</groupId>
+ <artifactId>jansi</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<optional>true</optional>
http://git-wip-us.apache.org/repos/asf/maven/blob/8781dc31/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
new file mode 100644
index 0000000..f844c04
--- /dev/null
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
@@ -0,0 +1,160 @@
+package org.apache.maven.cli.logging.impl.gossip;
+
+/*
+ * 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 static org.fusesource.jansi.Ansi.Attribute.INTENSITY_BOLD;
+import static org.fusesource.jansi.Ansi.Color.CYAN;
+import static org.fusesource.jansi.Ansi.Color.GREEN;
+import static org.fusesource.jansi.Ansi.Color.RED;
+import static org.fusesource.jansi.Ansi.Color.YELLOW;
+import static org.fusesource.jansi.Ansi.ansi;
+
+import org.sonatype.gossip.Event;
+import org.sonatype.gossip.render.PatternRenderer;
+
+/**
+ * Specialized {@link org.sonatype.gossip.render.Renderer} which is aware of basic Maven log messages to colorize.
+ *
+ * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
+ * @since 3.4.0
+ */
+public class ColorRenderer
+ extends PatternRenderer
+{
+ @Override
+ protected void renderLevel( final Event event, final StringBuilder buff )
+ {
+ assert event != null;
+ assert buff != null;
+
+ switch ( event.getLevel() )
+ {
+ case TRACE:
+ case DEBUG:
+ buff.append( ansi().a( INTENSITY_BOLD ).fg( YELLOW ).a( event.getLevel().name() ).reset() );
+ break;
+
+ case INFO:
+ buff.append( ansi().a( INTENSITY_BOLD ).fg( GREEN ).a( event.getLevel().name() ).reset() );
+ break;
+
+ case WARN:
+ case ERROR:
+ buff.append( ansi().a( INTENSITY_BOLD ).fg( RED ).a( event.getLevel().name() ).reset() );
+ break;
+
+ default:
+ throw new InternalError();
+ }
+ }
+
+ @Override
+ protected void renderName( final Event event, final StringBuilder buff, final boolean shortName )
+ {
+ StringBuilder tmp = new StringBuilder();
+ super.renderName( event, tmp, shortName );
+ buff.append( ansi().fg( GREEN ).a( tmp ).reset() );
+ }
+
+ @Override
+ protected void renderMessage( final Event event, final StringBuilder buff )
+ {
+ final String message = event.getMessage();
+
+ if ( message.startsWith( "------------------------------------------------------------------------" ) )
+ {
+ buff.append( ansi().a( INTENSITY_BOLD ).a( message ).reset() );
+ }
+ else if ( message.startsWith( "---" ) && message.endsWith( " ---" ) )
+ {
+ String[] items = message.split( "\\s" );
+ buff.append( ansi().a( INTENSITY_BOLD ).a( "---" ).reset() );
+ buff.append( " " );
+ buff.append( ansi().fg( GREEN ).a( items[1] ).reset() );
+ buff.append( " " );
+ buff.append( ansi().a( INTENSITY_BOLD ).a( items[2] ).reset() );
+ buff.append( " @ " );
+ buff.append( ansi().fg( CYAN ).a( items[4] ).reset() );
+ buff.append( ansi().a( INTENSITY_BOLD ).a( " ---" ).reset() );
+ }
+ else if ( message.contains( "ERROR" ) || message.contains( "FAILURE" ) || message.contains( "FAILED" ) )
+ {
+ buff.append( ansi().a( INTENSITY_BOLD ).fg( RED ).a( message ).reset() );
+ }
+ else if ( message.contains( "BUILD SUCCESS" ) )
+ {
+ buff.append( ansi().a( INTENSITY_BOLD ).fg( GREEN ).a( message ).reset() );
+ }
+ else if ( message.contains( "SUCCESS" ) )
+ {
+ buff.append( ansi().fg( GREEN ).a( message ).reset() );
+ }
+ else
+ {
+ buff.append( message );
+ }
+ }
+
+ @Override
+ protected void renderCause( final Event event, final StringBuilder buff )
+ {
+ assert event != null;
+ assert buff != null;
+
+ Throwable cause = event.getCause();
+ if ( cause == null )
+ {
+ return;
+ }
+
+ buff.append( ansi().a( INTENSITY_BOLD ).fg( RED ).a( cause.getClass().getName() ).reset() );
+ if ( cause.getMessage() != null )
+ {
+ buff.append( ": " );
+ buff.append( ansi().a( INTENSITY_BOLD ).fg( RED ).a( cause.getMessage() ).reset() );
+ }
+ renderNewLine( buff );
+
+ while ( cause != null )
+ {
+ for ( StackTraceElement e : cause.getStackTrace() )
+ {
+ buff.append( " " );
+ buff.append( ansi().a( INTENSITY_BOLD ).a( "at" ).reset().a( " " )
+ .a( e.getClassName() ).a( "." ).a( e.getMethodName() ) );
+ buff.append( ansi().a( " (" ).a( INTENSITY_BOLD ).a( getLocation( e ) ).reset().a( ")" ) );
+ renderNewLine( buff );
+ }
+
+ cause = cause.getCause();
+ if ( cause != null )
+ {
+ buff.append( ansi().a( INTENSITY_BOLD ).a( "Caused by" ).reset().a( " " )
+ .a( cause.getClass().getName() ) );
+ if ( cause.getMessage() != null )
+ {
+ buff.append( ": " );
+ buff.append( ansi().a( INTENSITY_BOLD ).fg( RED ).a( cause.getMessage() ).reset() );
+ }
+ renderNewLine( buff );
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven/blob/8781dc31/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/GossipConfiguration.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/GossipConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/GossipConfiguration.java
new file mode 100644
index 0000000..e07b7a6
--- /dev/null
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/GossipConfiguration.java
@@ -0,0 +1,61 @@
+package org.apache.maven.cli.logging.impl.gossip;
+
+/*
+ * 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.sonatype.gossip.Gossip;
+
+import org.apache.maven.cli.logging.BaseSlf4jConfiguration;
+
+/**
+ * Configuration for Gossip.
+ *
+ * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
+ * @since 3.4.0
+ */
+public class GossipConfiguration
+ extends BaseSlf4jConfiguration
+{
+ @Override
+ public void setRootLoggerLevel( Level level )
+ {
+ org.sonatype.gossip.Level value;
+ switch ( level )
+ {
+ case DEBUG:
+ value = org.sonatype.gossip.Level.DEBUG;
+ break;
+
+ case INFO:
+ value = org.sonatype.gossip.Level.INFO;
+ break;
+
+ default:
+ value = org.sonatype.gossip.Level.ERROR;
+ break;
+ }
+ Gossip.getInstance().getRoot().setLevel( value );
+ }
+
+ @Override
+ public void activate()
+ {
+ // empty
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven/blob/8781dc31/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
index cd01f9e..fd69cdc 100644
--- a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
+++ b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
@@ -20,3 +20,4 @@
org.slf4j.impl.SimpleLoggerFactory org.apache.maven.cli.logging.impl.Slf4jSimpleConfiguration
org.apache.logging.slf4j.Log4jLoggerFactory org.apache.maven.cli.logging.impl.Log4j2Configuration
ch.qos.logback.classic.LoggerContext org.apache.maven.cli.logging.impl.LogbackConfiguration
+org.sonatype.gossip.Gossip org.apache.maven.cli.logging.impl.gossip.GossipConfiguration
http://git-wip-us.apache.org/repos/asf/maven/blob/8781dc31/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties b/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties
new file mode 100644
index 0000000..a830b1e
--- /dev/null
+++ b/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties
@@ -0,0 +1,67 @@
+# 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.
+
+version=1.0.0
+
+profiles=default, maven-common, maven-plain, maven-color
+
+##
+## default
+##
+
+profile.default.includes=maven-common
+profile.default.listeners=console
+profile.default.listener.console=org.sonatype.gossip.listener.ConsoleListener
+profile.default.listener.console.renderer=org.sonatype.gossip.render.PatternRenderer
+profile.default.listener.console.renderer.pattern=[%l] %m%n%x
+
+##
+## common
+##
+
+profile.maven-common.logger.*=INFO
+
+##
+## maven.logging=PLAIN
+##
+
+profile.maven-plain.includes=maven-common
+profile.maven-plain.listeners=console
+profile.maven-plain.listener.console=org.sonatype.gossip.listener.ConsoleListener
+profile.maven-plain.listener.console.renderer=org.sonatype.gossip.render.PatternRenderer
+profile.maven-plain.listener.console.renderer.pattern=[%l] %m%n%x
+profile.maven-plain.triggers=default
+profile.maven-plain.trigger.default=org.sonatype.gossip.trigger.SystemPropertyTrigger
+profile.maven-plain.trigger.default.name=maven.logging
+profile.maven-plain.trigger.default.value=PLAIN
+profile.maven-plain.trigger.default.ignoreCase=true
+
+##
+## maven.logging=COLOR
+##
+
+profile.maven-color.includes=maven-common
+profile.maven-color.listeners=console
+profile.maven-color.listener.console=org.sonatype.gossip.listener.ConsoleListener
+profile.maven-color.listener.console.renderer=org.apache.maven.cli.logging.impl.gossip.ColorRenderer
+profile.maven-color.listener.console.renderer.pattern=[%l] %m%n%x
+profile.maven-color.triggers=default
+profile.maven-color.trigger.default=org.sonatype.gossip.trigger.SystemPropertyTrigger
+profile.maven-color.trigger.default.name=maven.logging
+profile.maven-color.trigger.default.value=COLOR
+profile.maven-color.trigger.default.ignoreCase=true
+
http://git-wip-us.apache.org/repos/asf/maven/blob/8781dc31/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8000c47..6ecef9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -289,6 +289,16 @@ under the License.
<version>1.1.7</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.sonatype.gossip</groupId>
+ <artifactId>gossip-slf4j</artifactId>
+ <version>1.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fusesource.jansi</groupId>
+ <artifactId>jansi</artifactId>
+ <version>1.12</version>
+ </dependency>
<!-- Wagon -->
<dependency>
<groupId>org.apache.maven.wagon</groupId>
[23/50] maven git commit: [MNG-2478] add filtered resource
directories to super POM
Posted by hb...@apache.org.
[MNG-2478] add filtered resource directories to super POM
o Updated the directory name from 'filtered-resources' to 'resources-filtered'.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/39dc37a5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/39dc37a5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/39dc37a5
Branch: refs/heads/slf4j-gossip
Commit: 39dc37a59abc2598d74326b66715c0bad9923d18
Parents: e91a209
Author: Christian Schulte <sc...@apache.org>
Authored: Thu May 12 23:59:29 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Thu May 12 23:59:29 2016 +0200
----------------------------------------------------------------------
.../src/main/resources/org/apache/maven/model/pom-4.0.0.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/39dc37a5/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index 5abbb2c..02ac7ba 100644
--- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -63,7 +63,7 @@ under the License.
<directory>${project.basedir}/src/main/resources</directory>
</resource>
<resource>
- <directory>${project.basedir}/src/main/filtered-resources</directory>
+ <directory>${project.basedir}/src/main/resources-filtered</directory>
<filtering>true</filtering>
</resource>
</resources>
@@ -72,7 +72,7 @@ under the License.
<directory>${project.basedir}/src/test/resources</directory>
</testResource>
<testResource>
- <directory>${project.basedir}/src/test/filtered-resources</directory>
+ <directory>${project.basedir}/src/test/resources-filtered</directory>
<filtering>true</filtering>
</testResource>
</testResources>
[04/50] maven git commit: [MNG-4345] [regression] Plugin executions
contributed by default lifecycle mapping execute after other plugin
executions bound to the same phase"
Posted by hb...@apache.org.
[MNG-4345] [regression] Plugin executions contributed by default lifecycle mapping execute after other plugin executions bound to the same phase"
o Updated to restore correct Maven 3 behaviour fixing unexpected Maven 2
behaviour.
o This reverts commits
53b7d5e805910bbe055696ba6b76a6560ef85839
c249a984084b4143ecfa64dfd26fecfbb199057c
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ceba6860
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ceba6860
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ceba6860
Branch: refs/heads/slf4j-gossip
Commit: ceba686009cd21568e002f5a9ebb130c21bf0453
Parents: 5a4d548
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Mar 1 00:50:18 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Tue Mar 1 00:55:04 2016 +0100
----------------------------------------------------------------------
.../model/plugin/DefaultLifecycleBindingsInjector.java | 11 -----------
maven-model/src/main/mdo/maven.mdo | 13 -------------
2 files changed, 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ceba6860/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
index aa491e7..a4d7138 100644
--- a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
+++ b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
@@ -30,7 +30,6 @@ import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginContainer;
-import org.apache.maven.model.PluginExecution;
import org.apache.maven.model.PluginManagement;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.ModelProblem.Severity;
@@ -162,16 +161,6 @@ public class DefaultLifecycleBindingsInjector
target.setPlugins( result );
}
}
-
- @Override
- protected void mergePluginExecution( PluginExecution target, PluginExecution source, boolean sourceDominant,
- Map<Object, Object> context )
- {
- super.mergePluginExecution( target, source, sourceDominant, context );
-
- target.setPriority( Math.min( target.getPriority(), source.getPriority() ) );
- }
-
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/ceba6860/maven-model/src/main/mdo/maven.mdo
----------------------------------------------------------------------
diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo
index 3f6b6d6..f85d233 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -2912,19 +2912,6 @@
<description>The build lifecycle phase to bind the goals in this execution to. If omitted,
the goals will be bound to the default phase specified by the plugin. </description>
</field>
- <field xml.transient="true">
- <name>priority</name>
- <version>4.0.0+</version>
- <type>int</type>
- <description>
- <![CDATA[
- The priority of this execution compared to other executions which are bound to the same phase.
- <strong>Warning:</strong> This is an internal utility property that is only public for technical reasons,
- it is not part of the public API. In particular, this property can be changed or deleted without prior
- notice.
- ]]>
- </description>
- </field>
<field>
<name>goals</name>
<version>4.0.0+</version>
[22/50] maven git commit: o Updated to use the try-with-resources
statement.
Posted by hb...@apache.org.
o Updated to use the try-with-resources statement.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e91a209a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e91a209a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e91a209a
Branch: refs/heads/slf4j-gossip
Commit: e91a209aa52f64cd0efa743b1496f97b01410f32
Parents: 176cc12
Author: Christian Schulte <sc...@apache.org>
Authored: Thu May 12 06:08:57 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Thu May 12 06:09:54 2016 +0200
----------------------------------------------------------------------
.../internal/DefaultVersionRangeResolver.java | 32 ++-------
.../internal/DefaultVersionResolver.java | 71 +++++++-------------
.../internal/DefaultMavenPluginManager.java | 4 +-
3 files changed, 34 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/e91a209a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
index 7df7847..43f5d3c 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
@@ -57,7 +57,7 @@ import org.eclipse.aether.version.VersionScheme;
import javax.inject.Inject;
import javax.inject.Named;
import java.io.FileInputStream;
-import java.io.IOException;
+import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -259,27 +259,23 @@ public class DefaultVersionRangeResolver
{
Versioning versioning = null;
- FileInputStream fis = null;
try
{
if ( metadata != null )
{
-
try ( SyncContext syncContext = syncContextFactory.newInstance( session, true ) )
{
syncContext.acquire( null, Collections.singleton( metadata ) );
if ( metadata.getFile() != null && metadata.getFile().exists() )
{
- fis = new FileInputStream( metadata.getFile() );
-
- org.apache.maven.artifact.repository.metadata.Metadata m =
- new MetadataXpp3Reader().read( fis, false );
-
- fis.close();
- fis = null;
+ try ( InputStream in = new FileInputStream( metadata.getFile() ) )
+ {
+ org.apache.maven.artifact.repository.metadata.Metadata m =
+ new MetadataXpp3Reader().read( in, false );
- versioning = m.getVersioning();
+ versioning = m.getVersioning();
+ }
}
}
}
@@ -289,20 +285,6 @@ public class DefaultVersionRangeResolver
invalidMetadata( session, trace, metadata, repository, e );
result.addException( e );
}
- finally
- {
- try
- {
- if ( fis != null )
- {
- fis.close();
- }
- }
- catch ( final IOException e )
- {
- this.logger.warn( "Failure closing file.", e );
- }
- }
return ( versioning != null ) ? versioning : new Versioning();
}
http://git-wip-us.apache.org/repos/asf/maven/blob/e91a209a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
index eb2efd7..0d5a880 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
@@ -63,6 +63,7 @@ import javax.inject.Named;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -324,72 +325,52 @@ public class DefaultVersionResolver
{
Versioning versioning = null;
- FileInputStream fis = null;
try
{
if ( metadata != null )
{
-
try ( SyncContext syncContext = syncContextFactory.newInstance( session, true ) )
{
syncContext.acquire( null, Collections.singleton( metadata ) );
if ( metadata.getFile() != null && metadata.getFile().exists() )
{
- fis = new FileInputStream( metadata.getFile() );
-
- org.apache.maven.artifact.repository.metadata.Metadata m =
- new MetadataXpp3Reader().read( fis, false );
-
- fis.close();
- fis = null;
-
- versioning = m.getVersioning();
-
- /*
- * NOTE: Users occasionally misuse the id "local" for remote repos which screws up the metadata
- * of the local repository. This is especially troublesome during snapshot resolution so we try
- * to handle that gracefully.
- */
- if ( versioning != null && repository instanceof LocalRepository )
+ try ( InputStream in = new FileInputStream( metadata.getFile() ) )
{
- if ( versioning.getSnapshot() != null && versioning.getSnapshot().getBuildNumber() > 0 )
- {
- Versioning repaired = new Versioning();
- repaired.setLastUpdated( versioning.getLastUpdated() );
- Snapshot snapshot = new Snapshot();
- snapshot.setLocalCopy( true );
- repaired.setSnapshot( snapshot );
- versioning = repaired;
-
- throw new IOException( "Snapshot information corrupted with remote repository data"
- + ", please verify that no remote repository uses the id '"
- + repository.getId() + "'" );
- }
+ org.apache.maven.artifact.repository.metadata.Metadata m =
+ new MetadataXpp3Reader().read( in, false );
+
+ versioning = m.getVersioning();
}
}
}
}
+
+ /*
+ * NOTE: Users occasionally misuse the id "local" for remote repos which screws up the metadata
+ * of the local repository. This is especially troublesome during snapshot resolution so we try
+ * to handle that gracefully.
+ */
+ if ( versioning != null && repository instanceof LocalRepository
+ && versioning.getSnapshot() != null && versioning.getSnapshot().getBuildNumber() > 0 )
+ {
+ Versioning repaired = new Versioning();
+ repaired.setLastUpdated( versioning.getLastUpdated() );
+ Snapshot snapshot = new Snapshot();
+ snapshot.setLocalCopy( true );
+ repaired.setSnapshot( snapshot );
+ versioning = repaired;
+
+ throw new IOException( "Snapshot information corrupted with remote repository data"
+ + ", please verify that no remote repository uses the id '"
+ + repository.getId() + "'" );
+ }
}
catch ( Exception e )
{
invalidMetadata( session, trace, metadata, repository, e );
result.addException( e );
}
- finally
- {
- try
- {
- if ( fis != null )
- {
- fis.close();
- }
- }
- catch ( final IOException e )
- {
- this.logger.warn( "Failure closing file.", e );
- }
- }
return ( versioning != null ) ? versioning : new Versioning();
}
http://git-wip-us.apache.org/repos/asf/maven/blob/e91a209a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
index bad1454..4111434 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
@@ -262,10 +262,8 @@ public class DefaultMavenPluginManager
private PluginDescriptor parsePluginDescriptor( InputStream is, Plugin plugin, String descriptorLocation )
throws PluginDescriptorParsingException
{
- try
+ try ( Reader reader = ReaderFactory.newXmlReader( is ) )
{
- Reader reader = ReaderFactory.newXmlReader( is );
-
PluginDescriptor pluginDescriptor = builder.build( reader, descriptorLocation );
return pluginDescriptor;
[28/50] maven git commit: [MNG-5607] Don't use M2_HOME in mvn
shell/command scripts anymore
Posted by hb...@apache.org.
[MNG-5607] Don't use M2_HOME in mvn shell/command scripts anymore
Remove error message which contained M2_HOME reference
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e5dd48b5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e5dd48b5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e5dd48b5
Branch: refs/heads/slf4j-gossip
Commit: e5dd48b5fadaaa793bf82c1e817eb970b0f87fc6
Parents: 7277a84
Author: Michael Osipov <mi...@apache.org>
Authored: Fri May 20 22:17:58 2016 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Fri May 20 22:17:58 2016 +0200
----------------------------------------------------------------------
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/e5dd48b5/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
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 c5a2256..6ac77de 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
@@ -343,8 +343,7 @@ public class MavenCli
if ( basedirProperty == null )
{
System.err.format(
- "-D%s system property is not set." + " Check $M2_HOME environment variable and mvn script match.",
- MULTIMODULE_PROJECT_DIRECTORY );
+ "-D%s system property is not set.", MULTIMODULE_PROJECT_DIRECTORY );
throw new ExitException( 1 );
}
File basedir = basedirProperty != null ? new File( basedirProperty ) : new File( "" );
[11/50] maven git commit: [MNG-5968] Default plugin version updates.
Posted by hb...@apache.org.
[MNG-5968] Default plugin version updates.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/dac9c810
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/dac9c810
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/dac9c810
Branch: refs/heads/slf4j-gossip
Commit: dac9c810a52d1b61ea825f0ce9012a337e9b7897
Parents: 00565eb
Author: Christian Schulte <sc...@apache.org>
Authored: Fri Apr 15 18:04:58 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Fri Apr 15 18:04:58 2016 +0200
----------------------------------------------------------------------
maven-core/src/main/resources/META-INF/plexus/components.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/dac9c810/maven-core/src/main/resources/META-INF/plexus/components.xml
----------------------------------------------------------------------
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 0beb57e..1856f5b 100644
--- a/maven-core/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/components.xml
@@ -101,10 +101,10 @@ under the License.
</phases>
<default-phases>
<site>
- org.apache.maven.plugins:maven-site-plugin:3.5:site
+ org.apache.maven.plugins:maven-site-plugin:3.5.1:site
</site>
<site-deploy>
- org.apache.maven.plugins:maven-site-plugin:3.5:deploy
+ org.apache.maven.plugins:maven-site-plugin:3.5.1:deploy
</site-deploy>
</default-phases>
<!-- END SNIPPET: site -->
[30/50] maven git commit: Fixing misspellings in test names
Posted by hb...@apache.org.
Fixing misspellings in test names
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/79c81ce6
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/79c81ce6
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/79c81ce6
Branch: refs/heads/slf4j-gossip
Commit: 79c81ce6e0ee2a1bbaa2c60d9700b3cd0915387c
Parents: 8e08c8b
Author: August Shi <aw...@illinois.edu>
Authored: Wed May 25 17:55:00 2016 -0500
Committer: August Shi <aw...@illinois.edu>
Committed: Wed May 25 17:55:00 2016 -0500
----------------------------------------------------------------------
.../org/apache/maven/repository/DefaultMirrorSelectorTest.java | 2 +-
.../apache/maven/graph/DefaultProjectDependencyGraphTest.java | 6 +++---
.../maven/lifecycle/LifecycleExecutorSubModulesTest.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/79c81ce6/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java b/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
index fb32f0f..4e8cdb0 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
@@ -27,7 +27,7 @@ public class DefaultMirrorSelectorTest
extends PlexusTestCase
{
- public void testMirrorWithMirroOfPatternContainingANegationIsNotSelected()
+ public void testMirrorWithMirrorOfPatternContainingANegationIsNotSelected()
{
ArtifactRepository repository = new DefaultArtifactRepository( "snapshots.repo", "http://whatever", null );
String pattern = "external:*, !snapshots.repo";
http://git-wip-us.apache.org/repos/asf/maven/blob/79c81ce6/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java b/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java
index e2caaeb..3c97a55 100644
--- a/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java
+++ b/maven-core/src/test/java/org/apache/maven/graph/DefaultProjectDependencyGraphTest.java
@@ -66,7 +66,7 @@ public class DefaultProjectDependencyGraphTest
assertEquals( depender3, sortedProjects.get( 3 ) );
}
- public void testVerifyThatDownsteamProjectsComeInSortedOrder()
+ public void testVerifyThatDownstreamProjectsComeInSortedOrder()
throws CycleDetectedException, DuplicateProjectException
{
final List<MavenProject> downstreamProjects =
@@ -102,7 +102,7 @@ public class DefaultProjectDependencyGraphTest
assertEquals( depender2, downstreamProjects.get( 3 ) );
}
- public void testWithTranistiveOnly()
+ public void testWithTransitiveOnly()
throws CycleDetectedException, DuplicateProjectException
{
final ProjectDependencyGraph graph = new DefaultProjectDependencyGraph(
@@ -115,7 +115,7 @@ public class DefaultProjectDependencyGraphTest
assertEquals( depender2, downstreamProjects.get( 3 ) );
}
- public void testWithMissingTranistiveOnly()
+ public void testWithMissingTransitiveOnly()
throws CycleDetectedException, DuplicateProjectException
{
final ProjectDependencyGraph graph = new DefaultProjectDependencyGraph(
http://git-wip-us.apache.org/repos/asf/maven/blob/79c81ce6/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
index 73a4f7e..3bd6e5c 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorSubModulesTest.java
@@ -83,7 +83,7 @@ public class LifecycleExecutorSubModulesTest
return "src/test/projects/lifecycle-executor";
}
- public void testCrweation()
+ public void testCreation()
throws Exception
{
assertNotNull( defaultLifeCycles );
[40/50] maven git commit: o Updated to add a note about issues
blocking an upgrade of SLF4J.
Posted by hb...@apache.org.
o Updated to add a note about issues blocking an upgrade of SLF4J.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4e5e5861
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4e5e5861
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4e5e5861
Branch: refs/heads/slf4j-gossip
Commit: 4e5e5861b3405630e58e374bdf4abde7e0d80aa6
Parents: bd825c5
Author: Christian Schulte <sc...@apache.org>
Authored: Tue May 31 03:13:48 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Tue May 31 03:13:48 2016 +0200
----------------------------------------------------------------------
pom.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/4e5e5861/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bf3aa61..8000c47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,6 +65,9 @@ under the License.
<modelloVersion>1.8.3</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
<aetherVersion>1.1.0</aetherVersion>
+ <!-- Upgrade of SLF4J blocked by SLF4J-370 (MNG-6023). -->
+ <!-- https://issues.apache.org/jira/browse/MNG-6023 -->
+ <!-- http://jira.qos.ch/browse/SLF4J-370 -->
<slf4jVersion>1.7.16</slf4jVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- Control the name of the distribution and information output by mvn -->
[50/50] maven git commit: added support for forked executions
Posted by hb...@apache.org.
added support for forked executions
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ad7508ce
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ad7508ce
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ad7508ce
Branch: refs/heads/slf4j-gossip
Commit: ad7508ce26aaf0b1132ac84e357108b6b90573df
Parents: f0bb924
Author: Herv� Boutemy <hb...@apache.org>
Authored: Fri Jun 3 00:02:46 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Fri Jun 3 00:02:46 2016 +0200
----------------------------------------------------------------------
.../maven/cli/logging/impl/gossip/ColorRenderer.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ad7508ce/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
index 14b7e2b..487d606 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
@@ -83,21 +83,25 @@ public class ColorRenderer
{
final String message = event.getMessage();
- if ( message.startsWith( "------------------------------------------------------------------------" ) )
+ if ( message.startsWith( "------------------------------------------------------------------------" )
+ || message.startsWith( ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" )
+ || message.startsWith( "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" ) )
{
buff.append( ansi().a( INTENSITY_BOLD ).a( message ).reset() );
}
- else if ( message.startsWith( "---" ) && message.endsWith( " ---" ) )
+ else if ( ( message.startsWith( "---" ) && message.endsWith( " ---" ) )
+ || ( message.startsWith( ">>>" ) && message.endsWith( " >>>" ) )
+ || ( message.startsWith( "<<<" ) && message.endsWith( " <<<" ) ) )
{
String[] items = message.split( "\\s" );
- buff.append( ansi().a( INTENSITY_BOLD ).a( "---" ).reset() );
+ buff.append( ansi().a( INTENSITY_BOLD ).a( items[0] ).reset() );
buff.append( " " );
buff.append( ansi().fg( GREEN ).a( items[1] ).reset() );
buff.append( " " );
buff.append( ansi().a( INTENSITY_BOLD ).a( items[2] ).reset() );
buff.append( " @ " );
buff.append( ansi().fg( CYAN ).a( items[4] ).reset() );
- buff.append( ansi().a( INTENSITY_BOLD ).a( " ---" ).reset() );
+ buff.append( ansi().a( INTENSITY_BOLD ).a( ' ' + items[5] ).reset() );
}
else if ( message.contains( "ERROR" ) || message.contains( "FAILURE" ) || message.contains( "FAILED" ) )
{
[24/50] maven git commit: [MNG-5967] Dependency updates.
Posted by hb...@apache.org.
[MNG-5967] Dependency updates.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ce580ea2
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ce580ea2
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ce580ea2
Branch: refs/heads/slf4j-gossip
Commit: ce580ea2fafd7638ee56e1d0574de95a37164322
Parents: 39dc37a
Author: Christian Schulte <sc...@apache.org>
Authored: Fri May 13 03:10:54 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Fri May 13 03:10:54 2016 +0200
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ce580ea2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9d14078..97f7a5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
<modelloVersion>1.8.3</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
<aetherVersion>1.1.0</aetherVersion>
- <slf4jVersion>1.7.16</slf4jVersion>
+ <slf4jVersion>1.7.21</slf4jVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- Control the name of the distribution and information output by mvn -->
<distributionId>apache-maven</distributionId>
@@ -279,7 +279,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.1.5</version>
+ <version>1.1.7</version>
<optional>true</optional>
</dependency>
<!-- Wagon -->
[09/50] maven git commit: [MNG-5607] Don't use M2_HOME in mvn
shell/command scripts anymore
Posted by hb...@apache.org.
[MNG-5607] Don't use M2_HOME in mvn shell/command scripts anymore
* Variable has been removed and replaced with an internal one which
cannot be overriden from outside. From now on, it is an
implementation detail which it should have been from the beginning.
* Cleaned up license header and style of the variable description
section graciously borrowed from the Tomcat start scripts.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/fe47a3d7
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/fe47a3d7
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/fe47a3d7
Branch: refs/heads/slf4j-gossip
Commit: fe47a3d79ffbb68a9e64ac5324be7a7544cbed4f
Parents: 59c26ed
Author: Michael Osipov <mi...@apache.org>
Authored: Thu Apr 14 22:41:07 2016 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Thu Apr 14 22:41:07 2016 +0200
----------------------------------------------------------------------
apache-maven/src/bin/mvn | 94 +++++++++++++++-------------------
apache-maven/src/bin/mvn.cmd | 65 ++++++++---------------
apache-maven/src/bin/mvnDebug | 25 ++++-----
apache-maven/src/bin/mvnDebug.cmd | 16 +++---
apache-maven/src/bin/mvnyjp | 23 +++------
5 files changed, 90 insertions(+), 133 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/fe47a3d7/apache-maven/src/bin/mvn
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index c815839..672efbf 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -1,5 +1,5 @@
#!/bin/sh
-# ----------------------------------------------------------------------------
+
# 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
@@ -16,23 +16,16 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-# ----------------------------------------------------------------------------
-# ----------------------------------------------------------------------------
-# Maven2 Start Up Batch script
+# -----------------------------------------------------------------------------
+# Apache Maven Startup Script
#
-# Required ENV vars:
-# ------------------
-# JAVA_HOME - location of a JDK home dir
+# Environment Variable Prerequisites
#
-# Optional ENV vars
-# -----------------
-# M2_HOME - location of maven2's installed home dir
-# MAVEN_OPTS - parameters passed to the Java VM when running Maven
-# e.g. to debug Maven itself, use
-# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-# ----------------------------------------------------------------------------
+# JAVA_HOME Must point at your Java Development Kit installation.
+# MAVEN_OPTS (Optional) Java runtime options used when Maven is executed.
+# MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files.
+# -----------------------------------------------------------------------------
if [ -z "$MAVEN_SKIP_RC" ] ; then
@@ -46,12 +39,12 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
fi
-# OS specific support. $var _must_ be set to either true or false.
+# OS specific support. $var _must_ be set to either true or false.
cygwin=false;
darwin=false;
-mingw=false
+mingw=false;
case "`uname`" in
- CYGWIN*) cygwin=true ;;
+ CYGWIN*) cygwin=true;;
MINGW*) mingw=true;;
Darwin*) darwin=true
#
@@ -94,46 +87,43 @@ if [ -z "$JAVA_HOME" ] ; then
fi
fi
-if [ -z "$M2_HOME" ] ; then
- ## resolve links - $0 may be a link to maven's home
- PRG="$0"
+## resolve links - $0 may be a link to Maven's home
+PRG="$0"
- # need this for relative symlinks
- while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG="`dirname "$PRG"`/$link"
- fi
- done
+# need this for relative symlinks
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+done
- saveddir=`pwd`
+saveddir=`pwd`
- M2_HOME=`dirname "$PRG"`/..
+MAVEN_HOME=`dirname "$PRG"`/..
- # make it fully qualified
- M2_HOME=`cd "$M2_HOME" && pwd`
+# make it fully qualified
+MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
- cd "$saveddir"
- # echo Using m2 at $M2_HOME
-fi
+cd "$saveddir"
-# For Cygwin, ensure paths are in UNIX format before anything is touched
+# For Cygwin, ensure paths are in Unix format before anything is touched
if $cygwin ; then
- [ -n "$M2_HOME" ] &&
- M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$MAVEN_HOME" ] &&
+ MAVEN_HOME=`cygpath --unix "$MAVEN_HOME"`
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
[ -n "$CLASSPATH" ] &&
CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
fi
-# For Migwn, ensure paths are in UNIX format before anything is touched
+# For MinGW, ensure paths are in Unix format before anything is touched
if $mingw ; then
- [ -n "$M2_HOME" ] &&
- M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$MAVEN_HOME" ] &&
+ MAVEN_HOME="`(cd "$MAVEN_HOME"; pwd)`"
[ -n "$JAVA_HOME" ] &&
JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
# TODO classpath?
@@ -183,12 +173,12 @@ if [ -z "$JAVA_HOME" ] ; then
fi
CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-CLASSWORLDS_JAR=`echo "${M2_HOME}"/boot/plexus-classworlds-*.jar`
+CLASSWORLDS_JAR=`echo "${MAVEN_HOME}"/boot/plexus-classworlds-*.jar`
# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
- [ -n "$M2_HOME" ] &&
- M2_HOME=`cygpath --path --windows "$M2_HOME"`
+if $cygwin ; then
+ [ -n "$MAVEN_HOME" ] &&
+ MAVEN_HOME=`cygpath --path --windows "$MAVEN_HOME"`
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
[ -n "$CLASSPATH" ] &&
@@ -225,8 +215,8 @@ MAVEN_PROJECTBASEDIR="${MAVEN_BASEDIR:-`find_maven_basedir`}"
MAVEN_OPTS="`concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config"` $MAVEN_OPTS"
# For Cygwin, switch project base directory path to Windows format before
-# executing Maven. Otherwise this will cause Maven not to consider it.
-if $cygwin; then
+# executing Maven otherwise this will cause Maven not to consider it.
+if $cygwin ; then
[ -n "$MAVEN_PROJECTBASEDIR" ] &&
MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
fi
@@ -242,6 +232,6 @@ exec "$JAVACMD" \
$MAVEN_OPTS \
$MAVEN_DEBUG_OPTS \
-classpath "${CLASSWORLDS_JAR}" \
- "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
- "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ "-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf" \
+ "-Dmaven.home=${MAVEN_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
${CLASSWORLDS_LAUNCHER} "$@"
http://git-wip-us.apache.org/repos/asf/maven/blob/fe47a3d7/apache-maven/src/bin/mvn.cmd
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index 12993d9..06a58d1 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -1,4 +1,3 @@
-@REM ----------------------------------------------------------------------------
@REM Licensed to the Apache Software Foundation (ASF) under one
@REM or more contributor license agreements. See the NOTICE file
@REM distributed with this work for additional information
@@ -15,23 +14,18 @@
@REM KIND, either express or implied. See the License for the
@REM specific language governing permissions and limitations
@REM under the License.
-@REM ----------------------------------------------------------------------------
-@REM ----------------------------------------------------------------------------
-@REM Maven2 Start Up Batch script
+@REM -----------------------------------------------------------------------------
+@REM Apache Maven Startup Script
@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
+@REM Environment Variable Prerequisites
@REM
-@REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM ----------------------------------------------------------------------------
+@REM JAVA_HOME Must point at your Java Development Kit installation.
+@REM MAVEN_BATCH_ECHO (Optional) Set to 'on' to enable the echoing of the batch commands.
+@REM MAVEN_BATCH_PAUSE (Optional) set to 'on' to wait for a key stroke before ending.
+@REM MAVEN_OPTS (Optional) Java runtime options used when Maven is executed.
+@REM MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files.
+@REM -----------------------------------------------------------------------------
@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
@echo off
@@ -74,34 +68,19 @@ echo.
goto error
:chkMHome
-if not "%M2_HOME%"=="" goto valMHome
-
-SET "M2_HOME=%~dp0.."
-if not "%M2_HOME%"=="" goto valMHome
-
-echo.
-echo Error: M2_HOME not found in your environment. >&2
-echo Please set the M2_HOME variable in your environment to match the >&2
-echo location of the Maven installation. >&2
-echo.
+set "MAVEN_HOME=%~dp0.."
+if not "%MAVEN_HOME%"=="" goto valMHome
goto error
:valMHome
:stripMHome
-if not "_%M2_HOME:~-1%"=="_\" goto checkMCmd
-set "M2_HOME=%M2_HOME:~0,-1%"
+if not "_%MAVEN_HOME:~-1%"=="_\" goto checkMCmd
+set "MAVEN_HOME=%MAVEN_HOME:~0,-1%"
goto stripMHome
:checkMCmd
-if exist "%M2_HOME%\bin\mvn.cmd" goto init
-
-echo.
-echo Error: M2_HOME is set to an invalid directory. >&2
-echo M2_HOME = "%M2_HOME%" >&2
-echo Please set the M2_HOME variable in your environment to match the >&2
-echo location of the Maven installation >&2
-echo.
+if exist "%MAVEN_HOME%\bin\mvn.cmd" goto init
goto error
@REM ==== END VALIDATION ====
@@ -109,19 +88,19 @@ goto error
set MAVEN_CMD_LINE_ARGS=%*
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Find the project basedir, i.e., the directory that contains the folder ".mvn".
@REM Fallback to current working directory if not found.
set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+if not "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
set "EXEC_DIR=%CD%"
set "WDIR=%EXEC_DIR%"
:findBaseDir
-IF EXIST "%WDIR%\.mvn" goto baseDirFound
+if exist "%WDIR%\.mvn" goto baseDirFound
cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
+if "%WDIR%"=="%CD%" goto baseDirNotFound
set "WDIR=%CD%"
goto findBaseDir
@@ -138,7 +117,7 @@ cd "%EXEC_DIR%"
:endDetectBaseDir
set "jvmConfig=\.mvn\jvm.config"
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%%jvmConfig%" goto endReadAdditionalConfig
+if not exist "%MAVEN_PROJECTBASEDIR%%jvmConfig%" goto endReadAdditionalConfig
@setlocal EnableExtensions EnableDelayedExpansion
for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
@@ -146,13 +125,13 @@ for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do s
:endReadAdditionalConfig
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-for %%i in ("%M2_HOME%"\boot\plexus-classworlds-*) do set CLASSWORLDS_JAR="%%i"
+for %%i in ("%MAVEN_HOME%"\boot\plexus-classworlds-*) do set CLASSWORLDS_JAR="%%i"
set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%MAVEN_HOME%\bin\m2.conf" "-Dmaven.home=%MAVEN_HOME%" "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
if ERRORLEVEL 1 goto error
goto end
http://git-wip-us.apache.org/repos/asf/maven/blob/fe47a3d7/apache-maven/src/bin/mvnDebug
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug
index caf0b45..be495ff 100755
--- a/apache-maven/src/bin/mvnDebug
+++ b/apache-maven/src/bin/mvnDebug
@@ -1,5 +1,5 @@
#!/bin/sh
-# ----------------------------------------------------------------------------
+
# 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
@@ -16,26 +16,19 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-# ----------------------------------------------------------------------------
-# ----------------------------------------------------------------------------
-# Maven2 Start Up Batch script
+# -----------------------------------------------------------------------------
+# Apache Maven Debug Script
#
-# Required ENV vars:
-# ------------------
-# JAVA_HOME - location of a JDK home dir
+# Environment Variable Prerequisites
#
-# Optional ENV vars
-# -----------------
-# M2_HOME - location of maven2's installed home dir
-# MAVEN_OPTS - parameters passed to the Java VM when running Maven
-# e.g. to debug Maven itself, use
-# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-# ----------------------------------------------------------------------------
+# JAVA_HOME Must point at your Java Development Kit installation.
+# MAVEN_OPTS (Optional) Java runtime options used when Maven is executed.
+# MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files.
+# -----------------------------------------------------------------------------
MAVEN_DEBUG_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
-echo Preparing to Execute Maven in Debug Mode
+echo Preparing to execute Maven in debug mode
env MAVEN_OPTS="$MAVEN_OPTS" MAVEN_DEBUG_OPTS="$MAVEN_DEBUG_OPTS" "`dirname "$0"`/mvn" "$@"
http://git-wip-us.apache.org/repos/asf/maven/blob/fe47a3d7/apache-maven/src/bin/mvnDebug.cmd
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvnDebug.cmd b/apache-maven/src/bin/mvnDebug.cmd
index 1f0d3bf..5f9a20a 100644
--- a/apache-maven/src/bin/mvnDebug.cmd
+++ b/apache-maven/src/bin/mvnDebug.cmd
@@ -1,4 +1,3 @@
-@REM ----------------------------------------------------------------------------
@REM Licensed to the Apache Software Foundation (ASF) under one
@REM or more contributor license agreements. See the NOTICE file
@REM distributed with this work for additional information
@@ -15,15 +14,18 @@
@REM KIND, either express or implied. See the License for the
@REM specific language governing permissions and limitations
@REM under the License.
-@REM ----------------------------------------------------------------------------
-@REM ----------------------------------------------------------------------------
-@REM Maven2 Start Up Batch script to run mvn.cmd with the following additional
-@REM Java VM settings:
+@REM -----------------------------------------------------------------------------
+@REM Apache Maven Debug Script
@REM
-@REM -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM Environment Variable Prerequisites
@REM
-@REM ----------------------------------------------------------------------------
+@REM JAVA_HOME Must point at your Java Development Kit installation.
+@REM MAVEN_BATCH_ECHO (Optional) Set to 'on' to enable the echoing of the batch commands.
+@REM MAVEN_BATCH_PAUSE (Optional) set to 'on' to wait for a key stroke before ending.
+@REM MAVEN_OPTS (Optional) Java runtime options used when Maven is executed.
+@REM MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files.
+@REM -----------------------------------------------------------------------------
@setlocal
@set MAVEN_DEBUG_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
http://git-wip-us.apache.org/repos/asf/maven/blob/fe47a3d7/apache-maven/src/bin/mvnyjp
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvnyjp b/apache-maven/src/bin/mvnyjp
index 3ddec42..a35eabf 100755
--- a/apache-maven/src/bin/mvnyjp
+++ b/apache-maven/src/bin/mvnyjp
@@ -1,5 +1,5 @@
#!/bin/sh
-# ----------------------------------------------------------------------------
+
# 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
@@ -16,23 +16,16 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-# ----------------------------------------------------------------------------
-# ----------------------------------------------------------------------------
-# Maven2 Start Up Batch script
+# -----------------------------------------------------------------------------
+# Apache Maven YourKit Profiler Startup Script
#
-# Required ENV vars:
-# ------------------
-# JAVA_HOME - location of a JDK home dir
+# Environment Variable Prerequisites
#
-# Optional ENV vars
-# -----------------
-# M2_HOME - location of maven2's installed home dir
-# MAVEN_OPTS - parameters passed to the Java VM when running Maven
-# e.g. to debug Maven itself, use
-# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-# ----------------------------------------------------------------------------
+# JAVA_HOME Must point at your Java Development Kit installation.
+# MAVEN_OPTS (Optional) Java runtime options used when Maven is executed.
+# MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files.
+# -----------------------------------------------------------------------------
if [ ! -f "$YJPLIB" ]; then
echo "Error: Unable to autodetect the YJP library location. Please set YJPLIB variable" >&2
[32/50] maven git commit: Removing redundant test
Posted by hb...@apache.org.
Removing redundant test
This closes #85
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/cfaee84a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/cfaee84a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/cfaee84a
Branch: refs/heads/slf4j-gossip
Commit: cfaee84adf44c53e7a169ddaf11e16308708cb88
Parents: 12a1eb2
Author: August Shi <aw...@illinois.edu>
Authored: Fri May 27 17:52:55 2016 -0500
Committer: Michael Osipov <mi...@apache.org>
Committed: Sat May 28 11:12:08 2016 +0200
----------------------------------------------------------------------
.../apache/maven/cli/transfer/FileSizeFormatTest.java | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/cfaee84a/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
index 394c7ed..a870411 100644
--- a/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
@@ -257,16 +257,7 @@ public class FileSizeFormatTest {
}
@Test
- public void testProgressedSizeWithZeroSize()
- {
- FileSizeFormat format = new FileSizeFormat( Locale.ENGLISH );
-
- long _0_bytes = 0L;
- assertEquals( "0 B", format.formatProgress( _0_bytes, _0_bytes ) );
- }
-
- @Test
- public void testProgressedSizeZeroAndSizeZero()
+ public void testProgressedBothZero()
{
FileSizeFormat format = new FileSizeFormat( Locale.ENGLISH );
[08/50] maven git commit: fixed link
Posted by hb...@apache.org.
fixed link
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/59c26ed3
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/59c26ed3
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/59c26ed3
Branch: refs/heads/slf4j-gossip
Commit: 59c26ed3962173a4fd5e76d765fa65f37fb61958
Parents: 3533599
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sun Apr 10 20:15:57 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Sun Apr 10 20:15:57 2016 +0200
----------------------------------------------------------------------
maven-model-builder/src/site/apt/index.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/59c26ed3/maven-model-builder/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/site/apt/index.apt b/maven-model-builder/src/site/apt/index.apt
index 3b02ec4..0ff6f81 100644
--- a/maven-model-builder/src/site/apt/index.apt
+++ b/maven-model-builder/src/site/apt/index.apt
@@ -165,7 +165,7 @@ Maven Model Builder
| <<<env.*>>>\
<<<*>>> | environment variables | <<<$\{env.PATH\}>>> |
*----+------+------+
-| <<<settings.*>>> | Local user settings (see {{{../maven-settings/settings.xml/settings.html}settings reference}}) | <<<$\{settings.localRepository\}>>> |
+| <<<settings.*>>> | Local user settings (see {{{../maven-settings/settings.html}settings reference}}) | <<<$\{settings.localRepository\}>>> |
*----+------+------+
** Notice
[44/50] maven git commit: Use ConsoleListener which now exposes
simpler means to extend and wrap the stream used. Update docs.
Posted by hb...@apache.org.
Use ConsoleListener which now exposes simpler means to extend and wrap the stream used. Update docs.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/957b32e1
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/957b32e1
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/957b32e1
Branch: refs/heads/slf4j-gossip
Commit: 957b32e1fad593ff5641ab2f1e9c52f67596a310
Parents: 8cb186a
Author: Jason Dillon <ja...@planet57.com>
Authored: Tue May 24 14:06:52 2016 -0700
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Thu Jun 2 23:41:45 2016 +0200
----------------------------------------------------------------------
.../impl/gossip/ColorConsoleListener.java | 47 +++++++++++---------
1 file changed, 26 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/957b32e1/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java
index da8a7ed..b9c97a9 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java
@@ -21,10 +21,9 @@ package org.apache.maven.cli.logging.impl.gossip;
import java.io.PrintStream;
+import com.planet57.gossip.listener.ConsoleListener;
import org.fusesource.jansi.AnsiConsole;
-
-import com.planet57.gossip.Event;
-import com.planet57.gossip.listener.ListenerSupport;
+import org.fusesource.jansi.internal.CLibrary;
/**
* Specialized {@link com.planet57.gossip.listener.Listener} which is aware of ANSI streams.
@@ -33,35 +32,41 @@ import com.planet57.gossip.listener.ListenerSupport;
* @since 3.4.0
*/
public class ColorConsoleListener
- extends ListenerSupport
+ extends ConsoleListener
{
private PrintStream out;
- private PrintStream getOut()
+ /**
+ * Returns file descriptor identifier for the configured stream.
+ */
+ private int getFileno()
{
- if ( out == null )
+ switch ( getStream() )
{
- // wrapping has logic which can detect, to some limited degree, if ansi is supported and strip if needed
- out = new PrintStream( AnsiConsole.wrapOutputStream( System.out ) );
+ case OUT:
+ return CLibrary.STDOUT_FILENO;
+
+ case ERR:
+ return CLibrary.STDERR_FILENO;
+
+ default:
+ throw new InternalError();
}
- return out;
}
+ /**
+ * Returns an ANSI aware wrapped stream.
+ *
+ * Needed so that jansi (limited) logic to detect supported streams is applied and copes with
+ * redirection of stream to file to strip out ANSI sequences.
+ */
@Override
- public void onEvent( final Event event ) throws Exception
+ protected PrintStream getOut()
{
- assert event != null;
-
- if ( !isLoggable( event ) )
- {
- return;
- }
-
- PrintStream out = getOut();
- synchronized ( out )
+ if ( out == null )
{
- out.print( render( event ) );
- out.flush();
+ out = new PrintStream( AnsiConsole.wrapOutputStream( super.getOut(), getFileno() ) );
}
+ return out;
}
}
[19/50] maven git commit: Increased memory for forked JVM from 256 to
385m.
Posted by hb...@apache.org.
Increased memory for forked JVM from 256 to 385m.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/eea665d7
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/eea665d7
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/eea665d7
Branch: refs/heads/slf4j-gossip
Commit: eea665d77fe164337388fcdff391d8fca3b01789
Parents: f70e22e
Author: Karl Heinz Marbaise <kh...@apache.org>
Authored: Thu May 5 23:11:26 2016 +0200
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Thu May 5 23:11:26 2016 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/eea665d7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4ad6737..544ae45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -427,7 +427,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>-Xmx256m</argLine>
+ <argLine>-Xmx384m</argLine>
</configuration>
</plugin>
<plugin>
[38/50] maven git commit: point to our documentation on plugins
dependencies upgrade
Posted by hb...@apache.org.
point to our documentation on plugins dependencies upgrade
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/9c139223
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9c139223
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9c139223
Branch: refs/heads/slf4j-gossip
Commit: 9c139223ee06545850d98aedfaf94d54e1fe2ac4
Parents: 2a8f3c3
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sun May 29 09:55:54 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Sun May 29 09:55:54 2016 +0200
----------------------------------------------------------------------
maven-compat/src/site/apt/index.apt | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/9c139223/maven-compat/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/maven-compat/src/site/apt/index.apt b/maven-compat/src/site/apt/index.apt
new file mode 100644
index 0000000..a288cdc
--- /dev/null
+++ b/maven-compat/src/site/apt/index.apt
@@ -0,0 +1,32 @@
+~~ 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.
+
+ -----
+ Introduction
+ -----
+ Herv� Boutemy
+ -----
+ 2016-05-29
+ -----
+
+Maven Compat
+
+ Maven2 classes maintained as compatibility layer for plugins that need to keep Maven2 compatibility.
+
+ Plugins should avoid these classes and be updated to use only Maven3 dependencies (and require Maven3): see
+ {{{https://cwiki.apache.org/confluence/display/MAVEN/Plugin+migration+to+Maven3+dependencies} Plugin migration to Maven3 dependencies}}
+ documentation to get hints on how to make the update.
[42/50] maven git commit: [MNG-6032] WARNING during build based on
absolute path in assembly-descriptor.
Posted by hb...@apache.org.
[MNG-6032] WARNING during build based on absolute path in assembly-descriptor.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/35da0dc2
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/35da0dc2
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/35da0dc2
Branch: refs/heads/slf4j-gossip
Commit: 35da0dc20bee3f03fba014a5dd531022614e636e
Parents: 41144e7e
Author: Karl Heinz Marbaise <kh...@apache.org>
Authored: Tue May 31 23:17:22 2016 +0200
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Tue May 31 23:17:22 2016 +0200
----------------------------------------------------------------------
apache-maven/src/main/assembly/component.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/35da0dc2/apache-maven/src/main/assembly/component.xml
----------------------------------------------------------------------
diff --git a/apache-maven/src/main/assembly/component.xml b/apache-maven/src/main/assembly/component.xml
index 36b2232..8ccf02a 100644
--- a/apache-maven/src/main/assembly/component.xml
+++ b/apache-maven/src/main/assembly/component.xml
@@ -42,7 +42,7 @@ under the License.
</fileSet>
<fileSet>
<directory>target/maven-shared-archive-resources/META-INF</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>./</outputDirectory>
<includes>
<include>LICENSE</include>
<include>NOTICE</include>
[12/50] maven git commit: [MNG-6014] Removing ArtifactHandler for
ejb3 o Followup to MNG-5894 of Maven 3.3.9 where the maven-ejb3-plugin has
been removed from life cycle. o Removed the ArtifactHandler for ejb3 cause
without a bound life cycle it
Posted by hb...@apache.org.
[MNG-6014] Removing ArtifactHandler for ejb3
o Followup to MNG-5894 of Maven 3.3.9 where the maven-ejb3-plugin
has been removed from life cycle.
o Removed the ArtifactHandler for ejb3 cause without
a bound life cycle it does not make sense.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5bac0a84
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5bac0a84
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5bac0a84
Branch: refs/heads/slf4j-gossip
Commit: 5bac0a8432bf6c33e2c3a243462a14d06dd08004
Parents: dac9c81
Author: Karl Heinz Marbaise <kh...@apache.org>
Authored: Mon May 2 20:45:01 2016 +0200
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Mon May 2 20:52:12 2016 +0200
----------------------------------------------------------------------
.../main/resources/META-INF/plexus/artifact-handlers.xml | 11 -----------
1 file changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/5bac0a84/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
index 05795be..d03404b 100644
--- a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
@@ -80,17 +80,6 @@ Artifact handlers are required by the dependency resolution mechanism.
<addedToClasspath>true</addedToClasspath>
</configuration>
</component>
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>ejb3</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
- <configuration>
- <type>ejb3</type>
- <includesDependencies>true</includesDependencies>
- <language>java</language>
- <addedToClasspath>false</addedToClasspath>
- </configuration>
- </component>
<!--
| TEST JAR
[16/50] maven git commit: Code polishing o Replaced static
initializer block with unmodifiableList() list to make sure the list itself
will never being changed.
Posted by hb...@apache.org.
Code polishing
o Replaced static initializer block with unmodifiableList()
list to make sure the list itself will never being changed.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/6d67fb24
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6d67fb24
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6d67fb24
Branch: refs/heads/slf4j-gossip
Commit: 6d67fb2464f5cf1d5e84442c0ca1456b94f2fedf
Parents: 0535716
Author: Karl Heinz Marbaise <kh...@apache.org>
Authored: Thu May 5 22:23:27 2016 +0200
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Thu May 5 22:24:28 2016 +0200
----------------------------------------------------------------------
.../AbstractStringBasedModelInterpolator.java | 38 ++++++++------------
1 file changed, 14 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/6d67fb24/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
index cee376f..2bd8183 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
@@ -23,7 +23,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.HashSet;
+import java.util.Collections;
import java.util.List;
import java.util.Properties;
@@ -56,29 +56,19 @@ import org.codehaus.plexus.interpolation.ValueSource;
public abstract class AbstractStringBasedModelInterpolator
implements ModelInterpolator
{
- private static final List<String> PROJECT_PREFIXES = Arrays.asList( "pom.", "project." );
-
- private static final Collection<String> TRANSLATED_PATH_EXPRESSIONS;
-
- static
- {
- Collection<String> translatedPrefixes = new HashSet<>();
-
- // MNG-1927, MNG-2124, MNG-3355:
- // If the build section is present and the project directory is non-null, we should make
- // sure interpolation of the directories below uses translated paths.
- // Afterward, we'll double back and translate any paths that weren't covered during interpolation via the
- // code below...
- translatedPrefixes.add( "build.directory" );
- translatedPrefixes.add( "build.outputDirectory" );
- translatedPrefixes.add( "build.testOutputDirectory" );
- translatedPrefixes.add( "build.sourceDirectory" );
- translatedPrefixes.add( "build.testSourceDirectory" );
- translatedPrefixes.add( "build.scriptSourceDirectory" );
- translatedPrefixes.add( "reporting.outputDirectory" );
-
- TRANSLATED_PATH_EXPRESSIONS = translatedPrefixes;
- }
+ private static final List<String> PROJECT_PREFIXES =
+ Collections.unmodifiableList( Arrays.asList( "pom.", "project." ) );
+
+ // MNG-1927, MNG-2124, MNG-3355:
+ // If the build section is present and the project directory is non-null, we should make
+ // sure interpolation of the directories below uses translated paths.
+ // Afterward, we'll double back and translate any paths that weren't covered during interpolation via the
+ // code below...
+ private static final Collection<String> TRANSLATED_PATH_EXPRESSIONS =
+ Collections.unmodifiableList( Arrays.asList( "build.directory", "build.outputDirectory",
+ "build.testOutputDirectory", "build.sourceDirectory",
+ "build.testSourceDirectory", "build.scriptSourceDirectory",
+ "reporting.outputDirectory" ) );
@Requirement
private PathTranslator pathTranslator;
[37/50] maven git commit: fixed markup
Posted by hb...@apache.org.
fixed markup
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/2a8f3c3a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/2a8f3c3a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/2a8f3c3a
Branch: refs/heads/slf4j-gossip
Commit: 2a8f3c3a73b338d8c97c691697762de4021881ad
Parents: 4eb8bd6
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sun May 29 09:16:54 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Sun May 29 09:16:54 2016 +0200
----------------------------------------------------------------------
maven-embedder/src/site/apt/logging.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/2a8f3c3a/maven-embedder/src/site/apt/logging.apt
----------------------------------------------------------------------
diff --git a/maven-embedder/src/site/apt/logging.apt b/maven-embedder/src/site/apt/logging.apt
index 477f4dc..340580a 100644
--- a/maven-embedder/src/site/apt/logging.apt
+++ b/maven-embedder/src/site/apt/logging.apt
@@ -54,7 +54,7 @@ Maven Logging
Logging configuration loading is actually done by logging implementation, without any Maven extensions to support merging
Maven installation configuration with per-user configuration for example:
- `${maven.home}/conf/logging` directory was added to core's classpath (see `${maven.home}/bin/m2.conf`). See your implementation
+ <<<$\{maven.home}/conf/logging>>> directory was added to core's classpath (see <<<$\{maven.home}/bin/m2.conf>>>). See your implementation
documentation for details on file names, formats, and so on.
During Maven initialization, Maven tweaks default root logging level to match CLI verbosity choice. Since such feature isn't available
[33/50] maven git commit: updated urls (https,
plexus) and license header formatting
Posted by hb...@apache.org.
updated urls (https, plexus) and license header formatting
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c7a4079d
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c7a4079d
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c7a4079d
Branch: refs/heads/slf4j-gossip
Commit: c7a4079de6f99307c559e6ab67cd2c4d51209638
Parents: cfaee84
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sat May 28 13:28:23 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Sat May 28 13:28:23 2016 +0200
----------------------------------------------------------------------
README.md | 6 ++--
apache-maven/README.txt | 6 ++--
apache-maven/pom.xml | 32 ++++++++++--------
apache-maven/src/conf/toolchains.xml | 2 +-
maven-artifact/pom.xml | 27 ++++++++++-----
maven-compat/pom.xml | 27 ++++++++++-----
.../maven/artifact/manager/WagonManager.java | 2 +-
maven-core/pom.xml | 27 ++++++++++-----
.../AbstractMavenLifecycleParticipant.java | 2 +-
maven-core/src/main/mdo/toolchains.mdo | 4 +--
maven-core/src/site/apt/index.apt | 2 +-
maven-embedder/pom.xml | 27 ++++++++++-----
maven-embedder/src/site/apt/logging.apt | 6 ++--
maven-model-builder/pom.xml | 27 ++++++++++-----
.../maven/model/io/xpp3/package-info.java | 6 ++--
maven-model/src/main/mdo/maven.mdo | 20 +++++------
maven-model/src/site/xdoc/navigation.xml | 35 --------------------
.../org/apache/maven/plugin/AbstractMojo.java | 8 ++---
.../maven/plugin/descriptor/MojoDescriptor.java | 4 +--
maven-settings/src/main/mdo/settings.mdo | 2 +-
maven-settings/src/site/apt/index.apt | 2 +-
pom.xml | 34 ++++++++++---------
src/site/site.xml | 6 ++--
src/site/xdoc/index.xml | 16 ++++-----
24 files changed, 174 insertions(+), 156 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 5f25a99..de283a2 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
# Maven
-Maven is available under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+Maven is available under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
- [Maven Issue Tracker](https://issues.apache.org/jira/browse/MNG)
- [Maven Wiki](https://cwiki.apache.org/confluence/display/MAVEN/Index)
-- [Building Maven](http://maven.apache.org/guides/development/guide-building-maven.html)
-- [Running Core ITs](http://maven.apache.org/core-its/core-it-suite/)
+- [Building Maven](https://maven.apache.org/guides/development/guide-building-maven.html)
+- [Running Core ITs](https://maven.apache.org/core-its/core-it-suite/)
## Bootstrapping Basics
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/apache-maven/README.txt
----------------------------------------------------------------------
diff --git a/apache-maven/README.txt b/apache-maven/README.txt
index 5d3a30a..827fdb7 100644
--- a/apache-maven/README.txt
+++ b/apache-maven/README.txt
@@ -11,12 +11,12 @@
Documentation
-------------
- The most up-to-date documentation can be found at http://maven.apache.org/.
+ The most up-to-date documentation can be found at https://maven.apache.org/.
Release Notes
-------------
- The full list of changes can be found at http://maven.apache.org/docs/history.html.
+ The full list of changes can be found at https://maven.apache.org/docs/history.html.
System Requirements
-------------------
@@ -59,7 +59,7 @@
5) Run "mvn --version" to verify that it is correctly installed.
- For complete documentation, see http://maven.apache.org/download.html#Installation
+ For complete documentation, see https://maven.apache.org/download.html#Installation
Licensing
---------
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 2d00468..9405df8 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -1,19 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to you under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under
- the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
- OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and
- limitations under the License.
- -->
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/apache-maven/src/conf/toolchains.xml
----------------------------------------------------------------------
diff --git a/apache-maven/src/conf/toolchains.xml b/apache-maven/src/conf/toolchains.xml
index aefddd8..14ef3fe 100644
--- a/apache-maven/src/conf/toolchains.xml
+++ b/apache-maven/src/conf/toolchains.xml
@@ -63,7 +63,7 @@ under the License.
| Look for documentation of the toolchains-aware plugin which configuration elements
| can be used.
|
- | See also http://maven.apache.org/guides/mini/guide-using-toolchains.html
+ | See also https://maven.apache.org/guides/mini/guide-using-toolchains.html
|
| General example
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-artifact/pom.xml
----------------------------------------------------------------------
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index c8a63b7..503e097 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -1,14 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
- file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
- governing permissions and limitations under the License.
- -->
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 0c219c1..f828d6e 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -1,14 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
- file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
- governing permissions and limitations under the License.
- -->
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java b/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
index fb7ca8b..4337bb6 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
@@ -29,7 +29,7 @@ import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.proxy.ProxyInfo;
/**
- * Manages <a href="http://maven.apache.org/wagon">Wagon</a> related operations in Maven.
+ * Manages <a href="https://maven.apache.org/wagon">Wagon</a> related operations in Maven.
*
* @author <a href="michal.maczka@dimatics.com">Michal Maczka </a>
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index f439651..30d91f0 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -1,14 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
- file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
- governing permissions and limitations under the License.
- -->
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java b/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java
index 26c4667..01247ae 100644
--- a/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java
+++ b/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java
@@ -27,7 +27,7 @@ import org.apache.maven.execution.MavenSession;
* All callback methods (will) follow beforeXXX/afterXXX naming pattern to
* indicate at what lifecycle point it is being called.
*
- * @see <a href="http://maven.apache.org/examples/maven-3-lifecycle-extensions.html">example</a>
+ * @see <a href="https://maven.apache.org/examples/maven-3-lifecycle-extensions.html">example</a>
* @see <a href="https://issues.apache.org/jira/browse/MNG-4224">MNG-4224</a>
* @since 3.0-alpha-3
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-core/src/main/mdo/toolchains.mdo
----------------------------------------------------------------------
diff --git a/maven-core/src/main/mdo/toolchains.mdo b/maven-core/src/main/mdo/toolchains.mdo
index 9b2aa90..4740d1b 100644
--- a/maven-core/src/main/mdo/toolchains.mdo
+++ b/maven-core/src/main/mdo/toolchains.mdo
@@ -124,9 +124,9 @@
<description>
<![CDATA[Type of toolchain:<ul>
<li><code>jdk</code> for
- <a href="http://maven.apache.org/plugins/maven-toolchains-plugin/toolchains/jdk.html">JDK Standard Toolchain</a>,</li>
+ <a href="https://maven.apache.org/plugins/maven-toolchains-plugin/toolchains/jdk.html">JDK Standard Toolchain</a>,</li>
<li>other value for
- <a href="http://maven.apache.org/plugins/maven-toolchains-plugin/toolchains/custom.html">Custom Toolchain</a></li>
+ <a href="https://maven.apache.org/plugins/maven-toolchains-plugin/toolchains/custom.html">Custom Toolchain</a></li>
</ul>
]]></description>
<type>String</type>
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-core/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/index.apt b/maven-core/src/site/apt/index.apt
index f6c26fd..61d1772 100644
--- a/maven-core/src/site/apt/index.apt
+++ b/maven-core/src/site/apt/index.apt
@@ -51,7 +51,7 @@ Maven Core
({{{./apidocs/org/apache/maven/classrealm/ClassRealmManager.html}javadoc}}),
with its <<<DefaultClassRealmManager>>> implementation
({{{./xref/org/apache/maven/classrealm/DefaultClassRealmManager.html}source}}), using
- {{{http://plexus.codehaus.org/plexus-classworlds/}Plexus Classworlds}},
+ {{{https://codehaus-plexus.github.io/plexus-classworlds/}Plexus Classworlds}},
* {{{./extension.html}extension descriptor}},
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 2cfa670..71dcf90 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -1,14 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
- file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
- governing permissions and limitations under the License.
- -->
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-embedder/src/site/apt/logging.apt
----------------------------------------------------------------------
diff --git a/maven-embedder/src/site/apt/logging.apt b/maven-embedder/src/site/apt/logging.apt
index cc9257d..477f4dc 100644
--- a/maven-embedder/src/site/apt/logging.apt
+++ b/maven-embedder/src/site/apt/logging.apt
@@ -31,10 +31,10 @@ Maven Logging
* Logging API
Maven uses
- {{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/package-summary.html}Plexus
+ {{{https://codehaus-plexus.github.io/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}}.
+ {{{https://codehaus-plexus.github.io/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/LoggerManager.html}LoggerManager}}
+ / {{{https://codehaus-plexus.github.io/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/Logger.html}Logger}}.
Starting with Maven 3.1.0:
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-model-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index d88ff78..b6ea3cd 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -1,14 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
- file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
- governing permissions and limitations under the License.
- -->
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java
----------------------------------------------------------------------
diff --git a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java b/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java
index 648607c..299193d 100644
--- a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java
+++ b/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java
@@ -2,10 +2,10 @@
/**
* XML reader and writer classes for Maven POM, generated from <code>maven.mdo</code> model.
* These classes use
- * <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/pull/package-summary.html">plexus-utils'
+ * <a href="https://codehaus-plexus.github.io/plexus-utils/apidocs/org/codehaus/plexus/util/xml/pull/package-summary.html">plexus-utils'
* XML Pull Parser API</a> for their internal XML handling and
- * <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomBuilder.html">Xpp3DomBuilder</a> +
- * <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3Dom.html">Xpp3Dom</a> for
+ * <a href="https://codehaus-plexus.github.io/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomBuilder.html">Xpp3DomBuilder</a> +
+ * <a href="https://codehaus-plexus.github.io/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3Dom.html">Xpp3Dom</a> for
* DOM content representation (see <code><configuration></code> elements).
*/
package org.apache.maven.model.io.xpp3;
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-model/src/main/mdo/maven.mdo
----------------------------------------------------------------------
diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo
index 3f6b6d6..5eba3ea 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -54,8 +54,8 @@
<p>This is a reference for the Maven project descriptor used in Maven.</p>
<p>An XSD is available at:</p>
<ul>
- <li><a href="http://maven.apache.org/xsd/maven-v3_0_0.xsd">http://maven.apache.org/xsd/maven-v3_0_0.xsd</a> for Maven 1.1.</li>
- <li><a href="http://maven.apache.org/xsd/maven-4.0.0.xsd">http://maven.apache.org/xsd/maven-4.0.0.xsd</a> for Maven 2.0.</li>
+ <li><a href="https://maven.apache.org/xsd/maven-v3_0_0.xsd">https://maven.apache.org/xsd/maven-v3_0_0.xsd</a> for Maven 1.1.</li>
+ <li><a href="https://maven.apache.org/xsd/maven-4.0.0.xsd">https://maven.apache.org/xsd/maven-4.0.0.xsd</a> for Maven 2.0.</li>
</ul>
]]>
</description>
@@ -701,7 +701,7 @@
These dependencies are used to construct a classpath for your
project during the build process. They are automatically downloaded from the
repositories defined in this project.
- See <a href="http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html">the
+ See <a href="https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html">the
dependency mechanism</a> for more information.
]]>
</description>
@@ -1397,7 +1397,7 @@
calculate the various classpaths used for compilation, testing, and so on.
It also assists in determining which artifacts to include in a distribution of
this project. For more information, see
- <a href="http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html">the
+ <a href="https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html">the
dependency mechanism</a>.
]]>
</description>
@@ -2095,8 +2095,8 @@
The source control management system URL
that describes the repository and how to connect to the
repository. For more information, see the
- <a href="http://maven.apache.org/scm/scm-url-format.html">URL format</a>
- and <a href="http://maven.apache.org/scm/scms-overview.html">list of supported SCMs</a>.
+ <a href="https://maven.apache.org/scm/scm-url-format.html">URL format</a>
+ and <a href="https://maven.apache.org/scm/scms-overview.html">list of supported SCMs</a>.
This connection is read-only.
]]>
</description>
@@ -2139,8 +2139,8 @@
The source control management system URL
that describes the repository and how to connect to the
repository. For more information, see the
- <a href="http://maven.apache.org/scm/scm-url-format.html">URL format</a>
- and <a href="http://maven.apache.org/scm/scms-overview.html">list of supported SCMs</a>.
+ <a href="https://maven.apache.org/scm/scm-url-format.html">URL format</a>
+ and <a href="https://maven.apache.org/scm/scms-overview.html">list of supported SCMs</a>.
This connection is read-only.
<br /><b>Default value is</b>: parent value [+ path adjustment] + artifactId
]]>
@@ -2642,8 +2642,8 @@
<li><code>combine.children</code>: available values are <code>merge</code> (default) and <code>append</code>,</li>
<li><code>combine.self</code>: available values are <code>merge</code> (default) and <code>override</code>.</li>
</ul>
- <p>See <a href="http://maven.apache.org/pom.html#Plugins">POM Reference documentation</a> and
- <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomUtils.html">Xpp3DomUtils</a>
+ <p>See <a href="https://maven.apache.org/pom.html#Plugins">POM Reference documentation</a> and
+ <a href="https://codehaus-plexus.github.io/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomUtils.html">Xpp3DomUtils</a>
for more information.</p>
]]>
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-model/src/site/xdoc/navigation.xml
----------------------------------------------------------------------
diff --git a/maven-model/src/site/xdoc/navigation.xml b/maven-model/src/site/xdoc/navigation.xml
deleted file mode 100644
index 110a953..0000000
--- a/maven-model/src/site/xdoc/navigation.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project name="Project Descriptor">
- <title>Project Descriptor</title>
- <body>
- <breadcrumbs>
- <item name="Apache" href="http://www.apache.org" />
- <item name="Maven" href="http://maven.apache.org/" />
- <item name="Maven 1.x" href="http://maven.apache.org/maven-1.x/" />
- <item name="Reference" href="http://maven.apache.org/maven-1.x/reference/index.html" />
- </breadcrumbs>
- <menu name="Maven Project Descriptor">
- <item name="About" href="/index.html" />
- <item name="Model Documentation" href="/maven.html" />
- <item name="API Docs" href="/apidocs/" target="_blank" />
- </menu>
- </body>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
index d33e9bf..43fffb5 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
@@ -96,7 +96,7 @@ import org.apache.maven.plugin.logging.SystemStreamLog;
* The execution of either will not affect the current project, but instead make available the
* <code>${executedProject}</code> expression if required. An alternate lifecycle can also be provided:
* for more information see the documentation on the
- * <a href="http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html"
+ * <a href="https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html"
* target="_blank">build lifecycle</a>.
* </td>
* </tr>
@@ -133,9 +133,9 @@ import org.apache.maven.plugin.logging.SystemStreamLog;
* </tr>
* </table>
*
- * @see <a href="http://maven.apache.org/guides/plugin/guide-java-plugin-development.html" target="_blank">Guide to Developing Java Plugins</a>
- * @see <a href="http://maven.apache.org/guides/mini/guide-configuring-plugins.html" target="_blank">Guide to Configuring Plug-ins</a>
- * @see <a href="http://maven.apache.org/developers/mojo-api-specification.html" target="_blank">Mojo API Specification</a>
+ * @see <a href="https://maven.apache.org/guides/plugin/guide-java-plugin-development.html" target="_blank">Guide to Developing Java Plugins</a>
+ * @see <a href="https://maven.apache.org/guides/mini/guide-configuring-plugins.html" target="_blank">Guide to Configuring Plug-ins</a>
+ * @see <a href="https://maven.apache.org/developers/mojo-api-specification.html" target="_blank">Mojo API Specification</a>
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @author jdcasey
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
index 697d95a..515b110 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
@@ -33,8 +33,8 @@ import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
* The bean containing the Mojo descriptor.
* <br/>
* For more information about the usage tag, have a look to:
- * <a href="http://maven.apache.org/developers/mojo-api-specification.html">
- * http://maven.apache.org/developers/mojo-api-specification.html</a>
+ * <a href="https://maven.apache.org/developers/mojo-api-specification.html">
+ * https://maven.apache.org/developers/mojo-api-specification.html</a>
*
* @todo is there a need for the delegation of MavenMojoDescriptor to this?
* Why not just extend ComponentDescriptor here?
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-settings/src/main/mdo/settings.mdo
----------------------------------------------------------------------
diff --git a/maven-settings/src/main/mdo/settings.mdo b/maven-settings/src/main/mdo/settings.mdo
index 6fbc92b..ba2b97e 100644
--- a/maven-settings/src/main/mdo/settings.mdo
+++ b/maven-settings/src/main/mdo/settings.mdo
@@ -33,7 +33,7 @@
<p>The default location for the settings file is <i>~/.m2/settings.xml</i></p>
<p>An XSD is available at:</p>
<ul>
- <li><a href="http://maven.apache.org/xsd/settings-1.0.0.xsd">http://maven.apache.org/xsd/settings-1.0.0.xsd</a>.</li>
+ <li><a href="https://maven.apache.org/xsd/settings-1.0.0.xsd">https://maven.apache.org/xsd/settings-1.0.0.xsd</a>.</li>
</ul>
]]>
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/maven-settings/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/maven-settings/src/site/apt/index.apt b/maven-settings/src/site/apt/index.apt
index 6e404e8..17eaf8c 100644
--- a/maven-settings/src/site/apt/index.apt
+++ b/maven-settings/src/site/apt/index.apt
@@ -33,4 +33,4 @@ Maven Settings Model
* A {{{./settings.html}Descriptor Reference}}
- * An {{{http://maven.apache.org/xsd/settings-1.0.0.xsd}XSD}}
+ * An {{{https://maven.apache.org/xsd/settings-1.0.0.xsd}XSD}}
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cb5223c..316d00c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,18 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to you under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under
- the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
- OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and
- limitations under the License.
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -38,7 +42,7 @@
number of other development tools for reporting or the build
process.
</description>
- <url>http://maven.apache.org/ref/${project.version}/</url>
+ <url>https://maven.apache.org/ref/${project.version}/</url>
<inceptionYear>2001</inceptionYear>
<properties>
@@ -103,7 +107,7 @@
<url>https://builds.apache.org/job/maven-3.x/</url>
</ciManagement>
<distributionManagement>
- <downloadUrl>http://maven.apache.org/download.html</downloadUrl>
+ <downloadUrl>https://maven.apache.org/download.html</downloadUrl>
<site>
<id>apache.website</id>
<url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</url>
@@ -618,7 +622,7 @@
<quiet>true</quiet>
<links combine.children="append">
<link>http://download.eclipse.org/aether/aether-core/${aetherVersion}/apidocs/</link>
- <link>http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/</link>
+ <link>https://codehaus-plexus.github.io/plexus-containers/plexus-container-default/apidocs/</link>
</links>
</configuration>
<reportSets>
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index bcc6103..321eef3 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -25,11 +25,11 @@ under the License.
<bannerLeft>
<name>${project.name}</name>
- <src>http://maven.apache.org/images/apache-maven-project.png</src>
- <href>http://maven.apache.org/</href>
+ <src>https://maven.apache.org/images/apache-maven-project.png</src>
+ <href>https://maven.apache.org/</href>
</bannerLeft>
<bannerRight>
- <src>http://maven.apache.org/images/maventxt_logo_200.gif</src>
+ <src>https://maven.apache.org/images/maventxt_logo_200.gif</src>
</bannerRight>
<skin>
http://git-wip-us.apache.org/repos/asf/maven/blob/c7a4079d/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 201fd4c..fb4b40f 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -35,7 +35,7 @@
builds, dependency management, documentation creation, site
publication, and distribution publication are all controlled from
<a href="./maven-model/maven.html">the <code>pom.xml</code> declarative file</a>. Maven can be extended by
- <a href="http://maven.apache.org/plugins/">plugins</a> to utilise a
+ <a href="https://maven.apache.org/plugins/">plugins</a> to utilise a
number of other development tools for reporting or the build
process.</p>
@@ -56,14 +56,14 @@
<area shape="rect" coords="388,284,521,319" alt="maven-model-builder" href="maven-model-builder/" />
<area shape="rect" coords="409,342,500,378" alt="maven-model" href="maven-model/" />
<area shape="rect" coords="551,58,707,94" alt="commons-cli" href="http://commons.apache.org/cli/" />
- <area shape="rect" coords="551,116,739,152" alt="wagon-provider-api" href="http://maven.apache.org/wagon/wagon-provider-api/" />
+ <area shape="rect" coords="551,116,739,152" alt="wagon-provider-api" href="https://maven.apache.org/wagon/wagon-provider-api/" />
<area shape="rect" coords="550,175,690,211" alt="plexus-sec-dispatcher" href="https://github.com/codehaus-plexus/plexus-sec-dispatcher" />
- <area shape="rect" coords="581,230,660,265" alt="plexus-cipher" href="hhttps://github.com/codehaus-plexus/plexus-cipher" />
- <area shape="rect" coords="551,284,707,320" alt="plexus-interpolation" href="https://github.com/codehaus-plexus/plexus-interpolation" />
- <area shape="rect" coords="551,359,776,395" alt="plexus-component-annotations" href="https://github.com/codehaus-plexus/plexus-containers" />
- <area shape="rect" coords="550,401,682,437" alt="plexus-classworlds" href="https://github.com/codehaus-plexus/plexus-classworlds" />
- <area shape="rect" coords="685,455,775,491" alt="plexus-utils" href="https://github.com/codehaus-plexus/plexus-utils" />
- <area shape="rect" coords="542,167,783,502" alt="plexus" href="https://github.com/codehaus-plexus" />
+ <area shape="rect" coords="581,230,660,265" alt="plexus-cipher" href="https://github.com/codehaus-plexus/plexus-cipher" />
+ <area shape="rect" coords="551,284,707,320" alt="plexus-interpolation" href="https://codehaus-plexus.github.io/plexus-interpolation" />
+ <area shape="rect" coords="551,359,776,395" alt="plexus-component-annotations" href="https://codehaus-plexus.github.io/plexus-containers" />
+ <area shape="rect" coords="550,401,682,437" alt="plexus-classworlds" href="https://codehaus-plexus.github.io/plexus-classworlds" />
+ <area shape="rect" coords="685,455,775,491" alt="plexus-utils" href="https://codehaus-plexus.github.io/plexus-utils" />
+ <area shape="rect" coords="542,167,783,502" alt="plexus" href="https://codehaus-plexus.github.io/" />
<area shape="rect" coords="68,338,240,482" alt="aether" href="http://www.eclipse.org/projects/project_summary.php?projectid=technology.aether" />
<area shape="rect" coords="401,393,509,524" alt="sisu" href="http://www.eclipse.org/projects/project_summary.php?projectid=technology.sisu" />
<area shape="rect" coords="416,543,493,577" alt="guice" href="http://code.google.com/p/google-guice/" />
[25/50] maven git commit: [MNG-5567] Zip files are not included in
classpaths at all
Posted by hb...@apache.org.
[MNG-5567] Zip files are not included in classpaths at all
By definition of the classpath [1], JAR and Zip files are valid
compressed files. Zips are likely to contain resources shared
around. This totally relieves of unpacking stuff and readding
to the classpath and support what the JVM provided by defeault.
Sharing resources will just work.
[1] http://docs.oracle.com/javase/8/docs/technotes/tools/windows/classpath.html#A1100592
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c023e581
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c023e581
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c023e581
Branch: refs/heads/slf4j-gossip
Commit: c023e58104b71e27def0caa034d39ab0fa0373b6
Parents: ce580ea
Author: Michael Osipov <mi...@apache.org>
Authored: Mon May 16 21:18:04 2016 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Mon May 16 21:18:04 2016 +0200
----------------------------------------------------------------------
.../resources/META-INF/plexus/artifact-handlers.xml | 13 +++++++++++++
maven-core/src/site/apt/artifact-handlers.apt | 2 ++
2 files changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/c023e581/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
index 2f26ce2..92ddaec 100644
--- a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
@@ -190,5 +190,18 @@ Artifact handlers are required by the dependency resolution mechanism.
</configuration>
</component>
+ <!--
+ | ZIP
+ |-->
+ <component>
+ <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role-hint>zip</role-hint>
+ <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <configuration>
+ <type>zip</type>
+ <addedToClasspath>true</addedToClasspath>
+ </configuration>
+ </component>
+
</components>
</component-set>
http://git-wip-us.apache.org/repos/asf/maven/blob/c023e581/maven-core/src/site/apt/artifact-handlers.apt
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/artifact-handlers.apt b/maven-core/src/site/apt/artifact-handlers.apt
index 1a4b344..79572ad 100644
--- a/maven-core/src/site/apt/artifact-handlers.apt
+++ b/maven-core/src/site/apt/artifact-handlers.apt
@@ -53,3 +53,5 @@ Default Artifact Handlers Reference
*--------------------+------------+------------+---------------+-----------+---------------------+-----------------------+
| <<<test-jar>>> | <<<jar>>> | <<<jar>>> | <<<tests>>> | java | <<<true>>> | |
*--------------------+------------+------------+---------------+-----------+---------------------+-----------------------+
+| <<<zip>>> | <= type> | <= type> | | none | <<<true>>> | |
+*--------------------+------------+------------+---------------+-----------+---------------------+-----------------------+
\ No newline at end of file
[21/50] maven git commit: [MNG-5815] "mvn.cmd" does not indicate
failure properly when using "&&"
Posted by hb...@apache.org.
[MNG-5815] "mvn.cmd" does not indicate failure properly when using "&&"
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/176cc126
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/176cc126
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/176cc126
Branch: refs/heads/slf4j-gossip
Commit: 176cc12649bf53671148a7cc71c251c671df2d10
Parents: bd03f68
Author: Michael Osipov <mi...@apache.org>
Authored: Wed May 11 11:47:14 2016 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Wed May 11 11:47:14 2016 +0200
----------------------------------------------------------------------
apache-maven/src/bin/mvn.cmd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/176cc126/apache-maven/src/bin/mvn.cmd
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index 274b065..c8ad237 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -149,4 +149,4 @@ if "%MAVEN_BATCH_PAUSE%"=="on" pause
if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
-exit /B %ERROR_CODE%
+cmd /C exit /B %ERROR_CODE%
[31/50] maven git commit: [MNG-6029] Duplicate conditional and body
in MetadataResolutionResult.java
Posted by hb...@apache.org.
[MNG-6029] Duplicate conditional and body in MetadataResolutionResult.java
The `requestType.equals( MetadataResolutionRequestTypeEnum.classpathRuntime` case is repeated three times. One should be removed, and the other looks like it should be `requestType.equals( MetadataResolutionRequestTypeEnum.classpathTest`
Signed-off-by: Michael Osipov <mi...@apache.org>
This closes #79
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/12a1eb2e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/12a1eb2e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/12a1eb2e
Branch: refs/heads/slf4j-gossip
Commit: 12a1eb2efb308c575b6aad458adff819139eabb2
Parents: 79c81ce
Author: kilida <ki...@gmail.com>
Authored: Thu Mar 24 22:13:45 2016 -0400
Committer: Michael Osipov <mi...@apache.org>
Committed: Sat May 28 00:16:26 2016 +0200
----------------------------------------------------------------------
.../maven/repository/metadata/MetadataResolutionResult.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/12a1eb2e/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
index 1d9e9c4..74a3427 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
@@ -115,11 +115,7 @@ public class MetadataResolutionResult
{
return conflictResolver.resolveConflicts( getGraph(), ArtifactScopeEnum.runtime );
}
- else if ( requestType.equals( MetadataResolutionRequestTypeEnum.classpathRuntime ) )
- {
- return conflictResolver.resolveConflicts( getGraph(), ArtifactScopeEnum.test );
- }
- else if ( requestType.equals( MetadataResolutionRequestTypeEnum.classpathRuntime ) )
+ else if ( requestType.equals( MetadataResolutionRequestTypeEnum.classpathTest ) )
{
return conflictResolver.resolveConflicts( getGraph(), ArtifactScopeEnum.test );
}
[36/50] maven git commit: fixed site generation
Posted by hb...@apache.org.
fixed site generation
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4eb8bd60
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4eb8bd60
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4eb8bd60
Branch: refs/heads/slf4j-gossip
Commit: 4eb8bd60c2aa66c08c4ce636a1dd5b485bdad30c
Parents: e076fd2
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sat May 28 23:13:23 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Sat May 28 23:13:23 2016 +0200
----------------------------------------------------------------------
pom.xml | 5 +++++
src/site/site.xml | 15 ---------------
2 files changed, 5 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/4eb8bd60/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2ba3018..bf3aa61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -486,6 +486,11 @@ under the License.
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.3.1</version><!-- failure with 1.4.1 when building site-->
+ </plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
http://git-wip-us.apache.org/repos/asf/maven/blob/4eb8bd60/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 321eef3..a9d2e93 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -23,21 +23,6 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd"
name="Apache Maven">
- <bannerLeft>
- <name>${project.name}</name>
- <src>https://maven.apache.org/images/apache-maven-project.png</src>
- <href>https://maven.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <src>https://maven.apache.org/images/maventxt_logo_200.gif</src>
- </bannerRight>
-
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>1.3.0</version>
- </skin>
-
<body>
<breadcrumbs>
<item name="Ref" href="../" />
[47/50] maven git commit: Add customized listener that is aware of
ansi colorization and can, if needed,
strip out ansi sequences when stream is not a tty Minor hack when -l option is
set to force jansi to strip sequences.
Posted by hb...@apache.org.
Add customized listener that is aware of ansi colorization and can, if needed, strip out ansi sequences when stream is not a tty Minor hack when -l option is set to force jansi to strip sequences.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c279b0ab
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c279b0ab
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c279b0ab
Branch: refs/heads/slf4j-gossip
Commit: c279b0ab49cad8d37b1976e16ae498fd735b1813
Parents: 700ed37
Author: Jason Dillon <ja...@planet57.com>
Authored: Fri May 20 16:58:13 2016 -0700
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Thu Jun 2 23:41:45 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/maven/cli/MavenCli.java | 3 +
.../impl/gossip/ColorConsoleListener.java | 67 ++++++++++++++++++++
.../org.sonatype.gossip/config.properties | 2 +-
3 files changed, 71 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/c279b0ab/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
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 6ac77de..a72c254 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
@@ -466,6 +466,9 @@ public class MavenCli
File logFile = new File( cliRequest.commandLine.getOptionValue( CLIManager.LOG_FILE ) );
logFile = resolveFile( logFile, cliRequest.workingDirectory );
+ // HACK: disable any colorization when writing log file
+ System.setProperty( "jansi.strip", Boolean.TRUE.toString() );
+
// redirect stdout and stderr to file
try
{
http://git-wip-us.apache.org/repos/asf/maven/blob/c279b0ab/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java
new file mode 100644
index 0000000..4f80738
--- /dev/null
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java
@@ -0,0 +1,67 @@
+package org.apache.maven.cli.logging.impl.gossip;
+
+/*
+ * 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.PrintStream;
+
+import org.fusesource.jansi.AnsiConsole;
+
+import org.sonatype.gossip.Event;
+import org.sonatype.gossip.listener.ListenerSupport;
+
+/**
+ * Specialized {@link org.sonatype.gossip.listener.Listener} which is aware of ANSI streams.
+ *
+ * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
+ * @since 3.4.0
+ */
+public class ColorConsoleListener
+ extends ListenerSupport
+{
+ private PrintStream out;
+
+ private PrintStream getOut()
+ {
+ if ( out == null )
+ {
+ // wrapping has logic which can detect, to some limited degree, if ansi is supported and strip if needed
+ out = new PrintStream( AnsiConsole.wrapOutputStream( System.out ) );
+ }
+ return out;
+ }
+
+ @Override
+ public void onEvent( final Event event ) throws Exception
+ {
+ assert event != null;
+
+ if ( !isLoggable( event ) )
+ {
+ return;
+ }
+
+ PrintStream out = getOut();
+ synchronized ( out )
+ {
+ out.print( render( event ) );
+ out.flush();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven/blob/c279b0ab/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties b/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties
index acec235..587b2be 100644
--- a/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties
+++ b/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties
@@ -56,7 +56,7 @@ profile.maven-plain.trigger.default.ignoreCase=true
profile.maven-color.includes=maven-common
profile.maven-color.listeners=console
-profile.maven-color.listener.console=org.sonatype.gossip.listener.ConsoleListener
+profile.maven-color.listener.console=org.apache.maven.cli.logging.impl.gossip.ColorConsoleListener
profile.maven-color.listener.console.renderer=org.apache.maven.cli.logging.impl.gossip.ColorRenderer
profile.maven-color.listener.console.renderer.pattern=[%l] %m%n%x
profile.maven-color.triggers=default
[02/50] maven git commit: [MNG-5984] Maven core extension resolution
ignores repositories from activeByDefault profiles in settings.xml
Posted by hb...@apache.org.
[MNG-5984] Maven core extension resolution ignores repositories from activeByDefault profiles in settings.xml
o Updated to decouple settings profile activation from the
'ConfigurationProcessor' in use.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/62374f51
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/62374f51
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/62374f51
Branch: refs/heads/slf4j-gossip
Commit: 62374f51fd05b233fc34e39c294322fa3823e4d7
Parents: c940b84
Author: Christian Schulte <sc...@apache.org>
Authored: Fri Feb 26 21:05:01 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Fri Feb 26 21:05:01 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/maven/cli/MavenCli.java | 151 +++++++++++++++----
.../SettingsXmlConfigurationProcessor.java | 102 -------------
2 files changed, 124 insertions(+), 129 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/62374f51/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
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 93b25d6..93af417 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
@@ -19,15 +19,34 @@ package org.apache.maven.cli;
* under the License.
*/
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
-import com.google.inject.AbstractModule;
+import java.io.BufferedInputStream;
+import java.io.Console;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.UnrecognizedOptionException;
import org.apache.maven.BuildAbort;
import org.apache.maven.InternalErrorException;
import org.apache.maven.Maven;
+import org.apache.maven.artifact.InvalidRepositoryException;
+import org.apache.maven.bridge.MavenRepositorySystem;
import org.apache.maven.building.FileSource;
import org.apache.maven.building.Problem;
import org.apache.maven.building.Source;
@@ -58,7 +77,15 @@ import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.extension.internal.CoreExports;
import org.apache.maven.extension.internal.CoreExtensionEntry;
import org.apache.maven.lifecycle.LifecycleExecutionException;
+import org.apache.maven.model.Profile;
+import org.apache.maven.model.Repository;
+import org.apache.maven.model.building.DefaultModelProblem;
+import org.apache.maven.model.building.ModelProblem;
+import org.apache.maven.model.building.ModelProblemCollector;
+import org.apache.maven.model.building.ModelProblemCollectorRequest;
import org.apache.maven.model.building.ModelProcessor;
+import org.apache.maven.model.profile.DefaultProfileActivationContext;
+import org.apache.maven.model.profile.ProfileSelector;
import org.apache.maven.project.MavenProject;
import org.apache.maven.properties.internal.EnvironmentUtils;
import org.apache.maven.properties.internal.SystemProperties;
@@ -77,6 +104,9 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
import org.codehaus.plexus.logging.LoggerManager;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import com.google.common.base.Charsets;
+import com.google.common.io.Files;
+import com.google.inject.AbstractModule;
import org.eclipse.aether.transfer.TransferListener;
import org.slf4j.ILoggerFactory;
import org.slf4j.Logger;
@@ -87,27 +117,6 @@ import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
import org.sonatype.plexus.components.sec.dispatcher.SecUtil;
import org.sonatype.plexus.components.sec.dispatcher.model.SettingsSecurity;
-import java.io.BufferedInputStream;
-import java.io.Console;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-import java.util.StringTokenizer;
-
// TODO: push all common bits back to plexus cli and prepare for transition to Guice. We don't need 50 ways to make CLIs
/**
@@ -172,6 +181,8 @@ public class MavenCli
private Map<String, ConfigurationProcessor> configurationProcessors;
+ private ProfileSelector profileSelector;
+
public MavenCli()
{
this( null );
@@ -280,9 +291,9 @@ public class MavenCli
properties( cliRequest );
localContainer = container( cliRequest );
commands( cliRequest );
- populateRequest( cliRequest );
configure( cliRequest );
toolchains( cliRequest );
+ populateRequest( cliRequest );
encryption( cliRequest );
repository( cliRequest );
return execute( cliRequest );
@@ -594,6 +605,8 @@ public class MavenCli
dispatcher = (DefaultSecDispatcher) container.lookup( SecDispatcher.class, "maven" );
+ profileSelector = container.lookup( ProfileSelector.class );
+
return container;
}
@@ -848,11 +861,95 @@ public class MavenCli
private void repository( CliRequest cliRequest )
throws Exception
{
- if ( cliRequest.commandLine.hasOption( CLIManager.LEGACY_LOCAL_REPOSITORY ) || Boolean.getBoolean(
- "maven.legacyLocalRepo" ) )
+ if ( cliRequest.commandLine.hasOption( CLIManager.LEGACY_LOCAL_REPOSITORY )
+ || Boolean.getBoolean( "maven.legacyLocalRepo" ) )
{
cliRequest.request.setUseLegacyLocalRepository( true );
}
+
+ // Adds repositories from settings profiles.
+ final MavenExecutionRequest request = cliRequest.getRequest();
+ final DefaultProfileActivationContext profileActivationContext = new DefaultProfileActivationContext();
+ profileActivationContext.setActiveProfileIds( request.getActiveProfiles() );
+ profileActivationContext.setInactiveProfileIds( request.getInactiveProfiles() );
+ profileActivationContext.setSystemProperties( request.getSystemProperties() );
+ profileActivationContext.setUserProperties( request.getUserProperties() );
+ profileActivationContext.setProjectDirectory( request.getPom() != null
+ ? request.getPom().getParentFile()
+ : null );
+
+ final List<ModelProblem> modelProblems = new ArrayList<>();
+ final List<Profile> activeProfiles =
+ this.profileSelector.getActiveProfiles( request.getProfiles(), profileActivationContext,
+ new ModelProblemCollector()
+ {
+
+ @Override
+ public void add( final ModelProblemCollectorRequest req )
+ {
+ modelProblems.add( new DefaultModelProblem(
+ req.getMessage(), req.getSeverity(),
+ req.getVersion(), Profile.SOURCE_SETTINGS, -1, -1,
+ null, req.getException() ) );
+
+ }
+
+ } );
+
+ if ( !modelProblems.isEmpty() )
+ {
+ slf4jLogger.warn( "" );
+ slf4jLogger.warn( "Some problems were encountered while processing profiles" );
+
+ for ( final ModelProblem problem : modelProblems )
+ {
+ slf4jLogger.warn( problem.getMessage(), problem.getException() );
+ }
+
+ slf4jLogger.warn( "" );
+ }
+
+ if ( !activeProfiles.isEmpty() )
+ {
+ for ( final Profile profile : activeProfiles )
+ {
+ final List<Repository> remoteRepositories = profile.getRepositories();
+
+ for ( final Repository remoteRepository : remoteRepositories )
+ {
+ try
+ {
+ request.addRemoteRepository(
+ MavenRepositorySystem.buildArtifactRepository( remoteRepository ) );
+
+ }
+ catch ( final InvalidRepositoryException e )
+ {
+ slf4jLogger.warn( String.format( "Failure adding repository '%s' from profile '%s'.",
+ remoteRepository.getId(), profile.getId() ), e );
+
+ }
+ }
+
+ final List<Repository> pluginRepositories = profile.getPluginRepositories();
+
+ for ( final Repository pluginRepository : pluginRepositories )
+ {
+ try
+ {
+ request.addPluginArtifactRepository(
+ MavenRepositorySystem.buildArtifactRepository( pluginRepository ) );
+
+ }
+ catch ( InvalidRepositoryException e )
+ {
+ slf4jLogger.warn( String.format( "Failure adding plugin repository '%s' from profile '%s'.",
+ pluginRepository.getId(), profile.getId() ), e );
+
+ }
+ }
+ }
+ }
}
private int execute( CliRequest cliRequest )
http://git-wip-us.apache.org/repos/asf/maven/blob/62374f51/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java b/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
index 1a57baa..7ba2194 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
@@ -21,25 +21,13 @@ package org.apache.maven.cli.configuration;
import java.io.File;
import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.commons.cli.CommandLine;
-import org.apache.maven.artifact.InvalidRepositoryException;
-import org.apache.maven.bridge.MavenRepositorySystem;
import org.apache.maven.building.Source;
import org.apache.maven.cli.CLIManager;
import org.apache.maven.cli.CliRequest;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequestPopulationException;
-import org.apache.maven.model.Profile;
-import org.apache.maven.model.Repository;
-import org.apache.maven.model.building.DefaultModelProblem;
-import org.apache.maven.model.building.ModelProblem;
-import org.apache.maven.model.building.ModelProblemCollector;
-import org.apache.maven.model.building.ModelProblemCollectorRequest;
-import org.apache.maven.model.profile.DefaultProfileActivationContext;
-import org.apache.maven.model.profile.ProfileSelector;
import org.apache.maven.settings.Mirror;
import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Server;
@@ -50,7 +38,6 @@ import org.apache.maven.settings.building.SettingsBuilder;
import org.apache.maven.settings.building.SettingsBuildingRequest;
import org.apache.maven.settings.building.SettingsBuildingResult;
import org.apache.maven.settings.building.SettingsProblem;
-import org.apache.maven.settings.crypto.SettingsDecrypter;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.slf4j.Logger;
@@ -77,12 +64,6 @@ public class SettingsXmlConfigurationProcessor
@Requirement
private SettingsBuilder settingsBuilder;
- @Requirement
- private SettingsDecrypter settingsDecrypter;
-
- @Requirement
- private ProfileSelector profileSelector;
-
@Override
public void process( CliRequest cliRequest )
throws Exception
@@ -171,89 +152,6 @@ public class SettingsXmlConfigurationProcessor
}
logger.warn( "" );
}
-
- // profile activation
- final DefaultProfileActivationContext profileActivationContext = new DefaultProfileActivationContext();
- profileActivationContext.setActiveProfileIds( request.getActiveProfiles() );
- profileActivationContext.setInactiveProfileIds( request.getInactiveProfiles() );
- profileActivationContext.setSystemProperties( request.getSystemProperties() );
- profileActivationContext.setUserProperties( request.getUserProperties() );
- profileActivationContext.setProjectDirectory( ( request.getPom() != null )
- ? request.getPom().getParentFile()
- : null );
-
- final List<ModelProblem> modelProblems = new ArrayList<>();
- final List<Profile> activeProfiles =
- this.profileSelector.getActiveProfiles( request.getProfiles(), profileActivationContext,
- new ModelProblemCollector()
- {
-
- @Override
- public void add( final ModelProblemCollectorRequest req )
- {
- modelProblems.add( new DefaultModelProblem(
- req.getMessage(), req.getSeverity(),
- req.getVersion(), "settings.xml", -1, -1,
- null, req.getException() ) );
-
- }
-
- } );
-
- if ( !modelProblems.isEmpty() )
- {
- logger.warn( "" );
- logger.warn( "Some problems were encountered while processing profiles" );
-
- for ( final ModelProblem problem : modelProblems )
- {
- logger.warn( problem.getMessage(), problem.getException() );
- }
-
- logger.warn( "" );
- }
-
- if ( !activeProfiles.isEmpty() )
- {
- for ( final Profile profile : activeProfiles )
- {
- final List<Repository> remoteRepositories = profile.getRepositories();
-
- for ( final Repository remoteRepository : remoteRepositories )
- {
- try
- {
- request.addRemoteRepository(
- MavenRepositorySystem.buildArtifactRepository( remoteRepository ) );
-
- }
- catch ( final InvalidRepositoryException e )
- {
- logger.warn( String.format( "Failure adding repository '%s' from profile '%s'.",
- remoteRepository.getId(), profile.getId() ), e );
-
- }
- }
-
- final List<Repository> pluginRepositories = profile.getPluginRepositories();
-
- for ( final Repository pluginRepository : pluginRepositories )
- {
- try
- {
- request.addPluginArtifactRepository(
- MavenRepositorySystem.buildArtifactRepository( pluginRepository ) );
-
- }
- catch ( InvalidRepositoryException e )
- {
- logger.warn( String.format( "Failure adding plugin repository '%s' from profile '%s'.",
- pluginRepository.getId(), profile.getId() ), e );
-
- }
- }
- }
- }
}
private MavenExecutionRequest populateFromSettings( MavenExecutionRequest request, Settings settings )
[05/50] maven git commit: [MNG-5971] Imported dependencies should be
available to inheritance processing
Posted by hb...@apache.org.
[MNG-5971] Imported dependencies should be available to inheritance processing
o Documentation updates.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4bdb16c9
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4bdb16c9
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4bdb16c9
Branch: refs/heads/slf4j-gossip
Commit: 4bdb16c93afd8f2742003c286f65751c55a86c3c
Parents: ceba686
Author: Christian Schulte <sc...@apache.org>
Authored: Mon Mar 7 16:53:31 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Mon Mar 7 16:53:31 2016 +0100
----------------------------------------------------------------------
maven-model-builder/src/site/apt/index.apt | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/4bdb16c9/maven-model-builder/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/site/apt/index.apt b/maven-model-builder/src/site/apt/index.apt
index 764f8c6..3b02ec4 100644
--- a/maven-model-builder/src/site/apt/index.apt
+++ b/maven-model-builder/src/site/apt/index.apt
@@ -57,6 +57,12 @@ Maven Model Builder
** parent resolution until {{{./super-pom.html}super-pom}}
+ []
+
+ * phase 2, with optional plugin processing
+
+ ** dependency management import (for dependencies of type <<<pom>>> in the <<<\<dependencyManagement\>>>> section)
+
** inheritance assembly: <<<InheritanceAssembler>>> ({{{./apidocs/org/apache/maven/model/inheritance/InheritanceAssembler.html}javadoc}}),
with its <<<DefaultInheritanceAssembler>>> implementation
({{{./xref/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.html}source}}). Notice that
@@ -70,10 +76,6 @@ Maven Model Builder
with its <<<DefaultUrlNormalizer>>> implementation
({{{./xref/org/apache/maven/model/path/DefaultUrlNormalizer.html}source}})
- []
-
- * phase 2, with optional plugin processing
-
** model path translation: <<<ModelPathTranslator>>> ({{{./apidocs/org/apache/maven/model/path/ModelPathTranslator.html}javadoc}}),
with its <<<DefaultModelPathTranslator>>> implementation
({{{./xref/org/apache/maven/model/path/DefaultModelPathTranslator.html}source}})
@@ -86,8 +88,6 @@ Maven Model Builder
with its <<<DefaultLifecycleBindingsInjector>>> implementation
({{{./xref/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.html}source}})
- ** dependency management import (for dependencies of type <<<pom>>> in the <<<\<dependencyManagement\>>>> section)
-
** dependency management injection: <<<DependencyManagementInjector>>> ({{{./apidocs/org/apache/maven/model/management/DependencyManagementInjector.html}javadoc}}),
with its <<<DefaultDependencyManagementInjector>>> implementation
({{{./xref/org/apache/maven/model/management/DefaultDependencyManagementInjector.html}source}})
[41/50] maven git commit: [MNG-6030] ReactorModelCache do not used
effectively after maven version 3.0.5 which cause a large memory footprint o
Reintroduced ReactorModelCache reduces the memory footprint.
Posted by hb...@apache.org.
[MNG-6030] ReactorModelCache do not used effectively after maven version 3.0.5 which cause a large memory footprint
o Reintroduced ReactorModelCache reduces the memory footprint.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/41144e7e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/41144e7e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/41144e7e
Branch: refs/heads/slf4j-gossip
Commit: 41144e7ecf52e7ec3850f3e78d81f42f505f4af8
Parents: 4e5e586
Author: Karl Heinz Marbaise <kh...@apache.org>
Authored: Tue May 31 21:39:31 2016 +0200
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Tue May 31 22:43:19 2016 +0200
----------------------------------------------------------------------
.../maven/project/DefaultProjectBuilder.java | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/41144e7e/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index fb15c87..2406ff9 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -112,14 +112,14 @@ public class DefaultProjectBuilder
public ProjectBuildingResult build( File pomFile, ProjectBuildingRequest request )
throws ProjectBuildingException
{
- return build( pomFile, new FileModelSource( pomFile ), new InternalConfig( request, null ) );
+ return build( pomFile, new FileModelSource( pomFile ), new InternalConfig( request, null, null ) );
}
@Override
public ProjectBuildingResult build( ModelSource modelSource, ProjectBuildingRequest request )
throws ProjectBuildingException
{
- return build( null, modelSource, new InternalConfig( request, null ) );
+ return build( null, modelSource, new InternalConfig( request, null, null ) );
}
private ProjectBuildingResult build( File pomFile, ModelSource modelSource, InternalConfig config )
@@ -271,7 +271,7 @@ public class DefaultProjectBuilder
request.setUserProperties( configuration.getUserProperties() );
request.setBuildStartTime( configuration.getBuildStartTime() );
request.setModelResolver( resolver );
- request.setModelCache( new ReactorModelCache() );
+ request.setModelCache( config.modelCache );
return request;
}
@@ -290,7 +290,7 @@ public class DefaultProjectBuilder
org.eclipse.aether.artifact.Artifact pomArtifact = RepositoryUtils.toArtifact( artifact );
pomArtifact = ArtifactDescriptorUtils.toPomArtifact( pomArtifact );
- InternalConfig config = new InternalConfig( request, null );
+ InternalConfig config = new InternalConfig( request, null, null );
boolean localProject;
@@ -352,7 +352,9 @@ public class DefaultProjectBuilder
ReactorModelPool modelPool = new ReactorModelPool();
- InternalConfig config = new InternalConfig( request, modelPool );
+ ReactorModelCache modelCache = new ReactorModelCache();
+
+ InternalConfig config = new InternalConfig( request, modelPool, modelCache );
Map<String, MavenProject> projectIndex = new HashMap<>( 256 );
@@ -893,11 +895,14 @@ public class DefaultProjectBuilder
public final List<RemoteRepository> repositories;
public final ReactorModelPool modelPool;
+
+ public final ReactorModelCache modelCache;
- InternalConfig( ProjectBuildingRequest request, ReactorModelPool modelPool )
+ InternalConfig( ProjectBuildingRequest request, ReactorModelPool modelPool, ReactorModelCache modelCache )
{
this.request = request;
this.modelPool = modelPool;
+ this.modelCache = modelCache;
session =
LegacyLocalRepositoryManager.overlay( request.getLocalRepository(), request.getRepositorySession(),
repoSystem );
[20/50] maven git commit: [MNG-5967] Dependency updates.
Posted by hb...@apache.org.
[MNG-5967] Dependency updates.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/bd03f68b
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/bd03f68b
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/bd03f68b
Branch: refs/heads/slf4j-gossip
Commit: bd03f68ba3295a07b265fa669742a0594bb58744
Parents: eea665d
Author: Christian Schulte <sc...@apache.org>
Authored: Sun May 8 01:16:45 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Sun May 8 01:20:58 2016 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/bd03f68b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 544ae45..9d14078 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
<junitVersion>4.12</junitVersion>
<plexusVersion>1.6</plexusVersion>
<plexusInterpolationVersion>1.22</plexusInterpolationVersion>
- <plexusUtilsVersion>3.0.23</plexusUtilsVersion>
+ <plexusUtilsVersion>3.0.24</plexusUtilsVersion>
<guavaVersion>19.0</guavaVersion>
<guiceVersion>4.0</guiceVersion>
<sisuInjectVersion>0.3.3</sisuInjectVersion>
[17/50] maven git commit: Code polishing o Replaced
Collections.unmodifiableList() with google ImmutableSet to keep the original
Set type.
Posted by hb...@apache.org.
Code polishing
o Replaced Collections.unmodifiableList() with
google ImmutableSet to keep the original Set type.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d3da8c20
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d3da8c20
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d3da8c20
Branch: refs/heads/slf4j-gossip
Commit: d3da8c20903275a64b550c5c481f2ac7d38d0170
Parents: 6d67fb2
Author: Karl Heinz Marbaise <kh...@apache.org>
Authored: Thu May 5 22:27:29 2016 +0200
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Thu May 5 22:27:29 2016 +0200
----------------------------------------------------------------------
.../AbstractStringBasedModelInterpolator.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/d3da8c20/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
index 2bd8183..1f3ec18 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
@@ -22,10 +22,10 @@ package org.apache.maven.model.interpolation;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Properties;
+import java.util.Set;
import org.apache.maven.model.Model;
import org.apache.maven.model.building.ModelBuildingRequest;
@@ -48,6 +48,8 @@ import org.codehaus.plexus.interpolation.PrefixedValueSourceWrapper;
import org.codehaus.plexus.interpolation.RecursionInterceptor;
import org.codehaus.plexus.interpolation.ValueSource;
+import com.google.common.collect.ImmutableSet;
+
/**
* Use a regular expression search to find and resolve expressions within the POM.
*
@@ -64,11 +66,10 @@ public abstract class AbstractStringBasedModelInterpolator
// sure interpolation of the directories below uses translated paths.
// Afterward, we'll double back and translate any paths that weren't covered during interpolation via the
// code below...
- private static final Collection<String> TRANSLATED_PATH_EXPRESSIONS =
- Collections.unmodifiableList( Arrays.asList( "build.directory", "build.outputDirectory",
- "build.testOutputDirectory", "build.sourceDirectory",
- "build.testSourceDirectory", "build.scriptSourceDirectory",
- "reporting.outputDirectory" ) );
+ private static final Set<String> TRANSLATED_PATH_EXPRESSIONS =
+ ImmutableSet.of( "build.directory", "build.outputDirectory", "build.testOutputDirectory",
+ "build.sourceDirectory", "build.testSourceDirectory", "build.scriptSourceDirectory",
+ "reporting.outputDirectory" );
@Requirement
private PathTranslator pathTranslator;
[06/50] maven git commit: [MNG-4345] [regression] Plugin executions
contributed by default lifecycle mapping execute after other plugin
executions bound to the same phase
Posted by hb...@apache.org.
[MNG-4345] [regression] Plugin executions contributed by default lifecycle mapping execute after other plugin executions bound to the same phase
o This reverts commit ceba686009cd21568e002f5a9ebb130c21bf0453 committed
by accident.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/39c25cea
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/39c25cea
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/39c25cea
Branch: refs/heads/slf4j-gossip
Commit: 39c25cea76063c0e345f78a447fd71d06369bdf8
Parents: 4bdb16c
Author: Christian Schulte <sc...@apache.org>
Authored: Mon Mar 7 16:56:16 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Mon Mar 7 16:56:16 2016 +0100
----------------------------------------------------------------------
.../model/plugin/DefaultLifecycleBindingsInjector.java | 11 +++++++++++
maven-model/src/main/mdo/maven.mdo | 13 +++++++++++++
2 files changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/39c25cea/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
index a4d7138..aa491e7 100644
--- a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
+++ b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
@@ -30,6 +30,7 @@ import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginContainer;
+import org.apache.maven.model.PluginExecution;
import org.apache.maven.model.PluginManagement;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.ModelProblem.Severity;
@@ -161,6 +162,16 @@ public class DefaultLifecycleBindingsInjector
target.setPlugins( result );
}
}
+
+ @Override
+ protected void mergePluginExecution( PluginExecution target, PluginExecution source, boolean sourceDominant,
+ Map<Object, Object> context )
+ {
+ super.mergePluginExecution( target, source, sourceDominant, context );
+
+ target.setPriority( Math.min( target.getPriority(), source.getPriority() ) );
+ }
+
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/39c25cea/maven-model/src/main/mdo/maven.mdo
----------------------------------------------------------------------
diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo
index f85d233..3f6b6d6 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -2912,6 +2912,19 @@
<description>The build lifecycle phase to bind the goals in this execution to. If omitted,
the goals will be bound to the default phase specified by the plugin. </description>
</field>
+ <field xml.transient="true">
+ <name>priority</name>
+ <version>4.0.0+</version>
+ <type>int</type>
+ <description>
+ <![CDATA[
+ The priority of this execution compared to other executions which are bound to the same phase.
+ <strong>Warning:</strong> This is an internal utility property that is only public for technical reasons,
+ it is not part of the public API. In particular, this property can be changed or deleted without prior
+ notice.
+ ]]>
+ </description>
+ </field>
<field>
<name>goals</name>
<version>4.0.0+</version>
[07/50] maven git commit: [MNG-5836] put $maven.home/conf/logging
first in classpath to avoid extension jar overriding logging config
Posted by hb...@apache.org.
[MNG-5836] put $maven.home/conf/logging first in classpath to avoid
extension jar overriding logging config
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3533599e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3533599e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3533599e
Branch: refs/heads/slf4j-gossip
Commit: 3533599e42a4a563abca33a69ed0f34c19815479
Parents: 39c25ce
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sun Mar 13 08:53:03 2016 +0100
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Sun Mar 13 08:53:03 2016 +0100
----------------------------------------------------------------------
apache-maven/src/bin/m2.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/3533599e/apache-maven/src/bin/m2.conf
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/m2.conf b/apache-maven/src/bin/m2.conf
index 2991e0b..213dc55 100644
--- a/apache-maven/src/bin/m2.conf
+++ b/apache-maven/src/bin/m2.conf
@@ -3,6 +3,6 @@ main is org.apache.maven.cli.MavenCli from plexus.core
set maven.home default ${user.home}/m2
[plexus.core]
+load ${maven.home}/conf/logging
optionally ${maven.home}/lib/ext/*.jar
load ${maven.home}/lib/*.jar
-load ${maven.home}/conf/logging
[26/50] maven git commit: [MNG-5967] Dependency updates.
Posted by hb...@apache.org.
[MNG-5967] Dependency updates.
o Downgraded SLF4j due to MNG-6023 (SLF4J-370).
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4b35102f
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4b35102f
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4b35102f
Branch: refs/heads/slf4j-gossip
Commit: 4b35102f0e3302e15a80d3ddb756463601b9217a
Parents: c023e58
Author: Christian Schulte <sc...@apache.org>
Authored: Thu May 19 15:24:28 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Thu May 19 15:24:28 2016 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/4b35102f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 97f7a5c..cb5223c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
<modelloVersion>1.8.3</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
<aetherVersion>1.1.0</aetherVersion>
- <slf4jVersion>1.7.21</slf4jVersion>
+ <slf4jVersion>1.7.16</slf4jVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- Control the name of the distribution and information output by mvn -->
<distributionId>apache-maven</distributionId>
[49/50] maven git commit: Update gossip to 2.0.0 release
Posted by hb...@apache.org.
Update gossip to 2.0.0 release
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f0bb9249
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f0bb9249
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f0bb9249
Branch: refs/heads/slf4j-gossip
Commit: f0bb924904a5efd647de26f659261b0bb8af04df
Parents: 957b32e
Author: Jason Dillon <ja...@planet57.com>
Authored: Tue May 24 17:27:02 2016 -0700
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Thu Jun 2 23:41:45 2016 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/f0bb9249/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 55b0e7d..8ca778b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -292,7 +292,7 @@ under the License.
<dependency>
<groupId>com.planet57.gossip</groupId>
<artifactId>gossip-slf4j</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.fusesource.jansi</groupId>
[13/50] maven git commit: [MNG-6014] Removing ArtifactHandler for ejb3
Posted by hb...@apache.org.
[MNG-6014] Removing ArtifactHandler for ejb3
o Updated the site to account for removal of ejb3 ArtifactHandler correcting a
test failure.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/70e2afd4
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/70e2afd4
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/70e2afd4
Branch: refs/heads/slf4j-gossip
Commit: 70e2afd457d74d8ae13737dc77a14af564fb466c
Parents: 5bac0a8
Author: Christian Schulte <sc...@apache.org>
Authored: Tue May 3 19:56:58 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Tue May 3 19:56:58 2016 +0200
----------------------------------------------------------------------
maven-core/src/site/apt/artifact-handlers.apt | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/70e2afd4/maven-core/src/site/apt/artifact-handlers.apt
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/artifact-handlers.apt b/maven-core/src/site/apt/artifact-handlers.apt
index 916161b..4d3a557 100644
--- a/maven-core/src/site/apt/artifact-handlers.apt
+++ b/maven-core/src/site/apt/artifact-handlers.apt
@@ -39,8 +39,6 @@ Default Artifact Handlers Reference
*--------------------+------------+------------+---------------+-----------+---------------------+-----------------------+
| <<<ejb>>> | <<<jar>>> | <= type> | | java | <<<true>>> | |
*--------------------+------------+------------+---------------+-----------+---------------------+-----------------------+
-| <<<ejb3>>> | <= type> | <= type> | | java | | <<<true>>> |
-*--------------------+------------+------------+---------------+-----------+---------------------+-----------------------+
| <<<war>>> | <= type> | <= type> | | java | | <<<true>>> |
*--------------------+------------+------------+---------------+-----------+---------------------+-----------------------+
| <<<ear>>> | <= type> | <= type> | | java | | <<<true>>> |
[34/50] maven git commit: added README.md to rat excludes (why now?)
Posted by hb...@apache.org.
added README.md to rat excludes (why now?)
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ead16545
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ead16545
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ead16545
Branch: refs/heads/slf4j-gossip
Commit: ead165454259ffafe128afe4a03d45813eef301d
Parents: c7a4079
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sat May 28 21:14:54 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Sat May 28 21:20:39 2016 +0200
----------------------------------------------------------------------
pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/ead16545/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 316d00c..9eadbe2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -564,6 +564,7 @@ under the License.
<exclude>.repository/**</exclude> <!-- jenkins with local maven repository -->
<exclude>.maven/spy.log</exclude> <!-- hudson maven3 integration log -->
<exclude>.java-version</exclude>
+ <exclude>README.md</exclude>
</excludes>
</configuration>
</plugin>
[46/50] maven git commit: Update to gossip 2.0.0-SNAPSHOT
Posted by hb...@apache.org.
Update to gossip 2.0.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8cb186a8
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8cb186a8
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8cb186a8
Branch: refs/heads/slf4j-gossip
Commit: 8cb186a8d87d1e152edcfd1d367da213e441d173
Parents: c279b0a
Author: Jason Dillon <ja...@planet57.com>
Authored: Tue May 24 12:04:15 2016 -0700
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Thu Jun 2 23:41:45 2016 +0200
----------------------------------------------------------------------
apache-maven/pom.xml | 2 +-
maven-embedder/pom.xml | 2 +-
.../impl/gossip/ColorConsoleListener.java | 6 +-
.../cli/logging/impl/gossip/ColorRenderer.java | 6 +-
.../impl/gossip/GossipConfiguration.java | 10 +--
.../logging/impl/gossip/PatternRenderer.java | 8 +--
.../com.planet57.gossip/config.properties | 67 ++++++++++++++++++++
.../maven/slf4j-configuration.properties | 2 +-
.../org.sonatype.gossip/config.properties | 67 --------------------
pom.xml | 4 +-
10 files changed, 87 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/8cb186a8/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 80250ca..ec11cc2 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -92,7 +92,7 @@ under the License.
<artifactId>aether-transport-wagon</artifactId>
</dependency>
<dependency>
- <groupId>org.sonatype.gossip</groupId>
+ <groupId>com.planet57.gossip</groupId>
<artifactId>gossip-slf4j</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/8cb186a8/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 73555b8..fa59911 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -89,7 +89,7 @@ under the License.
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.sonatype.gossip</groupId>
+ <groupId>com.planet57.gossip</groupId>
<artifactId>gossip-slf4j</artifactId>
<optional>true</optional>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/8cb186a8/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java
index 4f80738..da8a7ed 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorConsoleListener.java
@@ -23,11 +23,11 @@ import java.io.PrintStream;
import org.fusesource.jansi.AnsiConsole;
-import org.sonatype.gossip.Event;
-import org.sonatype.gossip.listener.ListenerSupport;
+import com.planet57.gossip.Event;
+import com.planet57.gossip.listener.ListenerSupport;
/**
- * Specialized {@link org.sonatype.gossip.listener.Listener} which is aware of ANSI streams.
+ * Specialized {@link com.planet57.gossip.listener.Listener} which is aware of ANSI streams.
*
* @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
* @since 3.4.0
http://git-wip-us.apache.org/repos/asf/maven/blob/8cb186a8/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
index 8a03a55..14b7e2b 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
@@ -26,11 +26,11 @@ import static org.fusesource.jansi.Ansi.Color.RED;
import static org.fusesource.jansi.Ansi.Color.YELLOW;
import static org.fusesource.jansi.Ansi.ansi;
-import org.sonatype.gossip.Event;
-import org.sonatype.gossip.Level;
+import com.planet57.gossip.Event;
+import com.planet57.gossip.Level;
/**
- * Specialized {@link org.sonatype.gossip.render.Renderer} which is aware of basic Maven log messages to colorize.
+ * Specialized {@link com.planet57.gossip.render.Renderer} which is aware of basic Maven log messages to colorize.
*
* @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
* @since 3.4.0
http://git-wip-us.apache.org/repos/asf/maven/blob/8cb186a8/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/GossipConfiguration.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/GossipConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/GossipConfiguration.java
index 96a0545..3ef50a3 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/GossipConfiguration.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/GossipConfiguration.java
@@ -19,7 +19,7 @@ package org.apache.maven.cli.logging.impl.gossip;
* under the License.
*/
-import org.sonatype.gossip.Gossip;
+import com.planet57.gossip.Gossip;
import org.apache.maven.cli.logging.BaseSlf4jConfiguration;
import org.slf4j.MavenSlf4jFriend;
@@ -33,7 +33,7 @@ import org.slf4j.MavenSlf4jFriend;
public class GossipConfiguration
extends BaseSlf4jConfiguration
{
- private org.sonatype.gossip.Level rootLevel = org.sonatype.gossip.Level.INFO;
+ private com.planet57.gossip.Level rootLevel = com.planet57.gossip.Level.INFO;
@Override
public void setRootLoggerLevel( final Level level )
@@ -41,15 +41,15 @@ public class GossipConfiguration
switch ( level )
{
case DEBUG:
- rootLevel = org.sonatype.gossip.Level.DEBUG;
+ rootLevel = com.planet57.gossip.Level.DEBUG;
break;
case INFO:
- rootLevel = org.sonatype.gossip.Level.INFO;
+ rootLevel = com.planet57.gossip.Level.INFO;
break;
default:
- rootLevel = org.sonatype.gossip.Level.ERROR;
+ rootLevel = com.planet57.gossip.Level.ERROR;
break;
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/8cb186a8/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/PatternRenderer.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/PatternRenderer.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/PatternRenderer.java
index 7e767a1..8a5b431 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/PatternRenderer.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/PatternRenderer.java
@@ -19,17 +19,17 @@ package org.apache.maven.cli.logging.impl.gossip;
* under the License.
*/
-import org.sonatype.gossip.Event;
-import org.sonatype.gossip.Level;
+import com.planet57.gossip.Event;
+import com.planet57.gossip.Level;
/**
- * Specialized {@link org.sonatype.gossip.render.PatternRenderer} to cope with Maven specifics.
+ * Specialized {@link com.planet57.gossip.render.PatternRenderer} to cope with Maven specifics.
*
* @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
* @since 3.4.0
*/
public class PatternRenderer
- extends org.sonatype.gossip.render.PatternRenderer
+ extends com.planet57.gossip.render.PatternRenderer
{
protected static final String WARNING = "WARNING";
http://git-wip-us.apache.org/repos/asf/maven/blob/8cb186a8/maven-embedder/src/main/resources/META-INF/com.planet57.gossip/config.properties
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/resources/META-INF/com.planet57.gossip/config.properties b/maven-embedder/src/main/resources/META-INF/com.planet57.gossip/config.properties
new file mode 100644
index 0000000..bc63a9c
--- /dev/null
+++ b/maven-embedder/src/main/resources/META-INF/com.planet57.gossip/config.properties
@@ -0,0 +1,67 @@
+# 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.
+
+version=1.0.0
+
+profiles=default, maven-common, maven-plain, maven-color
+
+##
+## default
+##
+
+profile.default.includes=maven-common
+profile.default.listeners=console
+profile.default.listener.console=com.planet57.gossip.listener.ConsoleListener
+profile.default.listener.console.renderer=org.apache.maven.cli.logging.impl.gossip.PatternRenderer
+profile.default.listener.console.renderer.pattern=[%l] %m%n%x
+
+##
+## common
+##
+
+profile.maven-common.logger.*=INFO
+
+##
+## maven.logging=PLAIN
+##
+
+profile.maven-plain.includes=maven-common
+profile.maven-plain.listeners=console
+profile.maven-plain.listener.console=com.planet57.gossip.listener.ConsoleListener
+profile.maven-plain.listener.console.renderer=org.apache.maven.cli.logging.impl.gossip.PatternRenderer
+profile.maven-plain.listener.console.renderer.pattern=[%l] %m%n%x
+profile.maven-plain.triggers=default
+profile.maven-plain.trigger.default=com.planet57.gossip.trigger.SystemPropertyTrigger
+profile.maven-plain.trigger.default.name=maven.logging
+profile.maven-plain.trigger.default.value=PLAIN
+profile.maven-plain.trigger.default.ignoreCase=true
+
+##
+## maven.logging=COLOR
+##
+
+profile.maven-color.includes=maven-common
+profile.maven-color.listeners=console
+profile.maven-color.listener.console=org.apache.maven.cli.logging.impl.gossip.ColorConsoleListener
+profile.maven-color.listener.console.renderer=org.apache.maven.cli.logging.impl.gossip.ColorRenderer
+profile.maven-color.listener.console.renderer.pattern=[%l] %m%n%x
+profile.maven-color.triggers=default
+profile.maven-color.trigger.default=com.planet57.gossip.trigger.SystemPropertyTrigger
+profile.maven-color.trigger.default.name=maven.logging
+profile.maven-color.trigger.default.value=COLOR
+profile.maven-color.trigger.default.ignoreCase=true
+
http://git-wip-us.apache.org/repos/asf/maven/blob/8cb186a8/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
index fd69cdc..e385dcb 100644
--- a/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
+++ b/maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties
@@ -20,4 +20,4 @@
org.slf4j.impl.SimpleLoggerFactory org.apache.maven.cli.logging.impl.Slf4jSimpleConfiguration
org.apache.logging.slf4j.Log4jLoggerFactory org.apache.maven.cli.logging.impl.Log4j2Configuration
ch.qos.logback.classic.LoggerContext org.apache.maven.cli.logging.impl.LogbackConfiguration
-org.sonatype.gossip.Gossip org.apache.maven.cli.logging.impl.gossip.GossipConfiguration
+com.planet57.gossip.Gossip org.apache.maven.cli.logging.impl.gossip.GossipConfiguration
http://git-wip-us.apache.org/repos/asf/maven/blob/8cb186a8/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties b/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties
deleted file mode 100644
index 587b2be..0000000
--- a/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.
-
-version=1.0.0
-
-profiles=default, maven-common, maven-plain, maven-color
-
-##
-## default
-##
-
-profile.default.includes=maven-common
-profile.default.listeners=console
-profile.default.listener.console=org.sonatype.gossip.listener.ConsoleListener
-profile.default.listener.console.renderer=org.apache.maven.cli.logging.impl.gossip.PatternRenderer
-profile.default.listener.console.renderer.pattern=[%l] %m%n%x
-
-##
-## common
-##
-
-profile.maven-common.logger.*=INFO
-
-##
-## maven.logging=PLAIN
-##
-
-profile.maven-plain.includes=maven-common
-profile.maven-plain.listeners=console
-profile.maven-plain.listener.console=org.sonatype.gossip.listener.ConsoleListener
-profile.maven-plain.listener.console.renderer=org.apache.maven.cli.logging.impl.gossip.PatternRenderer
-profile.maven-plain.listener.console.renderer.pattern=[%l] %m%n%x
-profile.maven-plain.triggers=default
-profile.maven-plain.trigger.default=org.sonatype.gossip.trigger.SystemPropertyTrigger
-profile.maven-plain.trigger.default.name=maven.logging
-profile.maven-plain.trigger.default.value=PLAIN
-profile.maven-plain.trigger.default.ignoreCase=true
-
-##
-## maven.logging=COLOR
-##
-
-profile.maven-color.includes=maven-common
-profile.maven-color.listeners=console
-profile.maven-color.listener.console=org.apache.maven.cli.logging.impl.gossip.ColorConsoleListener
-profile.maven-color.listener.console.renderer=org.apache.maven.cli.logging.impl.gossip.ColorRenderer
-profile.maven-color.listener.console.renderer.pattern=[%l] %m%n%x
-profile.maven-color.triggers=default
-profile.maven-color.trigger.default=org.sonatype.gossip.trigger.SystemPropertyTrigger
-profile.maven-color.trigger.default.name=maven.logging
-profile.maven-color.trigger.default.value=COLOR
-profile.maven-color.trigger.default.ignoreCase=true
-
http://git-wip-us.apache.org/repos/asf/maven/blob/8cb186a8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9e2bcb3..55b0e7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -290,9 +290,9 @@ under the License.
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.sonatype.gossip</groupId>
+ <groupId>com.planet57.gossip</groupId>
<artifactId>gossip-slf4j</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.fusesource.jansi</groupId>
[45/50] maven git commit: Update to gossip 1.9-SNAPSHOT for some
minor fixes needed to make testsuite pass Update configuartion for gossip to
reset slf4j and defer root level so that we always have a known level state
for root.
Posted by hb...@apache.org.
Update to gossip 1.9-SNAPSHOT for some minor fixes needed to make testsuite pass Update configuartion for gossip to reset slf4j and defer root level so that we always have a known level state for root.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/700ed377
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/700ed377
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/700ed377
Branch: refs/heads/slf4j-gossip
Commit: 700ed377a576daf93ebf93cd46529d5a68f65890
Parents: e50b95f
Author: Jason Dillon <ja...@planet57.com>
Authored: Fri May 20 15:32:02 2016 -0700
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Thu Jun 2 23:41:45 2016 +0200
----------------------------------------------------------------------
.../logging/impl/gossip/GossipConfiguration.java | 16 +++++++++-------
pom.xml | 2 +-
2 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/700ed377/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/GossipConfiguration.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/GossipConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/GossipConfiguration.java
index e07b7a6..96a0545 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/GossipConfiguration.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/GossipConfiguration.java
@@ -22,6 +22,7 @@ package org.apache.maven.cli.logging.impl.gossip;
import org.sonatype.gossip.Gossip;
import org.apache.maven.cli.logging.BaseSlf4jConfiguration;
+import org.slf4j.MavenSlf4jFriend;
/**
* Configuration for Gossip.
@@ -32,30 +33,31 @@ import org.apache.maven.cli.logging.BaseSlf4jConfiguration;
public class GossipConfiguration
extends BaseSlf4jConfiguration
{
+ private org.sonatype.gossip.Level rootLevel = org.sonatype.gossip.Level.INFO;
+
@Override
- public void setRootLoggerLevel( Level level )
+ public void setRootLoggerLevel( final Level level )
{
- org.sonatype.gossip.Level value;
switch ( level )
{
case DEBUG:
- value = org.sonatype.gossip.Level.DEBUG;
+ rootLevel = org.sonatype.gossip.Level.DEBUG;
break;
case INFO:
- value = org.sonatype.gossip.Level.INFO;
+ rootLevel = org.sonatype.gossip.Level.INFO;
break;
default:
- value = org.sonatype.gossip.Level.ERROR;
+ rootLevel = org.sonatype.gossip.Level.ERROR;
break;
}
- Gossip.getInstance().getRoot().setLevel( value );
}
@Override
public void activate()
{
- // empty
+ MavenSlf4jFriend.reset();
+ Gossip.getInstance().getRoot().setLevel( rootLevel );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/700ed377/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6ecef9a..9e2bcb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -292,7 +292,7 @@ under the License.
<dependency>
<groupId>org.sonatype.gossip</groupId>
<artifactId>gossip-slf4j</artifactId>
- <version>1.8</version>
+ <version>1.9-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.fusesource.jansi</groupId>
[10/50] maven git commit: [MNG-6001] Replace %HOME% with
%USERPROFILE% in mvn.cmd
Posted by hb...@apache.org.
[MNG-6001] Replace %HOME% with %USERPROFILE% in mvn.cmd
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/00565ebb
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/00565ebb
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/00565ebb
Branch: refs/heads/slf4j-gossip
Commit: 00565ebbfbc69996450f1463644183e8f03b90b7
Parents: fe47a3d
Author: Michael Osipov <mi...@apache.org>
Authored: Fri Apr 15 13:06:24 2016 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Fri Apr 15 13:06:24 2016 +0200
----------------------------------------------------------------------
apache-maven/src/bin/mvn.cmd | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/00565ebb/apache-maven/src/bin/mvn.cmd
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index 06a58d1..9023459 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -32,14 +32,11 @@
@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
@REM Execute a user defined script before this one
if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat"
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd"
:skipRcPre
@setlocal
@@ -143,8 +140,8 @@ set ERROR_CODE=1
if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
:skipRcPost
@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
[15/50] maven git commit: [MNG-5967] Dependency updates.
Posted by hb...@apache.org.
[MNG-5967] Dependency updates.
o Updated to 'plexus-utils-3.0.23'.
o Updated to stop suppressing exceptions incorrectly when closing resources.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0535716f
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0535716f
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0535716f
Branch: refs/heads/slf4j-gossip
Commit: 0535716fd602eb056ed791b89d7f9a3fb882499c
Parents: 6c4627b
Author: Christian Schulte <sc...@apache.org>
Authored: Wed May 4 21:01:24 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Thu May 5 00:35:01 2016 +0200
----------------------------------------------------------------------
.../internal/DefaultVersionRangeResolver.java | 19 ++++++++--
.../internal/DefaultVersionResolver.java | 18 ++++++++--
.../metadata/io/DefaultMetadataReader.java | 16 ++++++---
.../toolchain/io/DefaultToolchainsReader.java | 18 +++++++---
.../maven/model/io/DefaultModelReader.java | 38 ++++++++------------
.../maven/model/io/DefaultModelWriter.java | 24 ++++++-------
.../settings/io/DefaultSettingsReader.java | 16 ++++++---
.../settings/io/DefaultSettingsWriter.java | 24 ++++++-------
pom.xml | 2 +-
9 files changed, 106 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/0535716f/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
index ddd3e97..7df7847 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
@@ -24,7 +24,6 @@ import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.util.IOUtil;
import org.eclipse.aether.RepositoryEvent;
import org.eclipse.aether.RepositoryEvent.EventType;
import org.eclipse.aether.RepositorySystemSession;
@@ -58,6 +57,7 @@ import org.eclipse.aether.version.VersionScheme;
import javax.inject.Inject;
import javax.inject.Named;
import java.io.FileInputStream;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -272,8 +272,13 @@ public class DefaultVersionRangeResolver
if ( metadata.getFile() != null && metadata.getFile().exists() )
{
fis = new FileInputStream( metadata.getFile() );
+
org.apache.maven.artifact.repository.metadata.Metadata m =
new MetadataXpp3Reader().read( fis, false );
+
+ fis.close();
+ fis = null;
+
versioning = m.getVersioning();
}
}
@@ -286,7 +291,17 @@ public class DefaultVersionRangeResolver
}
finally
{
- IOUtil.close( fis );
+ try
+ {
+ if ( fis != null )
+ {
+ fis.close();
+ }
+ }
+ catch ( final IOException e )
+ {
+ this.logger.warn( "Failure closing file.", e );
+ }
}
return ( versioning != null ) ? versioning : new Versioning();
http://git-wip-us.apache.org/repos/asf/maven/blob/0535716f/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
index 2b0890b..eb2efd7 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
@@ -26,7 +26,6 @@ import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
import org.eclipse.aether.RepositoryCache;
import org.eclipse.aether.RepositoryEvent;
@@ -338,8 +337,13 @@ public class DefaultVersionResolver
if ( metadata.getFile() != null && metadata.getFile().exists() )
{
fis = new FileInputStream( metadata.getFile() );
+
org.apache.maven.artifact.repository.metadata.Metadata m =
new MetadataXpp3Reader().read( fis, false );
+
+ fis.close();
+ fis = null;
+
versioning = m.getVersioning();
/*
@@ -374,7 +378,17 @@ public class DefaultVersionResolver
}
finally
{
- IOUtil.close( fis );
+ try
+ {
+ if ( fis != null )
+ {
+ fis.close();
+ }
+ }
+ catch ( final IOException e )
+ {
+ this.logger.warn( "Failure closing file.", e );
+ }
}
return ( versioning != null ) ? versioning : new Versioning();
http://git-wip-us.apache.org/repos/asf/maven/blob/0535716f/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
index c769f89..f611588 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
@@ -60,8 +60,12 @@ public class DefaultMetadataReader
try
{
- MetadataXpp3Reader r = new MetadataXpp3Reader();
- return r.read( input, isStrict( options ) );
+ final Metadata metadata = new MetadataXpp3Reader().read( input, isStrict( options ) );
+
+ input.close();
+ input = null;
+
+ return metadata;
}
catch ( XmlPullParserException e )
{
@@ -80,8 +84,12 @@ public class DefaultMetadataReader
try
{
- MetadataXpp3Reader r = new MetadataXpp3Reader();
- return r.read( input, isStrict( options ) );
+ final Metadata metadata = new MetadataXpp3Reader().read( input, isStrict( options ) );
+
+ input.close();
+ input = null;
+
+ return metadata;
}
catch ( XmlPullParserException e )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0535716f/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
index 9b5bdd7..29f16cc 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
@@ -64,8 +64,13 @@ public class DefaultToolchainsReader
try
{
- MavenToolchainsXpp3Reader r = new MavenToolchainsXpp3Reader();
- return r.read( input, isStrict( options ) );
+ final PersistedToolchains persistedToolchains =
+ new MavenToolchainsXpp3Reader().read( input, isStrict( options ) );
+
+ input.close();
+ input = null;
+
+ return persistedToolchains;
}
catch ( XmlPullParserException e )
{
@@ -85,8 +90,13 @@ public class DefaultToolchainsReader
try
{
- MavenToolchainsXpp3Reader r = new MavenToolchainsXpp3Reader();
- return r.read( input, isStrict( options ) );
+ final PersistedToolchains persistedToolchains =
+ new MavenToolchainsXpp3Reader().read( input, isStrict( options ) );
+
+ input.close();
+ input = null;
+
+ return persistedToolchains;
}
catch ( XmlPullParserException e )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0535716f/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
index 0ba6673..86616ba 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
@@ -65,14 +65,7 @@ public class DefaultModelReader
{
Validate.notNull( input, "input cannot be null" );
- try
- {
- return read( input, isStrict( options ), getSource( options ) );
- }
- finally
- {
- IOUtil.close( input );
- }
+ return read( input, isStrict( options ), getSource( options ) );
}
@Override
@@ -81,14 +74,7 @@ public class DefaultModelReader
{
Validate.notNull( input, "input cannot be null" );
- try
- {
- return read( ReaderFactory.newXmlReader( input ), isStrict( options ), getSource( options ) );
- }
- finally
- {
- IOUtil.close( input );
- }
+ return read( ReaderFactory.newXmlReader( input ), isStrict( options ), getSource( options ) );
}
private boolean isStrict( Map<String, ?> options )
@@ -108,19 +94,23 @@ public class DefaultModelReader
{
try
{
- if ( source != null )
- {
- return new MavenXpp3ReaderEx().read( reader, strict, source );
- }
- else
- {
- return new MavenXpp3Reader().read( reader, strict );
- }
+ final Model model = source != null
+ ? new MavenXpp3ReaderEx().read( reader, strict, source )
+ : new MavenXpp3Reader().read( reader, strict );
+
+ reader.close();
+ reader = null;
+
+ return model;
}
catch ( XmlPullParserException e )
{
throw new ModelParseException( e.getMessage(), e.getLineNumber(), e.getColumnNumber(), e );
}
+ finally
+ {
+ IOUtil.close( reader );
+ }
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0535716f/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java
index 0d9af13..158de42 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelWriter.java
@@ -64,8 +64,10 @@ public class DefaultModelWriter
try
{
- MavenXpp3Writer w = new MavenXpp3Writer();
- w.write( output, model );
+ new MavenXpp3Writer().write( output, model );
+
+ output.close();
+ output = null;
}
finally
{
@@ -80,20 +82,14 @@ public class DefaultModelWriter
Validate.notNull( output, "output cannot be null" );
Validate.notNull( model, "model cannot be null" );
- try
+ String encoding = model.getModelEncoding();
+ // TODO Use StringUtils here
+ if ( encoding == null || encoding.length() <= 0 )
{
- String encoding = model.getModelEncoding();
- // TODO Use StringUtils here
- if ( encoding == null || encoding.length() <= 0 )
- {
- encoding = "UTF-8";
- }
- write( new OutputStreamWriter( output, encoding ), options, model );
- }
- finally
- {
- IOUtil.close( output );
+ encoding = "UTF-8";
}
+
+ write( new OutputStreamWriter( output, encoding ), options, model );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0535716f/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java
index 9beee97..8e98c43 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsReader.java
@@ -62,8 +62,12 @@ public class DefaultSettingsReader
try
{
- SettingsXpp3Reader r = new SettingsXpp3Reader();
- return r.read( input, isStrict( options ) );
+ final Settings settings = new SettingsXpp3Reader().read( input, isStrict( options ) );
+
+ input.close();
+ input = null;
+
+ return settings;
}
catch ( XmlPullParserException e )
{
@@ -83,8 +87,12 @@ public class DefaultSettingsReader
try
{
- SettingsXpp3Reader r = new SettingsXpp3Reader();
- return r.read( input, isStrict( options ) );
+ final Settings settings = new SettingsXpp3Reader().read( input, isStrict( options ) );
+
+ input.close();
+ input = null;
+
+ return settings;
}
catch ( XmlPullParserException e )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/0535716f/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java
index 877fbde..d9741a5 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/io/DefaultSettingsWriter.java
@@ -64,8 +64,10 @@ public class DefaultSettingsWriter
try
{
- SettingsXpp3Writer w = new SettingsXpp3Writer();
- w.write( output, settings );
+ new SettingsXpp3Writer().write( output, settings );
+
+ output.close();
+ output = null;
}
finally
{
@@ -80,20 +82,14 @@ public class DefaultSettingsWriter
Validate.notNull( output, "output cannot be null" );
Validate.notNull( settings, "settings cannot be null" );
- try
+ String encoding = settings.getModelEncoding();
+ // TODO Use StringUtils here
+ if ( encoding == null || encoding.length() <= 0 )
{
- String encoding = settings.getModelEncoding();
- // TODO Use StringUtils here
- if ( encoding == null || encoding.length() <= 0 )
- {
- encoding = "UTF-8";
- }
- write( new OutputStreamWriter( output, encoding ), options, settings );
- }
- finally
- {
- IOUtil.close( output );
+ encoding = "UTF-8";
}
+
+ write( new OutputStreamWriter( output, encoding ), options, settings );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/0535716f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cf30034..4ad6737 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
<junitVersion>4.12</junitVersion>
<plexusVersion>1.6</plexusVersion>
<plexusInterpolationVersion>1.22</plexusInterpolationVersion>
- <plexusUtilsVersion>3.0.22</plexusUtilsVersion>
+ <plexusUtilsVersion>3.0.23</plexusUtilsVersion>
<guavaVersion>19.0</guavaVersion>
<guiceVersion>4.0</guiceVersion>
<sisuInjectVersion>0.3.3</sisuInjectVersion>
[29/50] maven git commit: Fixing misspellings in test names
Posted by hb...@apache.org.
Fixing misspellings in test names
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8e08c8b6
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8e08c8b6
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8e08c8b6
Branch: refs/heads/slf4j-gossip
Commit: 8e08c8b6f806e8544ba3f65a2ebdf80fa5e486d7
Parents: e5dd48b
Author: August Shi <aw...@illinois.edu>
Authored: Wed May 25 14:12:52 2016 -0500
Committer: August Shi <aw...@illinois.edu>
Committed: Wed May 25 14:12:52 2016 -0500
----------------------------------------------------------------------
.../org/apache/maven/cli/transfer/FileSizeFormatTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/8e08c8b6/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
index 44bc1b3..394c7ed 100644
--- a/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/cli/transfer/FileSizeFormatTest.java
@@ -221,16 +221,16 @@ public class FileSizeFormatTest {
}
@Test( expected = IllegalArgumentException.class )
- public void testNegativeProgessedSize()
+ public void testNegativeProgressedSize()
{
FileSizeFormat format = new FileSizeFormat( Locale.ENGLISH );
- long negativeProgessedSize = -100L;
- format.formatProgress( negativeProgessedSize, 10L );
+ long negativeProgressedSize = -100L;
+ format.formatProgress( negativeProgressedSize, 10L );
}
@Test( expected = IllegalArgumentException.class )
- public void testNegativeProgessedSizeBiggerThanSize()
+ public void testNegativeProgressedSizeBiggerThanSize()
{
FileSizeFormat format = new FileSizeFormat( Locale.ENGLISH );
[43/50] maven git commit: Add custom renderer to cope with Maven
using WARNING instead of WARN
Posted by hb...@apache.org.
Add custom renderer to cope with Maven using WARNING instead of WARN
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e50b95f5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e50b95f5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e50b95f5
Branch: refs/heads/slf4j-gossip
Commit: e50b95f5a2c9003fc11466ef09346acd2e2bc485
Parents: 8781dc3
Author: Jason Dillon <ja...@planet57.com>
Authored: Fri May 20 13:12:15 2016 -0700
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Thu Jun 2 23:41:45 2016 +0200
----------------------------------------------------------------------
.../cli/logging/impl/gossip/ColorRenderer.java | 15 ++++--
.../logging/impl/gossip/PatternRenderer.java | 54 ++++++++++++++++++++
.../org.sonatype.gossip/config.properties | 4 +-
3 files changed, 66 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/e50b95f5/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
index f844c04..8a03a55 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/ColorRenderer.java
@@ -27,7 +27,7 @@ import static org.fusesource.jansi.Ansi.Color.YELLOW;
import static org.fusesource.jansi.Ansi.ansi;
import org.sonatype.gossip.Event;
-import org.sonatype.gossip.render.PatternRenderer;
+import org.sonatype.gossip.Level;
/**
* Specialized {@link org.sonatype.gossip.render.Renderer} which is aware of basic Maven log messages to colorize.
@@ -44,20 +44,25 @@ public class ColorRenderer
assert event != null;
assert buff != null;
- switch ( event.getLevel() )
+ Level level = event.getLevel();
+ switch ( level )
{
case TRACE:
case DEBUG:
- buff.append( ansi().a( INTENSITY_BOLD ).fg( YELLOW ).a( event.getLevel().name() ).reset() );
+ buff.append( ansi().a( INTENSITY_BOLD ).fg( YELLOW ).a( level.name() ).reset() );
break;
case INFO:
- buff.append( ansi().a( INTENSITY_BOLD ).fg( GREEN ).a( event.getLevel().name() ).reset() );
+ buff.append( ansi().a( INTENSITY_BOLD ).fg( GREEN ).a( level.name() ).reset() );
break;
case WARN:
+ // Maven uses WARNING instead of WARN
+ buff.append( ansi().a( INTENSITY_BOLD ).fg( RED ).a( WARNING ).reset() );
+ break;
+
case ERROR:
- buff.append( ansi().a( INTENSITY_BOLD ).fg( RED ).a( event.getLevel().name() ).reset() );
+ buff.append( ansi().a( INTENSITY_BOLD ).fg( RED ).a( level.name() ).reset() );
break;
default:
http://git-wip-us.apache.org/repos/asf/maven/blob/e50b95f5/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/PatternRenderer.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/PatternRenderer.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/PatternRenderer.java
new file mode 100644
index 0000000..7e767a1
--- /dev/null
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/gossip/PatternRenderer.java
@@ -0,0 +1,54 @@
+package org.apache.maven.cli.logging.impl.gossip;
+
+/*
+ * 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.sonatype.gossip.Event;
+import org.sonatype.gossip.Level;
+
+/**
+ * Specialized {@link org.sonatype.gossip.render.PatternRenderer} to cope with Maven specifics.
+ *
+ * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
+ * @since 3.4.0
+ */
+public class PatternRenderer
+ extends org.sonatype.gossip.render.PatternRenderer
+{
+ protected static final String WARNING = "WARNING";
+
+ @Override
+ protected void renderLevel( final Event event, final StringBuilder buff )
+ {
+ assert event != null;
+ assert buff != null;
+
+ Level level = event.getLevel();
+
+ // Maven uses WARNING instead of WARN
+ if ( level == Level.WARN )
+ {
+ buff.append( WARNING );
+ }
+ else
+ {
+ buff.append( level.name() );
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven/blob/e50b95f5/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties b/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties
index a830b1e..acec235 100644
--- a/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties
+++ b/maven-embedder/src/main/resources/META-INF/org.sonatype.gossip/config.properties
@@ -26,7 +26,7 @@ profiles=default, maven-common, maven-plain, maven-color
profile.default.includes=maven-common
profile.default.listeners=console
profile.default.listener.console=org.sonatype.gossip.listener.ConsoleListener
-profile.default.listener.console.renderer=org.sonatype.gossip.render.PatternRenderer
+profile.default.listener.console.renderer=org.apache.maven.cli.logging.impl.gossip.PatternRenderer
profile.default.listener.console.renderer.pattern=[%l] %m%n%x
##
@@ -42,7 +42,7 @@ profile.maven-common.logger.*=INFO
profile.maven-plain.includes=maven-common
profile.maven-plain.listeners=console
profile.maven-plain.listener.console=org.sonatype.gossip.listener.ConsoleListener
-profile.maven-plain.listener.console.renderer=org.sonatype.gossip.render.PatternRenderer
+profile.maven-plain.listener.console.renderer=org.apache.maven.cli.logging.impl.gossip.PatternRenderer
profile.maven-plain.listener.console.renderer.pattern=[%l] %m%n%x
profile.maven-plain.triggers=default
profile.maven-plain.trigger.default=org.sonatype.gossip.trigger.SystemPropertyTrigger