You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2017/01/30 08:22:01 UTC
[1/4] maven git commit: [MNG-5815] "mvn.cmd" does not indicate
failure properly when using "&&" [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-6068 96eeb1186 -> 1f0493431 (forced update)
[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/fe586467
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/fe586467
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/fe586467
Branch: refs/heads/MNG-6068
Commit: fe586467ecbd63791001e7a6ddf8f18d4fac19b8
Parents: ca43030
Author: Michael Osipov <mi...@apache.org>
Authored: Wed May 11 11:47:14 2016 +0200
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Jan 29 21:51:20 2017 +0100
----------------------------------------------------------------------
apache-maven/src/bin/mvn.cmd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/fe586467/apache-maven/src/bin/mvn.cmd
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn.cmd b/apache-maven/src/bin/mvn.cmd
index 3f170c3..2321b9c 100644
--- a/apache-maven/src/bin/mvn.cmd
+++ b/apache-maven/src/bin/mvn.cmd
@@ -154,4 +154,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%
[4/4] maven git commit: [MNG-6068] Document default scope compile in
XSD o Added information about default scope in XSD comment.
Posted by kh...@apache.org.
[MNG-6068] Document default scope compile in XSD
o Added information about default scope in XSD comment.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/1f049343
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/1f049343
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/1f049343
Branch: refs/heads/MNG-6068
Commit: 1f0493431be3bd0f25757b5ba0ed98b3a41b3374
Parents: 5a46234
Author: Karl Heinz Marbaise <kh...@apache.org>
Authored: Mon Jul 18 11:56:40 2016 +0200
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Mon Jan 30 09:21:49 2017 +0100
----------------------------------------------------------------------
maven-model/src/main/mdo/maven.mdo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/1f049343/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..2f4ea0c 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -1398,7 +1398,7 @@
It also assists in determining which artifacts to include in a distribution of
this project. For more information, see
<a href="https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html">the
- dependency mechanism</a>.
+ dependency mechanism</a>. If no scope is given the scope is <code>compile</code>.
]]>
</description>
<type>String</type>
[3/4] 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 do
Posted by kh...@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.
o Removed entry from artifact-handlers.apt site.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5a462344
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5a462344
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5a462344
Branch: refs/heads/MNG-6068
Commit: 5a462344f9e8aee3f1a423f0268ea27ce017c8c3
Parents: 46c1581
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 Jan 30 09:20:07 2017 +0100
----------------------------------------------------------------------
.../main/resources/META-INF/plexus/artifact-handlers.xml | 11 -----------
maven-core/src/site/apt/artifact-handlers.apt | 2 --
2 files changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/5a462344/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 f467252..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
@@ -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
http://git-wip-us.apache.org/repos/asf/maven/blob/5a462344/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 a7ffade..1a4b344 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>>> |
[2/4] maven git commit: [MNG-5823] mvnDebug doesn't work with M2_HOME
with spaces - missing quotes
Posted by kh...@apache.org.
[MNG-5823] mvnDebug doesn't work with M2_HOME with spaces - missing quotes
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/46c15814
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/46c15814
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/46c15814
Branch: refs/heads/MNG-6068
Commit: 46c1581474ed3b8110dbc7275172b92056b6e5dd
Parents: fe58646
Author: Tobias Oberlies <to...@sap.com>
Authored: Sat Dec 19 18:06:23 2015 +0100
Committer: Michael Osipov <mi...@apache.org>
Committed: Sun Jan 29 22:56:10 2017 +0100
----------------------------------------------------------------------
apache-maven/src/bin/mvnDebug | 2 +-
apache-maven/src/bin/mvnyjp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/46c15814/apache-maven/src/bin/mvnDebug
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug
index 09f48d9..8d6e6a1 100755
--- a/apache-maven/src/bin/mvnDebug
+++ b/apache-maven/src/bin/mvnDebug
@@ -31,4 +31,4 @@ MAVEN_DEBUG_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,addre
echo Preparing to execute Maven in debug mode
-env MAVEN_OPTS="$MAVEN_OPTS" MAVEN_DEBUG_OPTS="$MAVEN_DEBUG_OPTS" $(dirname $0)/mvn "$@"
+env MAVEN_OPTS="$MAVEN_OPTS" MAVEN_DEBUG_OPTS="$MAVEN_DEBUG_OPTS" "$(dirname "$0")/mvn" "$@"
http://git-wip-us.apache.org/repos/asf/maven/blob/46c15814/apache-maven/src/bin/mvnyjp
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvnyjp b/apache-maven/src/bin/mvnyjp
index e08f77e..b2dbe1d 100755
--- a/apache-maven/src/bin/mvnyjp
+++ b/apache-maven/src/bin/mvnyjp
@@ -32,4 +32,4 @@ if [ ! -f "$YJPLIB" ]; then
exit 1
fi
-env MAVEN_OPTS="-agentpath:$YJPLIB=onexit=snapshot,onexit=memory,tracing,onlylocal $MAVEN_OPTS" $(dirname $0)/mvn "$@"
+env MAVEN_OPTS="-agentpath:$YJPLIB=onexit=snapshot,onexit=memory,tracing,onlylocal $MAVEN_OPTS" "$(dirname "$0")/mvn" "$@"