You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2019/05/25 21:20:26 UTC
[maven] branch MNG-6071 updated (a5a7785 -> f101828)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-6071
in repository https://gitbox.apache.org/repos/asf/maven.git.
omit a5a7785 [MNG-6071] Normalize relative paths for working directory
add a7acfe7 [MNG-6611] Update animal-sniffer-maven-plugin to version 1.17
add 95401cf [MNG-6605] Unable to suppress download/upload messages (in interactive mode)
add 0ba5753 [MNG-6618] adding org.slf4j.event in exported packages
add d66c9c0 [maven-release-plugin] prepare release maven-3.6.1
add 5222f03 [maven-release-plugin] prepare for next development iteration
add 55614d3 [MNG-6627] upgrade Plexus container to 2.0.0 for Reproducible Builds
add 715d90b Update DOAP Information for new release.
add 0940c7c [MNG-6405] Fix basedir in MavenProject.deepCopy (#225)
add 61d888c [MNG-6646] Upgrade maven-assembly-plugin to 3.1.1
add 763f76c [MNG-6642] Revert "[MNG-5995] Remove dependency to maven-compat (#185)"
add fdde73f Remove unused code that triggers Error Prone (#245)
add 80c6fe3 [MNG-6643] - Version comparison CLI does not work anymore
add baed5a2 [MNG-6629] - Make ID validation faster
add ebac165 [MNG-6630] - Make ComparableVersion faster
add 44ad1aa [MNG-6631] - Make DefaultArtifactVersion faster
add d34e8fb [MNG-6631] documented the performance intent
add 1e03388 [MNG-6632] - Remember artifact handlers after they've been used once
add 869b615 [MNG-6636] merge reports location tracking
add 5350ed8 [MNG-6644] don't fail if no input location tracking available
add 4ff24e3 [MNG-6643] Integration test
add 2760e3e (doc) - correct plural form of 'child'
add 3ac9718 [MNG-6655] Add support for "release" qualifier
add 1a18eb6 [MNG-6626] fix DefaultExceptionHandler NPE
add 6583012 [MNG-6069] Avoid (some) deprecated commons-cli methods
add ff8c5c8 MNG-6069: unittest with compact and spaced -D options
add 790dc0f [MNG-6633] - Reduce memory usage of excludes
add 6c01ec1 [MNG-6633] - Reduce memory usage of excludes - fix rat/checkstyle errors
new 4388735 [MNG-6071] Normalize relative paths for working directory
new f101828 [MNG-6071] Run ITs
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 (a5a7785)
\
N -- N -- N refs/heads/MNG-6071 (f101828)
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 2 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:
Jenkinsfile | 2 +-
apache-maven/pom.xml | 2 +-
doap_Maven.rdf | 11 ++
maven-artifact/pom.xml | 14 ++-
.../artifact/versioning/ComparableVersion.java | 122 +++++++++++++++++++--
.../versioning/DefaultArtifactVersion.java | 91 +++++++++------
.../artifact/versioning/ComparableVersionIT.java | 93 ++++++++++++++++
.../artifact/versioning/ComparableVersionTest.java | 12 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
maven-core/pom.xml | 2 +-
.../manager/DefaultArtifactHandlerManager.java | 10 +-
...actFilter.java => ExclusionArtifactFilter.java} | 26 +++--
.../apache/maven/bridge/MavenRepositorySystem.java | 12 +-
.../maven/exception/DefaultExceptionHandler.java | 9 +-
.../project/DefaultProjectBuildingHelper.java | 6 +-
.../org/apache/maven/project/MavenProject.java | 3 +-
.../project/artifact/MavenMetadataSource.java | 12 +-
.../main/resources/META-INF/maven/extension.xml | 1 +
.../maven/AbstractCoreMavenComponentTestCase.java | 53 ---------
.../exception/DefaultExceptionHandlerTest.java | 53 ++++++++-
.../org/apache/maven/plugin/PluginManagerTest.java | 22 ----
.../org/apache/maven/project/MavenProjectTest.java | 11 ++
maven-embedder/pom.xml | 2 +-
.../main/java/org/apache/maven/cli/CLIManager.java | 79 ++++++-------
.../main/java/org/apache/maven/cli/MavenCli.java | 2 +-
.../java/org/apache/maven/cli/CLIManagerTest.java | 31 ++++--
maven-model-builder/pom.xml | 2 +-
.../model/plugin/DefaultReportingConverter.java | 2 +-
.../model/validation/DefaultModelValidator.java | 53 +++++++--
maven-model/pom.xml | 2 +-
.../org/apache/maven/model/merge/ModelMerger.java | 18 +++
maven-model/src/main/mdo/maven.mdo | 10 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
pom.xml | 14 ++-
40 files changed, 546 insertions(+), 252 deletions(-)
create mode 100644 maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java
copy maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/{ExcludesArtifactFilter.java => ExclusionArtifactFilter.java} (61%)
copy maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestTransferListener.java => maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java (51%)
[maven] 02/02: [MNG-6071] Run ITs
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-6071
in repository https://gitbox.apache.org/repos/asf/maven.git
commit f101828cd82e64b1bc1bfdff41d8251d2a01768a
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat May 25 23:20:01 2019 +0200
[MNG-6071] Run ITs
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index bcf5310..3e70374 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -59,7 +59,7 @@ node(jenkinsEnv.nodeSelection(osNode)) {
}
}
- tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', id: '_', remote: 'https://gitbox.apache.org/repos/asf/maven-integration-testing.git', traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master']
+ tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', id: '_', remote: 'https://gitbox.apache.org/repos/asf/maven-integration-testing.git', traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'MNG-6071']
}
}
[maven] 01/02: [MNG-6071] Normalize relative paths for working
directory
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-6071
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 4388735131bdaeb3833453731b07a9c03c4f8ae0
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Mon Nov 12 22:39:48 2018 +0100
[MNG-6071] Normalize relative paths for working directory
---
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 4ee6aa8..f328cdb 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
@@ -100,6 +100,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
import java.nio.file.Files;
+import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -1630,7 +1631,7 @@ public class MavenCli
}
else
{
- return new File( workingDirectory, file.getPath() ).getAbsoluteFile();
+ return Paths.get( workingDirectory, file.getPath() ).normalize().toFile();
}
}