This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch MNG-6914_2
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 6dd659b [MNG-6914] move assembly descriptors to src/assembly
discard f7ff3f5 [MNG-6914] move apache-maven-wrapper to its own separate
Maven module
discard fd96d7f [MNG-6914] move mvnw scripts from maven/shared to
wrapper/shared
discard 4fabaff [MNG-6914] move common wrapper distributions conf to
shared.xml
discard 940efb0 [MNG-6914] move download script to wrapper/shared
discard 005688f [MNG-6914] drop tar.gz archives for wrapper install
distributions
discard db9c56b [MNG-6914] rename MAVEN_LAUNCHER to LAUNCHER_CLASS (from
LAUNCHER_JAR)
discard cf6dae2 [MNG-6914] rename .mvn hidden directory in source to mvn
add 8852b87 [MNG-7270] Switch to shell alternative to "which"
add ffc2b99 [MNG-6389] Move the toolchains model to a separate artifactId
new 972c6ec [MNG-6914] rename .mvn hidden directory in source to mvn
new 70b069f [MNG-6914] rename MAVEN_LAUNCHER to LAUNCHER_CLASS (from
LAUNCHER_JAR)
new 1c07b55 [MNG-6914] drop tar.gz archives for wrapper install
distributions
new 79b8172 [MNG-6914] move download script to wrapper/shared
new 26fb6f1 [MNG-6914] move common wrapper distributions conf to
shared.xml
new 6f6c719 [MNG-6914] move mvnw scripts from maven/shared to
wrapper/shared
new 8f5c923 [MNG-6914] move apache-maven-wrapper to its own separate
Maven module
new e584207 [MNG-6914] move assembly descriptors to src/assembly
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (6dd659b)
\
N -- N -- N refs/heads/MNG-6914_2 (e584207)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
apache-maven/src/assembly/shared/init | 2 +-
maven-bom/pom.xml | 10 +++
maven-core/pom.xml | 14 ++++-
.../maven/toolchain/DefaultToolchainTest.java | 48 ++++++++------
maven-toolchain-builder/pom.xml | 70 +++++++++++++++++++++
.../building/DefaultToolchainsBuilder.java | 0
.../building/DefaultToolchainsBuildingRequest.java | 0
.../building/DefaultToolchainsBuildingResult.java | 0
.../toolchain/building/ToolchainsBuilder.java | 0
.../building/ToolchainsBuildingException.java | 0
.../building/ToolchainsBuildingRequest.java | 0
.../building/ToolchainsBuildingResult.java | 0
.../toolchain/io/DefaultToolchainsReader.java | 0
.../toolchain/io/DefaultToolchainsWriter.java | 0
.../toolchain/io/ToolchainsParseException.java | 0
.../maven/toolchain/io/ToolchainsReader.java | 0
.../maven/toolchain/io/ToolchainsWriter.java | 0
.../toolchain/merge/MavenToolchainMerger.java | 0
.../building/DefaultToolchainsBuilderTest.java | 2 +-
.../building/ToolchainsBuildingExceptionTest.java | 8 +--
.../toolchain/merge/MavenToolchainMergerTest.java | 0
.../org/apache/maven/toolchain/global.xml | 0
.../toolchain/model/toolchains-jdks-extend.xml | 0
.../toolchain/model/toolchains-jdks-extra.xml | 0
.../maven/toolchain/model/toolchains-jdks.xml | 0
.../resources/org/apache/maven/toolchain/user.xml | 0
maven-toolchain-model/pom.xml | 59 +++++++++++++++++
.../src/main/mdo/toolchains.mdo | 0
pom.xml | 2 +
src/site/xdoc/maven-deps.odg | Bin 22491 -> 22633 bytes
30 files changed, 186 insertions(+), 29 deletions(-)
create mode 100644 maven-toolchain-builder/pom.xml
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuilder.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingRequest.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsWriter.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/ToolchainsWriter.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/java/org/apache/maven/toolchain/building/ToolchainsBuildingExceptionTest.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/global.xml
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extend.xml
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/user.xml
(100%)
create mode 100644 maven-toolchain-model/pom.xml
rename {maven-core => maven-toolchain-model}/src/main/mdo/toolchains.mdo (100%)
