[maven] branch MNG-6522 updated (988c105 -> 4266ba2)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[maven] branch MNG-6522 updated (988c105 -> 4266ba2)

slachiewicz
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 988c105  [MNG-6522] Build and test with Java 12
     add 391a111  [MNG-6526] Upgrade to Wagon 3.3.1
     add eab62f1  [MNG-6520] Update namespaces for maven-assembly to 2.0.0
     add 33e4f20  [MNG-6548] Lifecycle plugin version upgrades
     add d9facde  [MNG-6530] Introduce system property to disable global model cache
     add a939654  [MNG-6256] Surround parameter of echo command with double quotes
     new 34b40cb  [MNG-6522] Build and test with Java 12-ea
     new 4266ba2  [MNG-6522] Build and test with Java 13-ea

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   (988c105)
            \
             N -- N -- N   refs/heads/MNG-6522 (4266ba2)

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/src/bin/mvn.cmd                       |  4 +--
 apache-maven/src/main/assembly/bin.xml             |  4 +--
 apache-maven/src/main/assembly/component.xml       |  4 +--
 apache-maven/src/main/assembly/dir.xml             |  4 +--
 apache-maven/src/main/assembly/src.xml             |  4 +--
 .../maven/project/DefaultProjectBuilder.java       | 23 ++++++++----
 .../main/resources/META-INF/plexus/components.xml  |  6 ++--
 .../apache/maven/project/ProjectBuilderTest.java   | 41 ++++++++++++++++++++++
 pom.xml                                            |  2 +-
 10 files changed, 73 insertions(+), 21 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[maven] 01/02: [MNG-6522] Build and test with Java 12-ea

slachiewicz
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 34b40cbc13acf11c503b4e7a4e237d9a24fca835
Author: Sylwester Lachiewicz <[hidden email]>
AuthorDate: Tue Dec 25 23:28:46 2018 +0100

    [MNG-6522] Build and test with Java 12-ea
---
 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']
     }
 }
 

Reply | Threaded
Open this post in threaded view
|

[maven] 02/02: [MNG-6522] Build and test with Java 13-ea

slachiewicz
In reply to this post by slachiewicz
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 4266ba20cd198f4ada3c80cc6dfbfd28c9f42df4
Author: Sylwester Lachiewicz <[hidden email]>
AuthorDate: Fri Jan 11 19:27:57 2019 +0100

    [MNG-6522] Build and test with Java 13-ea
---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 08b622e..90c55d8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,7 +23,7 @@ def buildOs = 'linux'
 def buildJdk = '12'
 def buildMvn = '3.6.0'
 def runITsOses = ['linux', 'windows']
-def runITsJdks = ['12']
+def runITsJdks = ['12','13']
 def runITsMvn = '3.6.0'
 def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V" // -DmavenDistro=... -Dmaven.test.failure.ignore=true
 def tests