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/01/03 23:01:25 UTC
[maven] branch MNG-6522 updated (9611b74 -> 988c105)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-6522
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 9611b74 [MNG-6522] Build and test with Java 12
add 732e7de [MNG-6529] ProjectBuilder.build(List<Project> ...) honor request.isResolveDependency
add c6bdafe [MNG-5965] Parallel build multiplies work if multiple goals are given
add 6c4c2e3 Change to keep only 5 artifacts on master and on branches only 1 artifact.
add c7ab987 [MNG-6544] Replace CacheUtils#{eq,hash} with Objects
add 71128cb spelling: vertices
add 9c94626 [MNG-6213] Validate scope in dependencyManagement
new 988c105 [MNG-6522] Build and test with Java 12
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 (9611b74)
\
N -- N -- N refs/heads/MNG-6522 (988c105)
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 1 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 +-
.../multithreaded/ConcurrencyDependencyGraph.java | 9 ++--
.../multithreaded/MultiThreadedBuilder.java | 10 ++--
.../java/org/apache/maven/plugin/CacheUtils.java | 53 +++++++++++++---------
.../maven/project/DefaultProjectBuilder.java | 15 ++++--
.../org/apache/maven/project/ProjectSorter.java | 2 +-
.../internal/ConcurrencyDependencyGraphTest.java | 2 +-
.../apache/maven/project/ProjectBuilderTest.java | 42 +++++++++++++++++
.../projects/basic-resolveDependencies.xml | 15 ++++++
.../model/validation/DefaultModelValidator.java | 10 +++-
.../validation/DefaultModelValidatorTest.java | 10 ++++
...ier.xml => bad-dependency-management-scope.xml} | 38 +++++++++++++++-
12 files changed, 167 insertions(+), 41 deletions(-)
create mode 100644 maven-core/src/test/resources/projects/basic-resolveDependencies.xml
copy maven-model-builder/src/test/resources/poms/validation/{bad-import-scope-classifier.xml => bad-dependency-management-scope.xml} (53%)
[maven] 01/01: [MNG-6522] Build and test with Java 12
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-6522
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 988c105886895cc32492fb769556697d426396c1
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Tue Dec 25 23:28:46 2018 +0100
[MNG-6522] Build and test with Java 12
---
Jenkinsfile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 7c580cd..08b622e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,11 +20,11 @@
properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'5':'1'))])
def buildOs = 'linux'
-def buildJdk = '8'
-def buildMvn = '3.5.4'
+def buildJdk = '12'
+def buildMvn = '3.6.0'
def runITsOses = ['linux', 'windows']
-def runITsJdks = ['7', '8', '11']
-def runITsMvn = '3.5.4'
+def runITsJdks = ['12']
+def runITsMvn = '3.6.0'
def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V" // -DmavenDistro=... -Dmaven.test.failure.ignore=true
def tests
@@ -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-6522']
}
}