maven git commit: Update Jenkinsfile to use JENKINS-43507 syntax for resolveScm
Repository: maven Updated Branches: refs/heads/bisect-0 [created] 98245bd55 Update Jenkinsfile to use JENKINS-43507 syntax for resolveScm Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/98245bd5 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/98245bd5 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/98245bd5 Branch: refs/heads/bisect-0 Commit: 98245bd5551bab242f8350091881c33db8a3022d Parents: 4f2a2db Author: Stephen ConnollyAuthored: Tue Aug 29 21:47:50 2017 +0100 Committer: Stephen Connolly Committed: Tue Aug 29 22:16:19 2017 +0100 -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/98245bd5/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index b6c7e19..004abcb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,7 +49,7 @@ node('ubuntu') { junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml' } -tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', excludes: '', gitTool: 'Default', id: '_', ignoreOnPushNotifications: false, includes: '*', remote: 'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git'], targets: [BRANCH_NAME, 'master'] +tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', id: '_', remote: 'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git', traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master'] } }
maven git commit: Update Jenkinsfile to use JENKINS-43507 syntax for resolveScm
Repository: maven Updated Branches: refs/heads/master f047ea143 -> e44c39c2e Update Jenkinsfile to use JENKINS-43507 syntax for resolveScm Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e44c39c2 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e44c39c2 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e44c39c2 Branch: refs/heads/master Commit: e44c39c2eb5afda9efe60b9dd0ffc32c62501c5f Parents: f047ea1 Author: Stephen ConnollyAuthored: Tue Aug 29 21:47:50 2017 +0100 Committer: Stephen Connolly Committed: Tue Aug 29 21:47:50 2017 +0100 -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/e44c39c2/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index b6c7e19..004abcb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,7 +49,7 @@ node('ubuntu') { junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml' } -tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', excludes: '', gitTool: 'Default', id: '_', ignoreOnPushNotifications: false, includes: '*', remote: 'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git'], targets: [BRANCH_NAME, 'master'] +tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', id: '_', remote: 'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git', traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master'] } }
maven-integration-testing git commit: Adding a Zulu JDK 7 environment
Repository: maven-integration-testing Updated Branches: refs/heads/master 2233f421c -> a08d65bfb Adding a Zulu JDK 7 environment Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/a08d65bf Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/a08d65bf Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/a08d65bf Branch: refs/heads/master Commit: a08d65bfb5fedec9f684c13bf5a0dccb96f5cc56 Parents: 2233f42 Author: Stephen ConnollyAuthored: Mon Sep 11 09:47:45 2017 +0100 Committer: Stephen Connolly Committed: Mon Sep 11 09:47:45 2017 +0100 -- environments/zulu-jdk7/Dockerfile | 34 ++ 1 file changed, 34 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/a08d65bf/environments/zulu-jdk7/Dockerfile -- diff --git a/environments/zulu-jdk7/Dockerfile b/environments/zulu-jdk7/Dockerfile new file mode 100644 index 000..676307a --- /dev/null +++ b/environments/zulu-jdk7/Dockerfile @@ -0,0 +1,34 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +FROM azul/zulu-openjdk:7 + +RUN apt-get update &&\ +apt-get upgrade -y ca-certificates &&\ +apt-get install -y --no-install-recommends git curl &&\ +rm -rf /var/lib/apt/lists/* + +ARG MAVEN_VERSION=3.3.9 +ARG USER_HOME_DIR="/root" + +RUN mkdir -p /usr/share/maven /usr/share/maven/ref \ + && curl -fsSL http://apache.osuosl.org/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz \ +| tar -xzC /usr/share/maven --strip-components=1 \ + && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn + +ENV MAVEN_HOME /usr/share/maven +ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
maven git commit: [MNG-6275] Defang the tests when their core assumption is invalid.
Repository: maven Updated Branches: refs/heads/master 312eb5350 -> 542a7a891 [MNG-6275] Defang the tests when their core assumption is invalid. - The tests assume that the JRE has a ScriptEngineFactory - Not all JREs have a ScriptEngineFactory (I'm looking at Azul's Zulu Open JDK 7 builds) - Ideally we'd skip these tests using Assume.assumeThat(...) but PlexusTestCase doesn't support AssumptionViolatedException for marking tests as skipped. Issue identified during testing of the 3.5.1 release candidate Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/542a7a89 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/542a7a89 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/542a7a89 Branch: refs/heads/master Commit: 542a7a89156263b34d1472e9d9c1a2795afccd2d Parents: 312eb53 Author: Stephen ConnollyAuthored: Mon Sep 11 10:25:11 2017 +0100 Committer: Stephen Connolly Committed: Mon Sep 11 10:25:11 2017 +0100 -- .../classrealm/DefaultClassRealmManagerTest.java| 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/542a7a89/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java -- diff --git a/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java b/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java index 726199f..6d074b9 100644 --- a/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java +++ b/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java @@ -34,6 +34,7 @@ import org.junit.Test; public class DefaultClassRealmManagerTest extends PlexusTestCase { private ClassRealmManager classRealmManager; +private boolean haveScriptEngineFactory; @Override protected void setUp() @@ -41,6 +42,11 @@ public class DefaultClassRealmManagerTest extends PlexusTestCase { super.setUp(); this.classRealmManager = lookup( ClassRealmManager.class ); +ClassLoader testRealm = getClass().getClassLoader(); +ServiceLoader sef = ServiceLoader.load( ScriptEngineFactory.class, testRealm ); +// TODO switch to Assume.assumeTrue( sef.iterator().hasNext() ) when PlexusTestCase +// supports assumptions. Not every Java 7 JRE has a ScriptEngineFactory. +this.haveScriptEngineFactory = sef.iterator().hasNext(); } @Override @@ -59,7 +65,7 @@ public class DefaultClassRealmManagerTest extends PlexusTestCase ClassRealm pluginRealm = classRealmManager.createPluginRealm( plugin, parent, null, null, null ); ServiceLoader sef = ServiceLoader.load( ScriptEngineFactory.class, pluginRealm ); -assertTrue( sef.iterator().hasNext() ); +assertEquals( haveScriptEngineFactory, sef.iterator().hasNext() ); } @Test @@ -70,7 +76,7 @@ public class DefaultClassRealmManagerTest extends PlexusTestCase ClassRealm extensionRealm = classRealmManager.createExtensionRealm( extension, null ); ServiceLoader sef = ServiceLoader.load( ScriptEngineFactory.class, extensionRealm ); -assertTrue( sef.iterator().hasNext() ); +assertEquals( haveScriptEngineFactory, sef.iterator().hasNext() ); } @Test @@ -80,7 +86,7 @@ public class DefaultClassRealmManagerTest extends PlexusTestCase ClassRealm projectRealm = classRealmManager.createProjectRealm( model, null ); ServiceLoader sef = ServiceLoader.load( ScriptEngineFactory.class, projectRealm ); -assertTrue( sef.iterator().hasNext() ); +assertEquals( haveScriptEngineFactory, sef.iterator().hasNext() ); } @Test @@ -88,7 +94,7 @@ public class DefaultClassRealmManagerTest extends PlexusTestCase { ClassRealm mavenApiRealm = classRealmManager.getMavenApiRealm(); ServiceLoader sef = ServiceLoader.load( ScriptEngineFactory.class, mavenApiRealm ); -assertTrue( sef.iterator().hasNext() ); +assertEquals( haveScriptEngineFactory, sef.iterator().hasNext() ); } @Test @@ -96,6 +102,6 @@ public class DefaultClassRealmManagerTest extends PlexusTestCase { ClassRealm coreRealm = classRealmManager.getCoreRealm(); ServiceLoader sef = ServiceLoader.load( ScriptEngineFactory.class, coreRealm ); -assertTrue( sef.iterator().hasNext() ); +assertEquals( haveScriptEngineFactory, sef.iterator().hasNext() ); } }
maven git commit: [MNG-6275] Maven Embedder compatible fix
Repository: maven Updated Branches: refs/heads/master c9a288d8b -> 27a2bda3f [MNG-6275] Maven Embedder compatible fix - Need to use PARENT_CLASSLOADER so that when used by embedder we get a consistent view of the available classes - Restores test case from f047ea143766fd22ae42040e6805bef287f3cc3e Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/27a2bda3 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/27a2bda3 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/27a2bda3 Branch: refs/heads/master Commit: 27a2bda3f4a8f5385c4cab360ed7365d3d3d3c09 Parents: c9a288d Author: Stephen ConnollyAuthored: Thu Aug 24 11:33:01 2017 +0200 Committer: Stephen Connolly Committed: Sat Sep 9 11:56:27 2017 +0100 -- .../classrealm/DefaultClassRealmManager.java| 2 +- .../DefaultClassRealmManagerTest.java | 101 +++ 2 files changed, 102 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/27a2bda3/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java -- diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index 6ce1925..013ab23 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java @@ -120,7 +120,7 @@ public class DefaultClassRealmManager { try { -ClassRealm classRealm = world.newRealm( realmId, null ); +ClassRealm classRealm = world.newRealm( realmId, PARENT_CLASSLOADER ); if ( logger.isDebugEnabled() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/27a2bda3/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java -- diff --git a/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java b/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java new file mode 100644 index 000..726199f --- /dev/null +++ b/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java @@ -0,0 +1,101 @@ +package org.apache.maven.classrealm; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.util.ServiceLoader; + +import javax.script.ScriptEngineFactory; + +import org.apache.maven.model.Model; +import org.apache.maven.model.Plugin; +import org.codehaus.plexus.ContainerConfiguration; +import org.codehaus.plexus.PlexusConstants; +import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.classworlds.realm.ClassRealm; +import org.junit.Test; + +public class DefaultClassRealmManagerTest extends PlexusTestCase +{ +private ClassRealmManager classRealmManager; + +@Override +protected void setUp() +throws Exception +{ +super.setUp(); +this.classRealmManager = lookup( ClassRealmManager.class ); +} + +@Override +protected void customizeContainerConfiguration( ContainerConfiguration configuration ) +{ +configuration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); +} + +@Test +public void testMNG6275_pluginRealmDefaultParentClassLoader() +{ +Plugin plugin = new Plugin(); +plugin.setVersion( "VERSION" ); + +ClassLoader parent = null; + +ClassRealm pluginRealm = classRealmManager.createPluginRealm( plugin, parent, null, null, null ); +ServiceLoader sef = ServiceLoader.load( ScriptEngineFactory.class, pluginRealm ); +assertTrue( sef.iterator().hasNext() ); +} + +@Test +public void
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/mng-6275 [deleted] 889fe1be9
svn commit: r1807955 - in /maven/site/trunk/content/markdown/docs/3.5.1: ./ release-notes.md
Author: stephenc Date: Sun Sep 10 15:25:31 2017 New Revision: 1807955 URL: http://svn.apache.org/viewvc?rev=1807955=rev Log: Adding the draft release notes for Maven 3.5.1 Added: maven/site/trunk/content/markdown/docs/3.5.1/ maven/site/trunk/content/markdown/docs/3.5.1/release-notes.md Added: maven/site/trunk/content/markdown/docs/3.5.1/release-notes.md URL: http://svn.apache.org/viewvc/maven/site/trunk/content/markdown/docs/3.5.1/release-notes.md?rev=1807955=auto == --- maven/site/trunk/content/markdown/docs/3.5.1/release-notes.md (added) +++ maven/site/trunk/content/markdown/docs/3.5.1/release-notes.md Sun Sep 10 15:25:31 2017 @@ -0,0 +1,139 @@ + + +# Release Notes Maven 3.5.1 + +The Apache Maven team would like to announce the release of Maven 3.5.1. + +Maven 3.5.1 is [available for download][0]. + +Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central place. + +The core release is independent of the plugins available. Further releases of plugins will be made separately. See the [PluginList][1] for more information. + +We hope you enjoy using Maven! If you have any questions, please consult: + +- the web site: [http://maven.apache.org/][2] +- the maven-user mailing list: [http://maven.apache.org/mail-lists.html][3] +- the reference documentation: [http://maven.apache.org/ref/3.5.1/][4] + +## Reporters and Contributors of this release + +Bugs: + +Improvements: + +Many thanks to all reporters and contributors and for their time and support. + +## Testers + +The following members of the Maven community provided valuable feedback during the release process: + +* ... + +Thank you for your time and feedback. + +## Overview about the changes + +There is one change that deserves to be highlighted, [MNG-6275][]. +As a result of changes in the classloaders within which the META-INF services are exposed from Java 8 onwards, we have had to change how the root Maven classloader gets initialized. +When invoked from the command line, there is no difference between the new explicitly configured root classloader and the previous inferred classloader. +However, in the case of IDEs and other third party users of Maven Embedder have integrated with Maven, there is the potential that this change may cause issues for those IDEs. +Please report any inconsistencies in the behaviour of IDEs and other third party consumers of Maven Embedder to their maintainers, as the classloader change is required for Java 8 onwards. + +## Improvements + +The full list of changes as well as detailed descriptions of same can be found in our [issue management system][6]. + +### Bugs + +- [MNG-5935][] - Optional true getting lost in managed dependencies when transitive +- [MNG-6127][] - Fix plugin execution configuration interference +- [MNG-6148][] - Can't package and assemble with JDK9/Jigsaw +- [MNG-6149][] - MetadataResolutionResult#getGraph() never resolves request type 'test' +- [MNG-6205][] - Non-ascii chars in name element are displayed as question marks in Win CLI output (regression) +- [MNG-6209][] - inconsistent activation of components from multiple extensions=true plugins +- [MNG-6210][] - can't load @SessionScoped/@MojoExecutionScoped components from .mvn/extensions.xml +- [MNG-6223][] - mvn -f outputs invalid error when specifying POM directory +- [MNG-6233][] - maven-resolver-provider mixes JRS 330 and Plexus annotations +- [MNG-6240][] - Duplicate components in plugin extension realm when plugin depends on maven-aether-resolver +- [MNG-6275][] - ServiceLoaderFactory can't find implementations via ClassRealm + +### Sub-tasks +- [MNG-6186][] - switch to improved HawtJNI +- [MNG-6280][] - ArrayIndexOutOfBoundsException caused by pom.xml with process instructions + +### Improvements +- [MNG-5457][] - Show repository id when downloading or uploading from/to a remote repository +- [MNG-6025][] - Add a ProjectArtifactsCache similar to PluginArtifactsCache +- [MNG-6123][] - detect self references in POM and fail fast +- [MNG-6174][] - Clean Up Maven Model +- [MNG-6203][] - Minor cleanup in MavenCli.java +- [MNG-6206][] - We should produce a WARNING by using RELEASE, LATEST as versions +- [MNG-6207][] - Create WARNINGs in case of using system scope +- [MNG-6228][] - Optionality not displayed in dependency tree when run in debug mode + +### New Features +- [MNG-6084][] - Support JSR 250 annotations +- [MNG-6220][] - Add CLI options to control color output + +### Tasks +- [MNG-6167][] - Clean up dependency mess (reported by dependency:analyze) +- [MNG-6258][] - Upgrade to Maven Resolver 1.1.0 + +## Complete Release Notes + +See [complete release notes for all versions][7] + +[0]: ../../download.html +[1]: ../../plugins/index.html +[2]: https://maven.apache.org/ +[3]: /mail-lists.html +[4
svn commit: r21551 - in /dev/maven/maven-3/3.5.1: ./ binaries/ source/
Author: stephenc Date: Sun Sep 10 15:29:13 2017 New Revision: 21551 Log: Staging release of 3.5.1 to dist Added: dev/maven/maven-3/3.5.1/ dev/maven/maven-3/3.5.1/binaries/ dev/maven/maven-3/3.5.1/binaries/apache-maven-3.5.1-bin.tar.gz (with props) dev/maven/maven-3/3.5.1/binaries/apache-maven-3.5.1-bin.tar.gz.asc dev/maven/maven-3/3.5.1/binaries/apache-maven-3.5.1-bin.zip (with props) dev/maven/maven-3/3.5.1/binaries/apache-maven-3.5.1-bin.zip.asc dev/maven/maven-3/3.5.1/source/ dev/maven/maven-3/3.5.1/source/apache-maven-3.5.1-src.tar.gz (with props) dev/maven/maven-3/3.5.1/source/apache-maven-3.5.1-src.tar.gz.asc dev/maven/maven-3/3.5.1/source/apache-maven-3.5.1-src.zip (with props) dev/maven/maven-3/3.5.1/source/apache-maven-3.5.1-src.zip.asc Added: dev/maven/maven-3/3.5.1/binaries/apache-maven-3.5.1-bin.tar.gz == Binary file - no diff available. Propchange: dev/maven/maven-3/3.5.1/binaries/apache-maven-3.5.1-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/maven/maven-3/3.5.1/binaries/apache-maven-3.5.1-bin.tar.gz.asc == --- dev/maven/maven-3/3.5.1/binaries/apache-maven-3.5.1-bin.tar.gz.asc (added) +++ dev/maven/maven-3/3.5.1/binaries/apache-maven-3.5.1-bin.tar.gz.asc Sun Sep 10 15:29:13 2017 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - https://gpgtools.org + +iEYEABECAAYFAlm1M8AACgkQx8oZt7Yg14fN+gCfYazsdE7N/xclv7wqsmLcke/O +7ecAn13SgVf0Q/cx9lSEquIIbwhBkzhS +=7t+F +-END PGP SIGNATURE- Added: dev/maven/maven-3/3.5.1/binaries/apache-maven-3.5.1-bin.zip == Binary file - no diff available. Propchange: dev/maven/maven-3/3.5.1/binaries/apache-maven-3.5.1-bin.zip -- svn:mime-type = application/octet-stream Added: dev/maven/maven-3/3.5.1/binaries/apache-maven-3.5.1-bin.zip.asc == --- dev/maven/maven-3/3.5.1/binaries/apache-maven-3.5.1-bin.zip.asc (added) +++ dev/maven/maven-3/3.5.1/binaries/apache-maven-3.5.1-bin.zip.asc Sun Sep 10 15:29:13 2017 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - https://gpgtools.org + +iEYEABECAAYFAlm1M8AACgkQx8oZt7Yg14diFACcC2rrYToNIEANTJtFAK7WHWoc +0acAnixL1moC5UxEcy9Adl1t3v0SOvvz +=lr6N +-END PGP SIGNATURE- Added: dev/maven/maven-3/3.5.1/source/apache-maven-3.5.1-src.tar.gz == Binary file - no diff available. Propchange: dev/maven/maven-3/3.5.1/source/apache-maven-3.5.1-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/maven/maven-3/3.5.1/source/apache-maven-3.5.1-src.tar.gz.asc == --- dev/maven/maven-3/3.5.1/source/apache-maven-3.5.1-src.tar.gz.asc (added) +++ dev/maven/maven-3/3.5.1/source/apache-maven-3.5.1-src.tar.gz.asc Sun Sep 10 15:29:13 2017 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - https://gpgtools.org + +iEYEABECAAYFAlm1M8AACgkQx8oZt7Yg14dulQCfen4v7TC+YOyzbc/5nZrLMzV5 +LIwAn0ibbGJLjNy3DgRHdWq4fFK0KFD7 +=u0n5 +-END PGP SIGNATURE- Added: dev/maven/maven-3/3.5.1/source/apache-maven-3.5.1-src.zip == Binary file - no diff available. Propchange: dev/maven/maven-3/3.5.1/source/apache-maven-3.5.1-src.zip -- svn:mime-type = application/octet-stream Added: dev/maven/maven-3/3.5.1/source/apache-maven-3.5.1-src.zip.asc == --- dev/maven/maven-3/3.5.1/source/apache-maven-3.5.1-src.zip.asc (added) +++ dev/maven/maven-3/3.5.1/source/apache-maven-3.5.1-src.zip.asc Sun Sep 10 15:29:13 2017 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - https://gpgtools.org + +iEYEABECAAYFAlm1M8AACgkQx8oZt7Yg14d+XACgiT2mU7WTikyYUhgiQPEHwpBI +mOUAn1htEmKHcsJGvIbgK4gjQB1Wvu23 +=Xu96 +-END PGP SIGNATURE-
maven git commit: [maven-release-plugin] prepare release maven-3.5.1
Repository: maven Updated Branches: refs/heads/master 27a2bda3f -> 094e4e31a [maven-release-plugin] prepare release maven-3.5.1 Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/094e4e31 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/094e4e31 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/094e4e31 Branch: refs/heads/master Commit: 094e4e31a5af55bb17be87675da41d9aeca062f3 Parents: 27a2bda Author: Stephen ConnollyAuthored: Sun Sep 10 12:51:26 2017 +0100 Committer: Stephen Connolly Committed: Sun Sep 10 12:51:26 2017 +0100 -- apache-maven/pom.xml | 2 +- maven-artifact/pom.xml| 2 +- maven-builder-support/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml| 2 +- maven-embedder/pom.xml| 2 +- maven-model-builder/pom.xml | 2 +- maven-model/pom.xml | 2 +- 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 | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/094e4e31/apache-maven/pom.xml -- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index b286f74..eb97543 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.5.1 apache-maven http://git-wip-us.apache.org/repos/asf/maven/blob/094e4e31/maven-artifact/pom.xml -- diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index b13482b..8a978a8 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.5.1 maven-artifact http://git-wip-us.apache.org/repos/asf/maven/blob/094e4e31/maven-builder-support/pom.xml -- diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml index 9557731..02682ab 100644 --- a/maven-builder-support/pom.xml +++ b/maven-builder-support/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.5.1 maven-builder-support http://git-wip-us.apache.org/repos/asf/maven/blob/094e4e31/maven-compat/pom.xml -- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index b3cf039..9d3542e 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.5.1 maven-compat http://git-wip-us.apache.org/repos/asf/maven/blob/094e4e31/maven-core/pom.xml -- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 6cd8d85..78a7dc6 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.5.1 maven-core http://git-wip-us.apache.org/repos/asf/maven/blob/094e4e31/maven-embedder/pom.xml -- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 4b3d097..b759470 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.5.1 maven-embedder http://git-wip-us.apache.org/repos/asf/maven/blob/094e4e31/maven-model-builder/pom.xml -- diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index eb86824..d44ff50 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.5.1 maven-model-builder http://git-wip-us.apache.org/repos/asf/maven/blob/094e4e31/maven-model/pom.xml -- diff --git a/maven-model/pom.xml b/maven-model/pom.xml index 581e927..a321d35 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1-SNAPSHOT +3.5.1 maven-model
[maven] Git Push Summary
Repository: maven Updated Tags: refs/tags/maven-3.5.1 [created] eae7a5fd7
maven git commit: [maven-release-plugin] prepare for next development iteration
Repository: maven Updated Branches: refs/heads/master 094e4e31a -> 312eb5350 [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/312eb535 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/312eb535 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/312eb535 Branch: refs/heads/master Commit: 312eb53502b78355ab21e27610e7ef253990f574 Parents: 094e4e3 Author: Stephen ConnollyAuthored: Sun Sep 10 12:51:43 2017 +0100 Committer: Stephen Connolly Committed: Sun Sep 10 12:51:43 2017 +0100 -- apache-maven/pom.xml | 2 +- maven-artifact/pom.xml| 2 +- maven-builder-support/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml| 2 +- maven-embedder/pom.xml| 2 +- maven-model-builder/pom.xml | 2 +- maven-model/pom.xml | 2 +- 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 | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/312eb535/apache-maven/pom.xml -- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index eb97543..4d9b78c 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1 +3.5.2-SNAPSHOT apache-maven http://git-wip-us.apache.org/repos/asf/maven/blob/312eb535/maven-artifact/pom.xml -- diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index 8a978a8..8c99f33 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1 +3.5.2-SNAPSHOT maven-artifact http://git-wip-us.apache.org/repos/asf/maven/blob/312eb535/maven-builder-support/pom.xml -- diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml index 02682ab..308f55d 100644 --- a/maven-builder-support/pom.xml +++ b/maven-builder-support/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1 +3.5.2-SNAPSHOT maven-builder-support http://git-wip-us.apache.org/repos/asf/maven/blob/312eb535/maven-compat/pom.xml -- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 9d3542e..1b1cd3c 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1 +3.5.2-SNAPSHOT maven-compat http://git-wip-us.apache.org/repos/asf/maven/blob/312eb535/maven-core/pom.xml -- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 78a7dc6..a9028c4 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1 +3.5.2-SNAPSHOT maven-core http://git-wip-us.apache.org/repos/asf/maven/blob/312eb535/maven-embedder/pom.xml -- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index b759470..c252426 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1 +3.5.2-SNAPSHOT maven-embedder http://git-wip-us.apache.org/repos/asf/maven/blob/312eb535/maven-model-builder/pom.xml -- diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index d44ff50..e86193c 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1 +3.5.2-SNAPSHOT maven-model-builder http://git-wip-us.apache.org/repos/asf/maven/blob/312eb535/maven-model/pom.xml -- diff --git a/maven-model/pom.xml b/maven-model/pom.xml index a321d35..da104fd 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.1 +3.5.2-SNAPSHOT maven-model
[1/2] maven git commit: Revert "Squashed commit of the following:" [Forced Update!]
Repository: maven Updated Branches: refs/heads/MNG-6216 0f3989dd7 -> c9a288d8b (forced update) Revert "Squashed commit of the following:" This reverts commit f047ea143766fd22ae42040e6805bef287f3cc3e. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/170c1ed8 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/170c1ed8 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/170c1ed8 Branch: refs/heads/MNG-6216 Commit: 170c1ed82cbe124da1736da64af20d660dc3162e Parents: e44c39c Author: rfscholteAuthored: Wed Aug 30 11:12:20 2017 +0200 Committer: rfscholte Committed: Wed Aug 30 11:12:20 2017 +0200 -- .../classrealm/DefaultClassRealmManager.java| 2 +- .../DefaultClassRealmManagerTest.java | 101 --- 2 files changed, 1 insertion(+), 102 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/170c1ed8/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java -- diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index d517924..6ce1925 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java @@ -120,7 +120,7 @@ public class DefaultClassRealmManager { try { -ClassRealm classRealm = world.newRealm( realmId, ClassLoader.getSystemClassLoader() ); +ClassRealm classRealm = world.newRealm( realmId, null ); if ( logger.isDebugEnabled() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/170c1ed8/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java -- diff --git a/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java b/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java deleted file mode 100644 index 726199f..000 --- a/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.apache.maven.classrealm; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.util.ServiceLoader; - -import javax.script.ScriptEngineFactory; - -import org.apache.maven.model.Model; -import org.apache.maven.model.Plugin; -import org.codehaus.plexus.ContainerConfiguration; -import org.codehaus.plexus.PlexusConstants; -import org.codehaus.plexus.PlexusTestCase; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.junit.Test; - -public class DefaultClassRealmManagerTest extends PlexusTestCase -{ -private ClassRealmManager classRealmManager; - -@Override -protected void setUp() -throws Exception -{ -super.setUp(); -this.classRealmManager = lookup( ClassRealmManager.class ); -} - -@Override -protected void customizeContainerConfiguration( ContainerConfiguration configuration ) -{ -configuration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); -} - -@Test -public void testMNG6275_pluginRealmDefaultParentClassLoader() -{ -Plugin plugin = new Plugin(); -plugin.setVersion( "VERSION" ); - -ClassLoader parent = null; - -ClassRealm pluginRealm = classRealmManager.createPluginRealm( plugin, parent, null, null, null ); -ServiceLoader sef = ServiceLoader.load( ScriptEngineFactory.class, pluginRealm ); -assertTrue( sef.iterator().hasNext() ); -} - -@Test -public void testMNG6275_extensionRealmDefaultParentClassLoader() -{ -Plugin extension = new Plugin(); -
[2/2] maven git commit: [MNG-6216] ArrayIndexOutOfBoundsException when parsing POM o Upgraded to new release of plexus-utils which contains the fix for #22 in plexus-utils.
[MNG-6216] ArrayIndexOutOfBoundsException when parsing POM o Upgraded to new release of plexus-utils which contains the fix for #22 in plexus-utils. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c9a288d8 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c9a288d8 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c9a288d8 Branch: refs/heads/MNG-6216 Commit: c9a288d8b1090fa957d6caccc12f0bf13bb5e267 Parents: 170c1ed Author: Karl Heinz MarbaiseAuthored: Thu Aug 3 20:12:25 2017 +0200 Committer: Stephen Connolly Committed: Thu Aug 31 10:21:35 2017 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/c9a288d8/pom.xml -- diff --git a/pom.xml b/pom.xml index 8ce59ed..761edbf 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ under the License. 1.10.19 1.7.1 1.24 -3.0.24 +3.1.0 20.0 4.0 0.3.3
[2/2] maven git commit: [MNG-6069] Migrate to non deprecated parts of Commons CLI
[MNG-6069] Migrate to non deprecated parts of Commons CLI Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/f8a4e028 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/f8a4e028 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/f8a4e028 Branch: refs/heads/MNG-6069 Commit: f8a4e0288edf57ca864f2e74186c41e93e00d62d Parents: 170c1ed Author: Karl Heinz MarbaiseAuthored: Sat Mar 18 18:18:27 2017 +0100 Committer: Stephen Connolly Committed: Thu Aug 31 10:22:10 2017 +0100 -- .../java/org/apache/maven/cli/CLIManager.java | 118 ++- 1 file changed, 60 insertions(+), 58 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/f8a4e028/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java -- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java index a9038bf..20376d9 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java @@ -24,9 +24,9 @@ import java.io.PrintWriter; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.GnuParser; +import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; @@ -35,43 +35,43 @@ import org.apache.commons.cli.ParseException; */ public class CLIManager { -public static final char ALTERNATE_POM_FILE = 'f'; +public static final String ALTERNATE_POM_FILE = "f"; -public static final char BATCH_MODE = 'B'; +public static final String BATCH_MODE = "B"; -public static final char SET_SYSTEM_PROPERTY = 'D'; +public static final String SET_SYSTEM_PROPERTY = "D"; -public static final char OFFLINE = 'o'; +public static final String OFFLINE = "o"; -public static final char QUIET = 'q'; +public static final String QUIET = "q"; -public static final char DEBUG = 'X'; +public static final String DEBUG = "X"; -public static final char ERRORS = 'e'; +public static final String ERRORS = "e"; -public static final char HELP = 'h'; +public static final String HELP = "h"; -public static final char VERSION = 'v'; +public static final String VERSION = "v"; -public static final char SHOW_VERSION = 'V'; +public static final String SHOW_VERSION = "V"; -public static final char NON_RECURSIVE = 'N'; +public static final String NON_RECURSIVE = "N"; -public static final char UPDATE_SNAPSHOTS = 'U'; +public static final String UPDATE_SNAPSHOTS = "U"; -public static final char ACTIVATE_PROFILES = 'P'; +public static final String ACTIVATE_PROFILES = "P"; public static final String SUPRESS_SNAPSHOT_UPDATES = "nsu"; -public static final char CHECKSUM_FAILURE_POLICY = 'C'; +public static final String CHECKSUM_FAILURE_POLICY = "C"; -public static final char CHECKSUM_WARNING_POLICY = 'c'; +public static final String CHECKSUM_WARNING_POLICY = "c"; -public static final char ALTERNATE_USER_SETTINGS = 's'; +public static final String ALTERNATE_USER_SETTINGS = "s"; public static final String ALTERNATE_GLOBAL_SETTINGS = "gs"; -public static final char ALTERNATE_USER_TOOLCHAINS = 't'; +public static final String ALTERNATE_USER_TOOLCHAINS = "t"; public static final String ALTERNATE_GLOBAL_TOOLCHAINS = "gt"; @@ -103,50 +103,52 @@ public class CLIManager protected Options options; -@SuppressWarnings( { "static-access", "checkstyle:linelength" } ) +// CHECKSTYLE_OFF: LineLength public CLIManager() { options = new Options(); -options.addOption( OptionBuilder.withLongOpt( "help" ).withDescription( "Display help information" ).create( HELP ) ); -options.addOption( OptionBuilder.withLongOpt( "file" ).hasArg().withDescription( "Force the use of an alternate POM file (or directory with pom.xml)" ).create( ALTERNATE_POM_FILE ) ); -options.addOption( OptionBuilder.withLongOpt( "define" ).hasArg().withDescription( "Define a system property" ).create( SET_SYSTEM_PROPERTY ) ); -options.addOption( OptionBuilder.withLongOpt( "offline" ).withDescription( "Work offline" ).create( OFFLINE ) ); -options.addOption( OptionBuilder.withLongOpt( "version" ).withDescription( "Display version information" ).create( VERSION ) ); -
[1/2] maven git commit: Revert "Squashed commit of the following:" [Forced Update!]
Repository: maven Updated Branches: refs/heads/MNG-6069 b9640f320 -> f8a4e0288 (forced update) Revert "Squashed commit of the following:" This reverts commit f047ea143766fd22ae42040e6805bef287f3cc3e. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/170c1ed8 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/170c1ed8 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/170c1ed8 Branch: refs/heads/MNG-6069 Commit: 170c1ed82cbe124da1736da64af20d660dc3162e Parents: e44c39c Author: rfscholteAuthored: Wed Aug 30 11:12:20 2017 +0200 Committer: rfscholte Committed: Wed Aug 30 11:12:20 2017 +0200 -- .../classrealm/DefaultClassRealmManager.java| 2 +- .../DefaultClassRealmManagerTest.java | 101 --- 2 files changed, 1 insertion(+), 102 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/170c1ed8/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java -- diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index d517924..6ce1925 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java @@ -120,7 +120,7 @@ public class DefaultClassRealmManager { try { -ClassRealm classRealm = world.newRealm( realmId, ClassLoader.getSystemClassLoader() ); +ClassRealm classRealm = world.newRealm( realmId, null ); if ( logger.isDebugEnabled() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/170c1ed8/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java -- diff --git a/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java b/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java deleted file mode 100644 index 726199f..000 --- a/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.apache.maven.classrealm; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.util.ServiceLoader; - -import javax.script.ScriptEngineFactory; - -import org.apache.maven.model.Model; -import org.apache.maven.model.Plugin; -import org.codehaus.plexus.ContainerConfiguration; -import org.codehaus.plexus.PlexusConstants; -import org.codehaus.plexus.PlexusTestCase; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.junit.Test; - -public class DefaultClassRealmManagerTest extends PlexusTestCase -{ -private ClassRealmManager classRealmManager; - -@Override -protected void setUp() -throws Exception -{ -super.setUp(); -this.classRealmManager = lookup( ClassRealmManager.class ); -} - -@Override -protected void customizeContainerConfiguration( ContainerConfiguration configuration ) -{ -configuration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); -} - -@Test -public void testMNG6275_pluginRealmDefaultParentClassLoader() -{ -Plugin plugin = new Plugin(); -plugin.setVersion( "VERSION" ); - -ClassLoader parent = null; - -ClassRealm pluginRealm = classRealmManager.createPluginRealm( plugin, parent, null, null, null ); -ServiceLoader sef = ServiceLoader.load( ScriptEngineFactory.class, pluginRealm ); -assertTrue( sef.iterator().hasNext() ); -} - -@Test -public void testMNG6275_extensionRealmDefaultParentClassLoader() -{ -Plugin extension = new Plugin(); -
maven git commit: [MNG-6216] ArrayIndexOutOfBoundsException when parsing POM o Upgraded to new release of plexus-utils which contains the fix for #22 in plexus-utils.
Repository: maven Updated Branches: refs/heads/master 170c1ed82 -> c9a288d8b [MNG-6216] ArrayIndexOutOfBoundsException when parsing POM o Upgraded to new release of plexus-utils which contains the fix for #22 in plexus-utils. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c9a288d8 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c9a288d8 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c9a288d8 Branch: refs/heads/master Commit: c9a288d8b1090fa957d6caccc12f0bf13bb5e267 Parents: 170c1ed Author: Karl Heinz MarbaiseAuthored: Thu Aug 3 20:12:25 2017 +0200 Committer: Stephen Connolly Committed: Thu Aug 31 10:21:35 2017 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/c9a288d8/pom.xml -- diff --git a/pom.xml b/pom.xml index 8ce59ed..761edbf 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ under the License. 1.10.19 1.7.1 1.24 -3.0.24 +3.1.0 20.0 4.0 0.3.3
[maven] Git Push Summary
Repository: maven Updated Branches: refs/heads/MNG-6216 [deleted] c9a288d8b
[2/2] maven git commit: [MNG-6275] Maven Embedder compatible fix
[MNG-6275] Maven Embedder compatible fix - Need to use PARENT_CLASSLOADER so that when used by embedder we get a consistent view of the available classes - Restores test case from f047ea143766fd22ae42040e6805bef287f3cc3e Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/889fe1be Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/889fe1be Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/889fe1be Branch: refs/heads/mng-6275 Commit: 889fe1be93b572560408d5615b65b8147aa48825 Parents: 170c1ed Author: Stephen ConnollyAuthored: Thu Aug 24 11:33:01 2017 +0200 Committer: Stephen Connolly Committed: Thu Aug 31 09:59:50 2017 +0100 -- .../classrealm/DefaultClassRealmManager.java| 2 +- .../DefaultClassRealmManagerTest.java | 101 +++ 2 files changed, 102 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/889fe1be/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java -- diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index 6ce1925..013ab23 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java @@ -120,7 +120,7 @@ public class DefaultClassRealmManager { try { -ClassRealm classRealm = world.newRealm( realmId, null ); +ClassRealm classRealm = world.newRealm( realmId, PARENT_CLASSLOADER ); if ( logger.isDebugEnabled() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/889fe1be/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java -- diff --git a/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java b/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java new file mode 100644 index 000..726199f --- /dev/null +++ b/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java @@ -0,0 +1,101 @@ +package org.apache.maven.classrealm; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.util.ServiceLoader; + +import javax.script.ScriptEngineFactory; + +import org.apache.maven.model.Model; +import org.apache.maven.model.Plugin; +import org.codehaus.plexus.ContainerConfiguration; +import org.codehaus.plexus.PlexusConstants; +import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.classworlds.realm.ClassRealm; +import org.junit.Test; + +public class DefaultClassRealmManagerTest extends PlexusTestCase +{ +private ClassRealmManager classRealmManager; + +@Override +protected void setUp() +throws Exception +{ +super.setUp(); +this.classRealmManager = lookup( ClassRealmManager.class ); +} + +@Override +protected void customizeContainerConfiguration( ContainerConfiguration configuration ) +{ +configuration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); +} + +@Test +public void testMNG6275_pluginRealmDefaultParentClassLoader() +{ +Plugin plugin = new Plugin(); +plugin.setVersion( "VERSION" ); + +ClassLoader parent = null; + +ClassRealm pluginRealm = classRealmManager.createPluginRealm( plugin, parent, null, null, null ); +ServiceLoader sef = ServiceLoader.load( ScriptEngineFactory.class, pluginRealm ); +assertTrue( sef.iterator().hasNext() ); +} + +@Test +public void testMNG6275_extensionRealmDefaultParentClassLoader() +{ +Plugin
[1/2] maven git commit: Revert "Squashed commit of the following:" [Forced Update!]
Repository: maven Updated Branches: refs/heads/mng-6275 4b5c55663 -> 889fe1be9 (forced update) Revert "Squashed commit of the following:" This reverts commit f047ea143766fd22ae42040e6805bef287f3cc3e. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/170c1ed8 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/170c1ed8 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/170c1ed8 Branch: refs/heads/mng-6275 Commit: 170c1ed82cbe124da1736da64af20d660dc3162e Parents: e44c39c Author: rfscholteAuthored: Wed Aug 30 11:12:20 2017 +0200 Committer: rfscholte Committed: Wed Aug 30 11:12:20 2017 +0200 -- .../classrealm/DefaultClassRealmManager.java| 2 +- .../DefaultClassRealmManagerTest.java | 101 --- 2 files changed, 1 insertion(+), 102 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/170c1ed8/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java -- diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index d517924..6ce1925 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java @@ -120,7 +120,7 @@ public class DefaultClassRealmManager { try { -ClassRealm classRealm = world.newRealm( realmId, ClassLoader.getSystemClassLoader() ); +ClassRealm classRealm = world.newRealm( realmId, null ); if ( logger.isDebugEnabled() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/170c1ed8/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java -- diff --git a/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java b/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java deleted file mode 100644 index 726199f..000 --- a/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.apache.maven.classrealm; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.util.ServiceLoader; - -import javax.script.ScriptEngineFactory; - -import org.apache.maven.model.Model; -import org.apache.maven.model.Plugin; -import org.codehaus.plexus.ContainerConfiguration; -import org.codehaus.plexus.PlexusConstants; -import org.codehaus.plexus.PlexusTestCase; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.junit.Test; - -public class DefaultClassRealmManagerTest extends PlexusTestCase -{ -private ClassRealmManager classRealmManager; - -@Override -protected void setUp() -throws Exception -{ -super.setUp(); -this.classRealmManager = lookup( ClassRealmManager.class ); -} - -@Override -protected void customizeContainerConfiguration( ContainerConfiguration configuration ) -{ -configuration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); -} - -@Test -public void testMNG6275_pluginRealmDefaultParentClassLoader() -{ -Plugin plugin = new Plugin(); -plugin.setVersion( "VERSION" ); - -ClassLoader parent = null; - -ClassRealm pluginRealm = classRealmManager.createPluginRealm( plugin, parent, null, null, null ); -ServiceLoader sef = ServiceLoader.load( ScriptEngineFactory.class, pluginRealm ); -assertTrue( sef.iterator().hasNext() ); -} - -@Test -public void testMNG6275_extensionRealmDefaultParentClassLoader() -{ -Plugin extension = new Plugin(); -
maven git commit: [MNG-6275] Capture the context classloader at construction
Repository: maven Updated Branches: refs/heads/mng-6275 39004f6ae -> fef668789 [MNG-6275] Capture the context classloader at construction Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/fef66878 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/fef66878 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/fef66878 Branch: refs/heads/mng-6275 Commit: fef668789f6abe79f603b96a8ee6f13ea52de4df Parents: 39004f6 Author: Stephen ConnollyAuthored: Wed Aug 30 12:33:59 2017 +0100 Committer: Stephen Connolly Committed: Wed Aug 30 12:33:59 2017 +0100 -- .../apache/maven/classrealm/DefaultClassRealmManager.java| 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/fef66878/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java -- diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index 7be615c..eaf1b53 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java @@ -84,6 +84,8 @@ public class DefaultClassRealmManager private final ClassRealm mavenApiRealm; +private final ClassLoader contextClassLoader; + /** * Patterns of artifacts provided by maven core and exported via maven api realm. These artifacts are filtered from * plugin and build extensions realms to avoid presence of duplicate and possibly conflicting classes on classpath. @@ -94,6 +96,8 @@ public class DefaultClassRealmManager public DefaultClassRealmManager( Logger logger, PlexusContainer container, List delegates, CoreExportsProvider exports ) { +ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); +this.contextClassLoader = contextClassLoader == null ? ClassLoader.getSystemClassLoader() : contextClassLoader; this.logger = logger; this.world = ( (MutablePlexusContainer) container ).getClassWorld(); this.containerRealm = container.getContainerRealm(); @@ -120,9 +124,7 @@ public class DefaultClassRealmManager { try { -ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); -ClassRealm classRealm = world.newRealm( realmId, contextClassLoader == null -? ClassLoader.getSystemClassLoader() : contextClassLoader ); +ClassRealm classRealm = world.newRealm( realmId, contextClassLoader ); if ( logger.isDebugEnabled() ) {
maven git commit: [MNG-6275] Simpler fix (fingers crossed)
Repository: maven Updated Branches: refs/heads/mng-6275 fef668789 -> 4b5c55663 [MNG-6275] Simpler fix (fingers crossed) Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4b5c5566 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4b5c5566 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4b5c5566 Branch: refs/heads/mng-6275 Commit: 4b5c55663e11e9fbdd028e0aee06b22e3291c0e1 Parents: fef6687 Author: Stephen ConnollyAuthored: Wed Aug 30 16:16:24 2017 +0100 Committer: Stephen Connolly Committed: Wed Aug 30 16:16:24 2017 +0100 -- .../org/apache/maven/classrealm/DefaultClassRealmManager.java | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/4b5c5566/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java -- diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index eaf1b53..013ab23 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java @@ -84,8 +84,6 @@ public class DefaultClassRealmManager private final ClassRealm mavenApiRealm; -private final ClassLoader contextClassLoader; - /** * Patterns of artifacts provided by maven core and exported via maven api realm. These artifacts are filtered from * plugin and build extensions realms to avoid presence of duplicate and possibly conflicting classes on classpath. @@ -96,8 +94,6 @@ public class DefaultClassRealmManager public DefaultClassRealmManager( Logger logger, PlexusContainer container, List delegates, CoreExportsProvider exports ) { -ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); -this.contextClassLoader = contextClassLoader == null ? ClassLoader.getSystemClassLoader() : contextClassLoader; this.logger = logger; this.world = ( (MutablePlexusContainer) container ).getClassWorld(); this.containerRealm = container.getContainerRealm(); @@ -124,7 +120,7 @@ public class DefaultClassRealmManager { try { -ClassRealm classRealm = world.newRealm( realmId, contextClassLoader ); +ClassRealm classRealm = world.newRealm( realmId, PARENT_CLASSLOADER ); if ( logger.isDebugEnabled() ) {
[2/2] maven git commit: [MNG-6216] ArrayIndexOutOfBoundsException when parsing POM o Upgraded to new release of plexus-utils which contains the fix for #22 in plexus-utils.
[MNG-6216] ArrayIndexOutOfBoundsException when parsing POM o Upgraded to new release of plexus-utils which contains the fix for #22 in plexus-utils. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0f3989dd Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0f3989dd Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0f3989dd Branch: refs/heads/MNG-6216 Commit: 0f3989dd7005f37d167de8ea235520ee89b4bfb2 Parents: e44c39c Author: Karl Heinz MarbaiseAuthored: Thu Aug 3 20:12:25 2017 +0200 Committer: Stephen Connolly Committed: Tue Aug 29 21:55:37 2017 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/0f3989dd/pom.xml -- diff --git a/pom.xml b/pom.xml index 8ce59ed..761edbf 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ under the License. 1.10.19 1.7.1 1.24 -3.0.24 +3.1.0 20.0 4.0 0.3.3
[1/2] maven git commit: Update Jenkinsfile to use JENKINS-43507 syntax for resolveScm [Forced Update!]
Repository: maven Updated Branches: refs/heads/MNG-6216 99244b097 -> 0f3989dd7 (forced update) Update Jenkinsfile to use JENKINS-43507 syntax for resolveScm Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e44c39c2 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e44c39c2 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e44c39c2 Branch: refs/heads/MNG-6216 Commit: e44c39c2eb5afda9efe60b9dd0ffc32c62501c5f Parents: f047ea1 Author: Stephen ConnollyAuthored: Tue Aug 29 21:47:50 2017 +0100 Committer: Stephen Connolly Committed: Tue Aug 29 21:47:50 2017 +0100 -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/e44c39c2/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index b6c7e19..004abcb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,7 +49,7 @@ node('ubuntu') { junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml' } -tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', excludes: '', gitTool: 'Default', id: '_', ignoreOnPushNotifications: false, includes: '*', remote: 'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git'], targets: [BRANCH_NAME, 'master'] +tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', id: '_', remote: 'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git', traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master'] } }
[1/2] maven git commit: Update Jenkinsfile to use JENKINS-43507 syntax for resolveScm [Forced Update!]
Repository: maven Updated Branches: refs/heads/MNG-6069 d349ddd32 -> b9640f320 (forced update) Update Jenkinsfile to use JENKINS-43507 syntax for resolveScm Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/e44c39c2 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/e44c39c2 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/e44c39c2 Branch: refs/heads/MNG-6069 Commit: e44c39c2eb5afda9efe60b9dd0ffc32c62501c5f Parents: f047ea1 Author: Stephen ConnollyAuthored: Tue Aug 29 21:47:50 2017 +0100 Committer: Stephen Connolly Committed: Tue Aug 29 21:47:50 2017 +0100 -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/e44c39c2/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index b6c7e19..004abcb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,7 +49,7 @@ node('ubuntu') { junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml' } -tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', excludes: '', gitTool: 'Default', id: '_', ignoreOnPushNotifications: false, includes: '*', remote: 'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git'], targets: [BRANCH_NAME, 'master'] +tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', id: '_', remote: 'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git', traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master'] } }
[2/2] maven git commit: [MNG-6069] Migrate to non deprecated parts of Commons CLI
[MNG-6069] Migrate to non deprecated parts of Commons CLI Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b9640f32 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b9640f32 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b9640f32 Branch: refs/heads/MNG-6069 Commit: b9640f320657663198b1aacada143dc5d12218bc Parents: e44c39c Author: Karl Heinz MarbaiseAuthored: Sat Mar 18 18:18:27 2017 +0100 Committer: Stephen Connolly Committed: Tue Aug 29 21:57:49 2017 +0100 -- .../java/org/apache/maven/cli/CLIManager.java | 118 ++- 1 file changed, 60 insertions(+), 58 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/b9640f32/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java -- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java index a9038bf..20376d9 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java @@ -24,9 +24,9 @@ import java.io.PrintWriter; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.GnuParser; +import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; @@ -35,43 +35,43 @@ import org.apache.commons.cli.ParseException; */ public class CLIManager { -public static final char ALTERNATE_POM_FILE = 'f'; +public static final String ALTERNATE_POM_FILE = "f"; -public static final char BATCH_MODE = 'B'; +public static final String BATCH_MODE = "B"; -public static final char SET_SYSTEM_PROPERTY = 'D'; +public static final String SET_SYSTEM_PROPERTY = "D"; -public static final char OFFLINE = 'o'; +public static final String OFFLINE = "o"; -public static final char QUIET = 'q'; +public static final String QUIET = "q"; -public static final char DEBUG = 'X'; +public static final String DEBUG = "X"; -public static final char ERRORS = 'e'; +public static final String ERRORS = "e"; -public static final char HELP = 'h'; +public static final String HELP = "h"; -public static final char VERSION = 'v'; +public static final String VERSION = "v"; -public static final char SHOW_VERSION = 'V'; +public static final String SHOW_VERSION = "V"; -public static final char NON_RECURSIVE = 'N'; +public static final String NON_RECURSIVE = "N"; -public static final char UPDATE_SNAPSHOTS = 'U'; +public static final String UPDATE_SNAPSHOTS = "U"; -public static final char ACTIVATE_PROFILES = 'P'; +public static final String ACTIVATE_PROFILES = "P"; public static final String SUPRESS_SNAPSHOT_UPDATES = "nsu"; -public static final char CHECKSUM_FAILURE_POLICY = 'C'; +public static final String CHECKSUM_FAILURE_POLICY = "C"; -public static final char CHECKSUM_WARNING_POLICY = 'c'; +public static final String CHECKSUM_WARNING_POLICY = "c"; -public static final char ALTERNATE_USER_SETTINGS = 's'; +public static final String ALTERNATE_USER_SETTINGS = "s"; public static final String ALTERNATE_GLOBAL_SETTINGS = "gs"; -public static final char ALTERNATE_USER_TOOLCHAINS = 't'; +public static final String ALTERNATE_USER_TOOLCHAINS = "t"; public static final String ALTERNATE_GLOBAL_TOOLCHAINS = "gt"; @@ -103,50 +103,52 @@ public class CLIManager protected Options options; -@SuppressWarnings( { "static-access", "checkstyle:linelength" } ) +// CHECKSTYLE_OFF: LineLength public CLIManager() { options = new Options(); -options.addOption( OptionBuilder.withLongOpt( "help" ).withDescription( "Display help information" ).create( HELP ) ); -options.addOption( OptionBuilder.withLongOpt( "file" ).hasArg().withDescription( "Force the use of an alternate POM file (or directory with pom.xml)" ).create( ALTERNATE_POM_FILE ) ); -options.addOption( OptionBuilder.withLongOpt( "define" ).hasArg().withDescription( "Define a system property" ).create( SET_SYSTEM_PROPERTY ) ); -options.addOption( OptionBuilder.withLongOpt( "offline" ).withDescription( "Work offline" ).create( OFFLINE ) ); -options.addOption( OptionBuilder.withLongOpt( "version" ).withDescription( "Display version information" ).create( VERSION ) ); -
maven git commit: Update Jenkinsfile to use JENKINS-43507 syntax for resolveScm
Repository: maven Updated Branches: refs/heads/bisect-2 [created] ee85cfa75 Update Jenkinsfile to use JENKINS-43507 syntax for resolveScm Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/ee85cfa7 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/ee85cfa7 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/ee85cfa7 Branch: refs/heads/bisect-2 Commit: ee85cfa75998478fbef6f82a4bf801cf8fe219e3 Parents: f1ed659 Author: Stephen ConnollyAuthored: Tue Aug 29 21:47:50 2017 +0100 Committer: Stephen Connolly Committed: Tue Aug 29 22:11:45 2017 +0100 -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/ee85cfa7/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index b6c7e19..004abcb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,7 +49,7 @@ node('ubuntu') { junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml' } -tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', excludes: '', gitTool: 'Default', id: '_', ignoreOnPushNotifications: false, includes: '*', remote: 'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git'], targets: [BRANCH_NAME, 'master'] +tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', id: '_', remote: 'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git', traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master'] } }
maven git commit: Update Jenkinsfile to use JENKINS-43507 syntax for resolveScm
Repository: maven Updated Branches: refs/heads/bisect-1 [created] aa0270d42 Update Jenkinsfile to use JENKINS-43507 syntax for resolveScm Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/aa0270d4 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/aa0270d4 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/aa0270d4 Branch: refs/heads/bisect-1 Commit: aa0270d4242a4187bafc85a6d1b7db479c751adb Parents: 842db37 Author: Stephen ConnollyAuthored: Tue Aug 29 21:47:50 2017 +0100 Committer: Stephen Connolly Committed: Tue Aug 29 22:11:21 2017 +0100 -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/aa0270d4/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index b6c7e19..004abcb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,7 +49,7 @@ node('ubuntu') { junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml' } -tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', excludes: '', gitTool: 'Default', id: '_', ignoreOnPushNotifications: false, includes: '*', remote: 'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git'], targets: [BRANCH_NAME, 'master'] +tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', id: '_', remote: 'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git', traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master'] } }
maven git commit: Update Jenkinsfile to use JENKINS-43507 syntax for resolveScm
Repository: maven Updated Branches: refs/heads/bisect-3 [created] 082722338 Update Jenkinsfile to use JENKINS-43507 syntax for resolveScm Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/08272233 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/08272233 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/08272233 Branch: refs/heads/bisect-3 Commit: 082722338c3405aa47e7a1578579bc9905ecf5a6 Parents: 785bad6 Author: Stephen ConnollyAuthored: Tue Aug 29 21:47:50 2017 +0100 Committer: Stephen Connolly Committed: Tue Aug 29 22:12:09 2017 +0100 -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/08272233/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index b6c7e19..004abcb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,7 +49,7 @@ node('ubuntu') { junit allowEmptyResults: true, testResults:'**/target/*-reports/*.xml' } -tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', excludes: '', gitTool: 'Default', id: '_', ignoreOnPushNotifications: false, includes: '*', remote: 'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git'], targets: [BRANCH_NAME, 'master'] +tests = resolveScm source: [$class: 'GitSCMSource', credentialsId: '', id: '_', remote: 'https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git', traits: [[$class: 'jenkins.plugins.git.traits.BranchDiscoveryTrait'], [$class: 'GitToolSCMSourceTrait', gitTool: 'Default']]], targets: [BRANCH_NAME, 'master'] } }
maven git commit: Add the serverId to scm-publish so that we do not need to rely on cached svn credentials
Repository: maven Updated Branches: refs/heads/master 3d0efa369 -> 69c512a82 Add the serverId to scm-publish so that we do not need to rely on cached svn credentials Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/69c512a8 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/69c512a8 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/69c512a8 Branch: refs/heads/master Commit: 69c512a8203030f3fee657673b0416bc2a121eae Parents: 3d0efa3 Author: Stephen ConnollyAuthored: Wed Oct 18 09:54:02 2017 +0100 Committer: Stephen Connolly Committed: Wed Oct 18 09:54:02 2017 +0100 -- pom.xml | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven/blob/69c512a8/pom.xml -- diff --git a/pom.xml b/pom.xml index 6649634..a572e4b 100644 --- a/pom.xml +++ b/pom.xml @@ -508,6 +508,9 @@ under the License. org.apache.maven.plugins maven-scm-publish-plugin 1.1 + +apache.releases.https + org.apache.rat
maven git commit: [maven-release-plugin] prepare for next development iteration
Repository: maven Updated Branches: refs/heads/master 138edd61f -> 3d0efa369 [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3d0efa36 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3d0efa36 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3d0efa36 Branch: refs/heads/master Commit: 3d0efa36963c217527230228a11ab44050ca1b10 Parents: 138edd6 Author: Stephen ConnollyAuthored: Wed Oct 18 08:55:05 2017 +0100 Committer: Stephen Connolly Committed: Wed Oct 18 08:55:05 2017 +0100 -- apache-maven/pom.xml | 2 +- maven-artifact/pom.xml| 2 +- maven-builder-support/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml| 2 +- maven-embedder/pom.xml| 2 +- maven-model-builder/pom.xml | 2 +- maven-model/pom.xml | 2 +- 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 | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/3d0efa36/apache-maven/pom.xml -- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index ba28fa2..6802a99 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.2 +3.5.3-SNAPSHOT apache-maven http://git-wip-us.apache.org/repos/asf/maven/blob/3d0efa36/maven-artifact/pom.xml -- diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index 3772dd9..8a9c404 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.2 +3.5.3-SNAPSHOT maven-artifact http://git-wip-us.apache.org/repos/asf/maven/blob/3d0efa36/maven-builder-support/pom.xml -- diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml index 0b6328e..a09816d 100644 --- a/maven-builder-support/pom.xml +++ b/maven-builder-support/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.2 +3.5.3-SNAPSHOT maven-builder-support http://git-wip-us.apache.org/repos/asf/maven/blob/3d0efa36/maven-compat/pom.xml -- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 1935ebf..7ec94e2 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.2 +3.5.3-SNAPSHOT maven-compat http://git-wip-us.apache.org/repos/asf/maven/blob/3d0efa36/maven-core/pom.xml -- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 8ab5bcc..7c2cde1 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.2 +3.5.3-SNAPSHOT maven-core http://git-wip-us.apache.org/repos/asf/maven/blob/3d0efa36/maven-embedder/pom.xml -- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 6dd1641..d6576f9 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.2 +3.5.3-SNAPSHOT maven-embedder http://git-wip-us.apache.org/repos/asf/maven/blob/3d0efa36/maven-model-builder/pom.xml -- diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index f6ebe27..b2ef0e7 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.2 +3.5.3-SNAPSHOT maven-model-builder http://git-wip-us.apache.org/repos/asf/maven/blob/3d0efa36/maven-model/pom.xml -- diff --git a/maven-model/pom.xml b/maven-model/pom.xml index 6897154..594c3ec 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.2 +3.5.3-SNAPSHOT maven-model
[maven] Git Push Summary
Repository: maven Updated Tags: refs/tags/maven-3.5.2 [created] 9b07dd65d
maven git commit: [maven-release-plugin] prepare release maven-3.5.2
Repository: maven Updated Branches: refs/heads/master 4b95ad9fc -> 138edd61f [maven-release-plugin] prepare release maven-3.5.2 Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/138edd61 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/138edd61 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/138edd61 Branch: refs/heads/master Commit: 138edd61fd100ec658bfa2d307c43b76940a5d7d Parents: 4b95ad9 Author: Stephen ConnollyAuthored: Wed Oct 18 08:54:47 2017 +0100 Committer: Stephen Connolly Committed: Wed Oct 18 08:54:47 2017 +0100 -- apache-maven/pom.xml | 2 +- maven-artifact/pom.xml| 2 +- maven-builder-support/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml| 2 +- maven-embedder/pom.xml| 2 +- maven-model-builder/pom.xml | 2 +- maven-model/pom.xml | 2 +- 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 | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/138edd61/apache-maven/pom.xml -- diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml index 4d9b78c..ba28fa2 100644 --- a/apache-maven/pom.xml +++ b/apache-maven/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.2-SNAPSHOT +3.5.2 apache-maven http://git-wip-us.apache.org/repos/asf/maven/blob/138edd61/maven-artifact/pom.xml -- diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index 8c99f33..3772dd9 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.2-SNAPSHOT +3.5.2 maven-artifact http://git-wip-us.apache.org/repos/asf/maven/blob/138edd61/maven-builder-support/pom.xml -- diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml index 308f55d..0b6328e 100644 --- a/maven-builder-support/pom.xml +++ b/maven-builder-support/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.2-SNAPSHOT +3.5.2 maven-builder-support http://git-wip-us.apache.org/repos/asf/maven/blob/138edd61/maven-compat/pom.xml -- diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml index 1b1cd3c..1935ebf 100644 --- a/maven-compat/pom.xml +++ b/maven-compat/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.2-SNAPSHOT +3.5.2 maven-compat http://git-wip-us.apache.org/repos/asf/maven/blob/138edd61/maven-core/pom.xml -- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index a9028c4..8ab5bcc 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.2-SNAPSHOT +3.5.2 maven-core http://git-wip-us.apache.org/repos/asf/maven/blob/138edd61/maven-embedder/pom.xml -- diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index c252426..6dd1641 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.2-SNAPSHOT +3.5.2 maven-embedder http://git-wip-us.apache.org/repos/asf/maven/blob/138edd61/maven-model-builder/pom.xml -- diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index e86193c..f6ebe27 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.2-SNAPSHOT +3.5.2 maven-model-builder http://git-wip-us.apache.org/repos/asf/maven/blob/138edd61/maven-model/pom.xml -- diff --git a/maven-model/pom.xml b/maven-model/pom.xml index da104fd..6897154 100644 --- a/maven-model/pom.xml +++ b/maven-model/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.maven maven -3.5.2-SNAPSHOT +3.5.2 maven-model
[1/2] maven git commit: Revert "[MNG-6275] Maven Embedder compatible fix"
Repository: maven Updated Branches: refs/heads/master c19e9dcac -> 4b95ad9fc Revert "[MNG-6275] Maven Embedder compatible fix" This reverts commit 27a2bda3f4a8f5385c4cab360ed7365d3d3d3c09. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/cae779e4 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/cae779e4 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/cae779e4 Branch: refs/heads/master Commit: cae779e4fbc6565a581f2c6adf9fb15348005603 Parents: c19e9dc Author: Stephen ConnollyAuthored: Tue Oct 17 19:17:17 2017 +0100 Committer: Stephen Connolly Committed: Tue Oct 17 19:17:17 2017 +0100 -- .../classrealm/DefaultClassRealmManager.java| 2 +- .../DefaultClassRealmManagerTest.java | 107 --- 2 files changed, 1 insertion(+), 108 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/cae779e4/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java -- diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java index 013ab23..6ce1925 100644 --- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java +++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java @@ -120,7 +120,7 @@ public class DefaultClassRealmManager { try { -ClassRealm classRealm = world.newRealm( realmId, PARENT_CLASSLOADER ); +ClassRealm classRealm = world.newRealm( realmId, null ); if ( logger.isDebugEnabled() ) { http://git-wip-us.apache.org/repos/asf/maven/blob/cae779e4/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java -- diff --git a/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java b/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java deleted file mode 100644 index 6d074b9..000 --- a/maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.apache.maven.classrealm; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import java.util.ServiceLoader; - -import javax.script.ScriptEngineFactory; - -import org.apache.maven.model.Model; -import org.apache.maven.model.Plugin; -import org.codehaus.plexus.ContainerConfiguration; -import org.codehaus.plexus.PlexusConstants; -import org.codehaus.plexus.PlexusTestCase; -import org.codehaus.plexus.classworlds.realm.ClassRealm; -import org.junit.Test; - -public class DefaultClassRealmManagerTest extends PlexusTestCase -{ -private ClassRealmManager classRealmManager; -private boolean haveScriptEngineFactory; - -@Override -protected void setUp() -throws Exception -{ -super.setUp(); -this.classRealmManager = lookup( ClassRealmManager.class ); -ClassLoader testRealm = getClass().getClassLoader(); -ServiceLoader sef = ServiceLoader.load( ScriptEngineFactory.class, testRealm ); -// TODO switch to Assume.assumeTrue( sef.iterator().hasNext() ) when PlexusTestCase -// supports assumptions. Not every Java 7 JRE has a ScriptEngineFactory. -this.haveScriptEngineFactory = sef.iterator().hasNext(); -} - -@Override -protected void customizeContainerConfiguration( ContainerConfiguration configuration ) -{ -configuration.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); -} - -@Test -public void testMNG6275_pluginRealmDefaultParentClassLoader() -{ -Plugin plugin = new Plugin(); -plugin.setVersion( "VERSION" ); -
[2/2] maven git commit: Revert "MNG-6209 better executeMojo thread context classloader"
Revert "MNG-6209 better executeMojo thread context classloader" This reverts commit ec629f7d511eb910b4e80112a9fbe85ed8786f10. Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4b95ad9f Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4b95ad9f Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4b95ad9f Branch: refs/heads/master Commit: 4b95ad9fce6dfe7eec2be88f5837e96c7fbd7292 Parents: cae779e Author: Stephen ConnollyAuthored: Tue Oct 17 19:18:43 2017 +0100 Committer: Stephen Connolly Committed: Tue Oct 17 19:18:43 2017 +0100 -- .../java/org/apache/maven/plugin/DefaultBuildPluginManager.java | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/4b95ad9f/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java -- diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java index 3af1125..b4f7a4d 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java @@ -106,11 +106,8 @@ public class DefaultBuildPluginManager throw new PluginExecutionException( mojoExecution, project, e ); } -// use project realm as thread context classloader to enable components from all extensions=true plugins -ClassRealm tccl = mojoExecution.getPlugin().isExtensions() ? project.getClassRealm() : pluginRealm; - ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader(); -Thread.currentThread().setContextClassLoader( tccl ); +Thread.currentThread().setContextClassLoader( pluginRealm ); MavenSession oldSession = legacySupport.getSession();
maven-integration-testing git commit: Add the serverId to scm-publish so that we do not need to rely on cached svn credentials
Repository: maven-integration-testing Updated Branches: refs/heads/master 04cfa95e8 -> d30156c15 Add the serverId to scm-publish so that we do not need to rely on cached svn credentials Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/d30156c1 Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/d30156c1 Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/d30156c1 Branch: refs/heads/master Commit: d30156c15c8542af2995e9f903a1babef4dcc369 Parents: 04cfa95 Author: Stephen ConnollyAuthored: Wed Oct 18 12:51:21 2017 +0100 Committer: Stephen Connolly Committed: Wed Oct 18 12:51:21 2017 +0100 -- pom.xml | 8 1 file changed, 8 insertions(+) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/d30156c1/pom.xml -- diff --git a/pom.xml b/pom.xml index 562fc29..f47a218 100644 --- a/pom.xml +++ b/pom.xml @@ -129,6 +129,14 @@ under the License. + + org.apache.maven.plugins + maven-scm-publish-plugin + 1.1 + +apache.releases.https + +
maven-integration-testing git commit: Revert "MNG-6209 better executeMojo thread context classloader"
Repository: maven-integration-testing Updated Branches: refs/heads/master a08d65bfb -> 04cfa95e8 Revert "MNG-6209 better executeMojo thread context classloader" This reverts commit 4a0ba2b0bdf1cbe92c9f66eb334ffc31de77f4bb. Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/04cfa95e Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/04cfa95e Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/04cfa95e Branch: refs/heads/master Commit: 04cfa95e80714d0e6dad5985e9bb3fc8442a1fe6 Parents: a08d65b Author: Stephen ConnollyAuthored: Tue Oct 17 21:00:59 2017 +0100 Committer: Stephen Connolly Committed: Tue Oct 17 21:00:59 2017 +0100 -- .../apache/maven/it/IntegrationTestSuite.java | 1 - .../MavenITmng6209MultipleBuildExtensions.java | 65 --- .../plugin-a/pom.xml| 75 - .../plugina/BuildExtensionAComponent.java | 88 .../extensions/plugina/BuildExtensionAMojo.java | 36 .../plugin-b/pom.xml| 75 - .../extensions/pluginb/BuildExtensionBMojo.java | 36 .../project/pom.xml | 64 -- 8 files changed, 440 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/04cfa95e/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index 7d55871..f7a06ff 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -700,7 +700,6 @@ public class IntegrationTestSuite suite.addTestSuite( MavenIT0010DependencyClosureResolutionTest.class ); suite.addTestSuite( MavenIT0009GoalConfigurationTest.class ); suite.addTestSuite( MavenIT0008SimplePluginTest.class ); -suite.addTestSuite( MavenITmng6209MultipleBuildExtensions.class ); suite.addTestSuite( MavenITmng6210CoreExtensionsCustomScopesTest.class ); /* http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/04cfa95e/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6209MultipleBuildExtensions.java -- diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6209MultipleBuildExtensions.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6209MultipleBuildExtensions.java deleted file mode 100644 index 08f6313..000 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6209MultipleBuildExtensions.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.apache.maven.it; - -/* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. You may obtain a - * copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ - -import java.io.File; - -import org.apache.maven.it.util.ResourceExtractor; -import org.apache.maven.shared.utils.io.FileUtils; - -public class MavenITmng6209MultipleBuildExtensions extends AbstractMavenIntegrationTestCase { - - public MavenITmng6209MultipleBuildExtensions() { -super("(3.5.0,)"); - } - - public void testBuildExtensionClassloader() throws Exception { -File testDir = -ResourceExtractor.simpleExtractResources(getClass(), "/mng-6209-multiple-build-extensions"); -File pluginADir = new File(testDir, "plugin-a"); -File pluginBDir = new File(testDir, "plugin-b"); -File projectDir = new File(testDir, "project"); - -Verifier verifier; - -// install the test plugins -verifier = newVerifier(pluginADir.getAbsolutePath(), "remote"); -verifier.executeGoal("install"); -verifier.resetStreams(); -verifier.verifyErrorFreeLog(); -// -verifier =
[maven-jenkins-env] branch master updated: Let's see if this works
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git The following commit(s) were added to refs/heads/master by this push: new 1da40a4 Let's see if this works 1da40a4 is described below commit 1da40a476141139e51f1ed8a40cc1e36db090111 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Tue Nov 28 19:25:36 2017 + Let's see if this works --- vars/jenkinsNotify.groovy | 37 + 1 file changed, 37 insertions(+) diff --git a/vars/jenkinsNotify.groovy b/vars/jenkinsNotify.groovy index 633faeb..ffa6285 100644 --- a/vars/jenkinsNotify.groovy +++ b/vars/jenkinsNotify.groovy @@ -1,3 +1,40 @@ #!/usr/bin/env groovy def call(Map params = [:]) { +def providers +def messageBody +def messageSubject +switch(currentBuild.currentResult) { +case "SUCCESS": +providers = [] +messageSubject = "Build succeeded in Jenkins: ${currentBuild.fullDisplayName}" +messageBody = """See ${currentBuild.absoluteUrl}""" +break +case "UNSTABLE": +providers = [[$class: 'CulpritsRecipientProvider']] +messageSubject = "Build unstable in Jenkins: ${currentBuild.fullDisplayName}" +messageBody = """See ${currentBuild.absoluteUrl}""" +break +case "FAILURE": +providers = [[$class: 'CulpritsRecipientProvider']] +messageSubject = "Build failed in Jenkins: ${currentBuild.fullDisplayName}" +messageBody = """See ${currentBuild.absoluteUrl}""" +break +case "ABORTED": +providers = [[$class: 'CulpritsRecipientProvider']] +messageSubject = "Build aborted in Jenkins: ${currentBuild.fullDisplayName}" +messageBody = """See ${currentBuild.absoluteUrl}""" +break +default: +// should never happen if we are actually being invoked. +return +} +if (changeSets.empty) { +messageBody = messageBody+"\n\nNo changes.\n"; +} else { +messageBody = messageBody + "\n\nChanges:\n"; +for (def change in currentBuild.changeSets) { +messageBody = messageBody + "\n* ${change.msg}" +} +} +emailext body: messageBody, recipientProviders: providers, replyTo: 'd...@maven.apache.org', subject: messageSubject, to: 'notificati...@maven.apache.org' } \ No newline at end of file -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-lib] branch master updated: Add notify step
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-lib.git The following commit(s) were added to refs/heads/master by this push: new 8fe1922 Add notify step 8fe1922 is described below commit 8fe1922cee352da1511d15c047019737c9e3f3df Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Tue Nov 28 18:57:48 2017 + Add notify step --- vars/asfMavenTlpStdBuild.groovy | 15 ++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/vars/asfMavenTlpStdBuild.groovy b/vars/asfMavenTlpStdBuild.groovy index 94036fc..69489bd 100644 --- a/vars/asfMavenTlpStdBuild.groovy +++ b/vars/asfMavenTlpStdBuild.groovy @@ -39,5 +39,18 @@ def call(Map params = [:]) { first = false } } - return parallel(tasks) + def buildRetention + if (env.BRANCH_NAME == 'master') { +buildRetention = buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '3', daysToKeepStr: '21', numToKeepStr: '25')) + } else { +buildRetention = buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '1', daysToKeepStr: '7', numToKeepStr: '5')) + } + properties([buildRetention]) + try { +parallel(tasks) +jenkinsNotify() + } catch (exc) { +jenkinsNotify() +throw exc + } } \ No newline at end of file -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-env] branch master updated: Add notify step
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git The following commit(s) were added to refs/heads/master by this push: new 3b8a3f4 Add notify step 3b8a3f4 is described below commit 3b8a3f452b59e0afa6271ff469cd0ca29b5a9c69 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Tue Nov 28 18:58:41 2017 + Add notify step --- vars/jenkinsNotify.groovy | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/jenkinsNotify.groovy b/vars/jenkinsNotify.groovy new file mode 100644 index 000..633faeb --- /dev/null +++ b/vars/jenkinsNotify.groovy @@ -0,0 +1,3 @@ +#!/usr/bin/env groovy +def call(Map params = [:]) { +} \ No newline at end of file -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-env] branch master updated: typo
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git The following commit(s) were added to refs/heads/master by this push: new 0150810 typo 0150810 is described below commit 015081070091bfe85182af98c3ea4d060b912328 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Tue Nov 28 19:28:34 2017 + typo --- vars/jenkinsNotify.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/jenkinsNotify.groovy b/vars/jenkinsNotify.groovy index ffa6285..dcb5475 100644 --- a/vars/jenkinsNotify.groovy +++ b/vars/jenkinsNotify.groovy @@ -28,7 +28,7 @@ def call(Map params = [:]) { // should never happen if we are actually being invoked. return } -if (changeSets.empty) { +if (currentBuild.changeSets.empty) { messageBody = messageBody+"\n\nNo changes.\n"; } else { messageBody = messageBody + "\n\nChanges:\n"; -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-env] branch master updated: Add another layer of unwrapping
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git The following commit(s) were added to refs/heads/master by this push: new 548ea64 Add another layer of unwrapping 548ea64 is described below commit 548ea646014c38278658ed71376884321a6cc505 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Tue Nov 28 19:31:30 2017 + Add another layer of unwrapping --- vars/jenkinsNotify.groovy | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vars/jenkinsNotify.groovy b/vars/jenkinsNotify.groovy index dcb5475..a8efeed 100644 --- a/vars/jenkinsNotify.groovy +++ b/vars/jenkinsNotify.groovy @@ -32,8 +32,10 @@ def call(Map params = [:]) { messageBody = messageBody+"\n\nNo changes.\n"; } else { messageBody = messageBody + "\n\nChanges:\n"; -for (def change in currentBuild.changeSets) { -messageBody = messageBody + "\n* ${change.msg}" +for (def changeSet in currentBuild.changeSets) { +for (def change in changeSet) { +messageBody = messageBody + "\n* ${change.msg}" +} } } emailext body: messageBody, recipientProviders: providers, replyTo: 'd...@maven.apache.org', subject: messageSubject, to: 'notificati...@maven.apache.org' -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-lib] branch master updated: debugging
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-lib.git The following commit(s) were added to refs/heads/master by this push: new 34ccfc6 debugging 34ccfc6 is described below commit 34ccfc68d5ff5be6ef2a75cf92d341f57768bd16 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Sun Nov 26 22:50:01 2017 + debugging --- vars/asfMavenTlpStdBuild.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/asfMavenTlpStdBuild.groovy b/vars/asfMavenTlpStdBuild.groovy index 80c2db6..9ff61bb 100644 --- a/vars/asfMavenTlpStdBuild.groovy +++ b/vars/asfMavenTlpStdBuild.groovy @@ -10,6 +10,7 @@ def call(Map params = [:]) { String label = jenkinsEnv.labelForOS(os); String jdkName = jenkinsEnv.jdkFromVersion(os, "${jdk}") String mvnName = jenkinsEnv.mvnFromVersion(os, "${maven}") + echo "OS: ${os} JDK: ${jdk} Maven: ${maven} => Label: ${label} JDK: ${jdkName} Maven: ${mvnName}" if (label == null || jdkName == null || mvnName == null) { continue; } -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-lib] branch master updated: Add Java 9
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-lib.git The following commit(s) were added to refs/heads/master by this push: new 515f6a2 Add Java 9 515f6a2 is described below commit 515f6a2e79df7b227734701904618dd3ff46785a Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Sun Nov 26 22:55:45 2017 + Add Java 9 --- vars/asfMavenTlpStdBuild.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vars/asfMavenTlpStdBuild.groovy b/vars/asfMavenTlpStdBuild.groovy index 9ff61bb..8a2bce8 100644 --- a/vars/asfMavenTlpStdBuild.groovy +++ b/vars/asfMavenTlpStdBuild.groovy @@ -1,6 +1,6 @@ def call(Map params = [:]) { def oses = params.containsKey('os') ? params.os : ['linux', 'windows'] - def jdks = params.containsKey('jdks') ? params.jdks : ['7','8'] + def jdks = params.containsKey('jdks') ? params.jdks : ['7','8','9'] def maven = params.containsKey('maven') ? params.maven : '3.x.x' def failFast = params.containsKey('failFast') ? params.failFast : true Map tasks = [failFast: failFast] @@ -12,6 +12,7 @@ def call(Map params = [:]) { String mvnName = jenkinsEnv.mvnFromVersion(os, "${maven}") echo "OS: ${os} JDK: ${jdk} Maven: ${maven} => Label: ${label} JDK: ${jdkName} Maven: ${mvnName}" if (label == null || jdkName == null || mvnName == null) { +echo "Skipping ${os}-jdk${jdk} as unsupported by Jenkins Environment" continue; } String stageId = "${os}-jdk${jdk}" -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-env] branch master updated: Groovy doesn't like to fall-through
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git The following commit(s) were added to refs/heads/master by this push: new baaa52a Groovy doesn't like to fall-through baaa52a is described below commit baaa52ab586a99355f957addb2eb81f29a3a1460 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Sun Nov 26 23:01:04 2017 + Groovy doesn't like to fall-through --- vars/jenkinsEnv.groovy | 12 1 file changed, 12 insertions(+) diff --git a/vars/jenkinsEnv.groovy b/vars/jenkinsEnv.groovy index 8be79e3..3e8636b 100644 --- a/vars/jenkinsEnv.groovy +++ b/vars/jenkinsEnv.groovy @@ -44,34 +44,46 @@ class jenkinsEnv implements Serializable { case 'linux': switch(version) { case '3.0.x': +return 'Maven 3.0.5' case '3.0.5': return 'Maven 3.0.5' case '3.2.x': +return 'Maven 3.2.5' case '3.2.5': return 'Maven 3.2.5' case '3.3.x': +return 'Maven 3.3.9' case '3.3.9': return 'Maven 3.3.9' case '3.x.x': +return 'Maven 3.5.2' case '3.5.x': +return 'Maven 3.5.2' case '3.5.2': +return 'Maven 3.5.2' default: return 'Maven 3.5.2' } case 'windows': switch(version) { case '3.0.x': +return 'Maven 3.0.5 (Windows)' case '3.0.5': return 'Maven 3.0.5 (Windows)' case '3.2.x': +return 'Maven 3.2.5 (Windows)' case '3.2.5': return 'Maven 3.2.5 (Windows)' case '3.3.x': +return 'Maven 3.3.9 (Windows)' case '3.3.9': return 'Maven 3.3.9 (Windows)' case '3.x.x': +return 'Maven 3.5.2' case '3.5.x': +return 'Maven 3.5.2' case '3.5.2': +return 'Maven 3.5.2' default: return 'Maven 3.5.2' } -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-env] branch master updated: Add readme
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git The following commit(s) were added to refs/heads/master by this push: new 7ecbace Add readme 7ecbace is described below commit 7ecbace538f71cba9a2b96c6ddf44b83a39ab890 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Sun Nov 26 22:13:32 2017 + Add readme --- README.adoc | 12 1 file changed, 12 insertions(+) diff --git a/README.adoc b/README.adoc new file mode 100644 index 000..87c8656 --- /dev/null +++ b/README.adoc @@ -0,0 +1,12 @@ +== Apache Maven Jenkins Environment + +This repository contains a Jenkins shared library that defines the abstraction of the Jenkins build environment from the Jenkins build definition. + +The Jenkins build definition is mangaed from the shared libraries defined in https://gitbox.apache.org/repos/asf?p=maven-jenkins-lib.git[maven-jenkins-lib.git] + +If you want to build the Apache Maven repositories on your own Jenkins infrastructure you will need to define tow shared libraries: + +. The first shared library should be a clone of this shared library with the environment specifics modified to match your own Jenkins environment +. The second shared library should be the https://gitbox.apache.org/repos/asf?p=maven-jenkins-lib.git[maven-jenkins-lib.git] that defines the standard Apache Maven build process + +If you would like more information on the design of this Jenkinsfile structure see https://www.youtube.com/watch?v=s4w8BX3xi4M[Episode 4] and https://www.youtube.com/watch?v=vfAzhVDxOOk[Episode 5] of Stephen Connolly's "Watch Me Code" series. -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-env] branch master updated: Initial jenkinsEnv
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git The following commit(s) were added to refs/heads/master by this push: new c4886e9 Initial jenkinsEnv c4886e9 is described below commit c4886e98f2d7899b0906a86bb4fe09a67b7e25d0 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Sun Nov 26 22:32:31 2017 + Initial jenkinsEnv --- vars/jenkinsEnv.groovy | 82 ++ 1 file changed, 82 insertions(+) diff --git a/vars/jenkinsEnv.groovy b/vars/jenkinsEnv.groovy new file mode 100644 index 000..8be79e3 --- /dev/null +++ b/vars/jenkinsEnv.groovy @@ -0,0 +1,82 @@ +#!/usr/bin/env groovy + +class jenkinsEnv implements Serializable { +def labelForOS(String os) { +switch (os) { +case 'linux': +return 'ubuntu' +case 'windows': +return 'Windows' +default: +return null +} +} +def jdkFromVersion(String os, String version) { +switch (os) { +case 'linux': +switch (version) { +case '7': +return 'JDK 1.7 (latest)' +case '8': +return 'JDK 1.8 (latest)' +case '9': +return 'JDK 1.9 (latest)' +default: +return null +} +case 'windows': +switch(version) { +case '7': +return 'JDK 1.7 (latest)' +case '8': +return 'JDK 1.8 (latest)' +case '9': +return 'JDK 1.9 (latest)' +default: +return null +} +default: +return null +} +} +def mvnFromVersion(String os, String version) { +switch (os) { +case 'linux': +switch(version) { +case '3.0.x': +case '3.0.5': +return 'Maven 3.0.5' +case '3.2.x': +case '3.2.5': +return 'Maven 3.2.5' +case '3.3.x': +case '3.3.9': +return 'Maven 3.3.9' +case '3.x.x': +case '3.5.x': +case '3.5.2': +default: +return 'Maven 3.5.2' +} +case 'windows': +switch(version) { +case '3.0.x': +case '3.0.5': +return 'Maven 3.0.5 (Windows)' +case '3.2.x': +case '3.2.5': +return 'Maven 3.2.5 (Windows)' +case '3.3.x': +case '3.3.9': +return 'Maven 3.3.9 (Windows)' +case '3.x.x': +case '3.5.x': +case '3.5.2': +default: +return 'Maven 3.5.2' +} +default: +return null +} +} +} \ No newline at end of file -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-lib] branch master updated: Ooops forgot to add Readme
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-lib.git The following commit(s) were added to refs/heads/master by this push: new e4e74b1 Ooops forgot to add Readme e4e74b1 is described below commit e4e74b1dc5b288b3c741bafaaceb23f0dc697f8d Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Sun Nov 26 22:32:55 2017 + Ooops forgot to add Readme --- README.adoc | 13 + 1 file changed, 13 insertions(+) diff --git a/README.adoc b/README.adoc index e69de29..1588a52 100644 --- a/README.adoc +++ b/README.adoc @@ -0,0 +1,13 @@ +== Apache Maven Jenkins Shared Libraries + +This repository contains the Jenkins shared libraries that define the standard build process for Apache Maven subporjects. + +The shared libraries rely on a definition of the per-Jenkins instance specific configuration details. +The definition of those instance specific configuration details as customized for the Apache build server is hosted in https://gitbox.apache.org/repos/asf?p=maven-jenkins-env.git[maven-jenkins-env] + +If you want to build the Apache Maven repositories on your own Jenkins infrastructure you will need to define two shared libraries: + +. The first shared library should be a clone of https://gitbox.apache.org/repos/asf?p=maven-jenkins-env.git[maven-jenkins-env.git] with the environment specifics modified to match your own Jenkins environment +. The second shared library should be this shared library which defines the standard Apache Maven build process + +If you would like more information on the design of this Jenkinsfile structure see https://www.youtube.com/watch?v=s4w8BX3xi4M[Episode 4] and https://www.youtube.com/watch?v=vfAzhVDxOOk[Episode 5] of Stephen Connolly's "Watch Me Code" series. -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-release] branch master updated: Add Jenkinsfile
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-release.git The following commit(s) were added to refs/heads/master by this push: new fa3bc5c Add Jenkinsfile fa3bc5c is described below commit fa3bc5c1bf5c7649efb2fda4637d081233d8cb9b Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Sun Nov 26 22:37:39 2017 + Add Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000..35f02a9 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1 @@ +asfMavenTlpStdBuild() -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-release] branch master updated: Add Jenkinsfile and .repository ignores to rat
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-release.git The following commit(s) were added to refs/heads/master by this push: new b70be3a Add Jenkinsfile and .repository ignores to rat b70be3a is described below commit b70be3af0ab9543ff4def3e6fb80b87209432c0e Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Sun Nov 26 23:08:37 2017 + Add Jenkinsfile and .repository ignores to rat --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 4178117..28969f4 100644 --- a/pom.xml +++ b/pom.xml @@ -103,6 +103,8 @@ This module is not yet included --> maven-release-policies/maven-release-semver-policy/**/*.* + .repository + Jenkinsfile -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-lib] branch master created (now 16f6299)
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-lib.git. at 16f6299 Add LICENSE This branch includes the following new commits: new 16f6299 Add LICENSE 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. -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-lib] 01/01: Add LICENSE
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-lib.git commit 16f62995cd630fbabdc090181c2dd467c5491a15 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Sun Nov 26 22:06:36 2017 + Add LICENSE --- LICENSE | 202 1 file changed, 202 insertions(+) diff --git a/LICENSE b/LICENSE new file mode 100644 index 000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent lic
[maven-jenkins-env] 01/01: Add LICENSE
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git commit 2ecca1a9e940abc18e54fd35c300521f930d9d4a Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Sun Nov 26 22:05:05 2017 + Add LICENSE --- LICENSE | 202 1 file changed, 202 insertions(+) diff --git a/LICENSE b/LICENSE new file mode 100644 index 000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent lic
[maven-jenkins-env] branch master created (now 2ecca1a)
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git. at 2ecca1a Add LICENSE This branch includes the following new commits: new 2ecca1a Add LICENSE 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. -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-env] branch master updated: Update README.adoc
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git The following commit(s) were added to refs/heads/master by this push: new dc11839 Update README.adoc dc11839 is described below commit dc1183958dbd3bf5b6e4e4e2165309bc2c9b163e Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Sun Nov 26 22:14:09 2017 + Update README.adoc --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 87c8656..394753c 100644 --- a/README.adoc +++ b/README.adoc @@ -2,7 +2,7 @@ This repository contains a Jenkins shared library that defines the abstraction of the Jenkins build environment from the Jenkins build definition. -The Jenkins build definition is mangaed from the shared libraries defined in https://gitbox.apache.org/repos/asf?p=maven-jenkins-lib.git[maven-jenkins-lib.git] +The Jenkins build definition is mangaged from the shared libraries defined in https://gitbox.apache.org/repos/asf?p=maven-jenkins-lib.git[maven-jenkins-lib.git] If you want to build the Apache Maven repositories on your own Jenkins infrastructure you will need to define tow shared libraries: -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-lib] branch master updated: dir hack
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-lib.git The following commit(s) were added to refs/heads/master by this push: new d446d5d dir hack d446d5d is described below commit d446d5d7c88f06dec0b3bce59aacecf694b625c1 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Sun Nov 26 23:14:35 2017 + dir hack --- vars/asfMavenTlpStdBuild.groovy | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/vars/asfMavenTlpStdBuild.groovy b/vars/asfMavenTlpStdBuild.groovy index 8a2bce8..94036fc 100644 --- a/vars/asfMavenTlpStdBuild.groovy +++ b/vars/asfMavenTlpStdBuild.groovy @@ -19,14 +19,18 @@ def call(Map params = [:]) { tasks[stageId] = { node(label) { stage("Checkout ${stageId}") { -checkout scm +dir('m') { + checkout scm +} } stage("Build ${stageId}") { withMaven(jdk:jdkName, maven:mvnName, mavenLocalRepo:'.repository') { - if (isUnix()) { -sh 'mvn clean verify' - } else { -bat 'mvn clean verify' + dir ('m') { +if (isUnix()) { + sh 'mvn clean verify' +} else { + bat 'mvn clean verify' +} } } } -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-env] branch master updated: No Maven 3.5.2 for windows
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git The following commit(s) were added to refs/heads/master by this push: new 572127e No Maven 3.5.2 for windows 572127e is described below commit 572127e57981e9371b0f081cc07bfacdff9b8023 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Sun Nov 26 23:11:59 2017 + No Maven 3.5.2 for windows --- vars/jenkinsEnv.groovy | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/jenkinsEnv.groovy b/vars/jenkinsEnv.groovy index 3e8636b..f4b4bff 100644 --- a/vars/jenkinsEnv.groovy +++ b/vars/jenkinsEnv.groovy @@ -79,13 +79,13 @@ class jenkinsEnv implements Serializable { case '3.3.9': return 'Maven 3.3.9 (Windows)' case '3.x.x': -return 'Maven 3.5.2' +return 'Maven 3.5.0 (Windows)' case '3.5.x': -return 'Maven 3.5.2' +return 'Maven 3.5.0 (Windows)' case '3.5.2': -return 'Maven 3.5.2' +return null default: -return 'Maven 3.5.2' +return 'Maven 3.5.0 (Windows)' } default: return null -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-parent] branch temp-jenkins deleted (was b330685)
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a change to branch temp-jenkins in repository https://gitbox.apache.org/repos/asf/maven-parent.git. was b330685 Throw-away commit This change permanently discards the following revisions: discard b330685 Throw-away commit -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-parent] 01/01: Throw-away commit
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch temp-jenkins in repository https://gitbox.apache.org/repos/asf/maven-parent.git commit b330685e9cf15e505f33541ef5a9e2c0a1038627 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 22 13:31:08 2017 + Throw-away commit --- Jenkinsfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000..e69de29 -- To stop receiving notification emails like this one, please contact "commits@maven.apache.org" <commits@maven.apache.org>.
[maven-parent] branch temp-jenkins created (now b330685)
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a change to branch temp-jenkins in repository https://gitbox.apache.org/repos/asf/maven-parent.git. at b330685 Throw-away commit This branch includes the following new commits: new b330685 Throw-away commit 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. -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-env] branch master updated: formatting
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git The following commit(s) were added to refs/heads/master by this push: new 1b41abc formatting 1b41abc is described below commit 1b41abc2ec87391f3a2914a517199a1bb812c5f7 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 29 11:07:12 2017 + formatting --- vars/jenkinsNotify.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/jenkinsNotify.groovy b/vars/jenkinsNotify.groovy index 10238b6..a3322c7 100644 --- a/vars/jenkinsNotify.groovy +++ b/vars/jenkinsNotify.groovy @@ -66,7 +66,7 @@ def call(Map params = [:]) { } } } -messageBody = messageBody + '\n${FAILED_TESTS}\n' + messageTail +messageBody = messageBody + '\n\n${FAILED_TESTS}\n' + messageTail // send the mail if (sendMail) { emailext body: messageBody, recipientProviders: providers, replyTo: 'd...@maven.apache.org', subject: messageSubject, to: 'notificati...@maven.apache.org' -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-lib] branch master updated: Allow failing tests to be recorded as unstable build
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-lib.git The following commit(s) were added to refs/heads/master by this push: new de53483 Allow failing tests to be recorded as unstable build de53483 is described below commit de53483481dd932a543ee954d3ed2f59408f10b9 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 29 11:45:03 2017 + Allow failing tests to be recorded as unstable build --- vars/asfMavenTlpStdBuild.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/asfMavenTlpStdBuild.groovy b/vars/asfMavenTlpStdBuild.groovy index 1ed06ca..6ecaf19 100644 --- a/vars/asfMavenTlpStdBuild.groovy +++ b/vars/asfMavenTlpStdBuild.groovy @@ -27,9 +27,9 @@ def call(Map params = [:]) { withMaven(jdk:jdkName, maven:mvnName, mavenLocalRepo:'.repository') { dir ('m') { if (isUnix()) { - sh 'mvn clean verify' + sh 'mvn clean verify -Dmaven.test.failure.ignore=true -Dfindbugs.failOnError=false' } else { - bat 'mvn clean verify' + bat 'mvn clean verify -Dmaven.test.failure.ignore=true -Dfindbugs.failOnError=false' } } } -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-env] branch master updated: Better commit message formatting
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git The following commit(s) were added to refs/heads/master by this push: new 4a5f51e Better commit message formatting 4a5f51e is described below commit 4a5f51effb589e0abb551aad5d488c3450e675c6 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 29 08:46:49 2017 + Better commit message formatting It is important to indent multi-line comments correctly --- vars/jenkinsNotify.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/jenkinsNotify.groovy b/vars/jenkinsNotify.groovy index a8efeed..1c7e0ec 100644 --- a/vars/jenkinsNotify.groovy +++ b/vars/jenkinsNotify.groovy @@ -34,7 +34,7 @@ def call(Map params = [:]) { messageBody = messageBody + "\n\nChanges:\n"; for (def changeSet in currentBuild.changeSets) { for (def change in changeSet) { -messageBody = messageBody + "\n* ${change.msg}" +messageBody = messageBody + "\n* ${change.msg.trim().replaceAll('\n','\n ')}" } } } -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-env] branch master updated: [MNG-6316] Set the build description to include jira issues
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git The following commit(s) were added to refs/heads/master by this push: new 855e1f8 [MNG-6316] Set the build description to include jira issues 855e1f8 is described below commit 855e1f8ad898ef98af70bc0c8ff4a7054411de97 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 29 09:28:09 2017 + [MNG-6316] Set the build description to include jira issues --- vars/jenkinsNotify.groovy | 10 ++ 1 file changed, 10 insertions(+) diff --git a/vars/jenkinsNotify.groovy b/vars/jenkinsNotify.groovy index 269e386..b73fe1c 100644 --- a/vars/jenkinsNotify.groovy +++ b/vars/jenkinsNotify.groovy @@ -1,5 +1,6 @@ #!/usr/bin/env groovy def call(Map params = [:]) { +// determine the message details def providers def messageBody def messageSubject @@ -34,6 +35,8 @@ def call(Map params = [:]) { // should never happen if we are actually being invoked. return } + +// comment on any jira tickets def jiraIssues = jiraIssueSelector(issueSelector: [$class: 'DefaultIssueSelector']) for (def jiraIssue in jiraIssues) { try { @@ -42,6 +45,12 @@ def call(Map params = [:]) { echo "WARNING: Could not update ${jiraIssue}: ${e.message}" } } +// set the build description to the jira ticket id's +if (!jiraIssues.empty) { +currentBuild.description = "${jiraIssues.join(', ')}" +} + +// add the changes to the email if (currentBuild.changeSets.empty) { messageBody = messageBody+"\n\nNo changes.\n"; } else { @@ -52,6 +61,7 @@ def call(Map params = [:]) { } } } +// send the mail if (sendMail) { emailext body: messageBody, recipientProviders: providers, replyTo: 'd...@maven.apache.org', subject: messageSubject, to: 'notificati...@maven.apache.org' } -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-lib] branch master updated: [MNG-6316] Add an explicit notification stage
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-lib.git The following commit(s) were added to refs/heads/master by this push: new c47c6d1 [MNG-6316] Add an explicit notification stage c47c6d1 is described below commit c47c6d1ac23af87710f41f5ea44343d2137c1af2 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 29 09:27:35 2017 + [MNG-6316] Add an explicit notification stage --- vars/asfMavenTlpStdBuild.groovy | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/asfMavenTlpStdBuild.groovy b/vars/asfMavenTlpStdBuild.groovy index 69489bd..024c08b 100644 --- a/vars/asfMavenTlpStdBuild.groovy +++ b/vars/asfMavenTlpStdBuild.groovy @@ -48,9 +48,9 @@ def call(Map params = [:]) { properties([buildRetention]) try { parallel(tasks) -jenkinsNotify() - } catch (exc) { -jenkinsNotify() -throw exc + } finally { +stage("Notifications") { + jenkinsNotify() +} } } \ No newline at end of file -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-env] branch master updated: [MNG-6316] Try adding JIRA notification
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git The following commit(s) were added to refs/heads/master by this push: new 8ff2441 [MNG-6316] Try adding JIRA notification 8ff2441 is described below commit 8ff244191d9a57d9b7e45e33a87f63080c6cc44e Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 29 09:00:32 2017 + [MNG-6316] Try adding JIRA notification --- vars/jenkinsNotify.groovy | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/vars/jenkinsNotify.groovy b/vars/jenkinsNotify.groovy index 1c7e0ec..ac26135 100644 --- a/vars/jenkinsNotify.groovy +++ b/vars/jenkinsNotify.groovy @@ -3,31 +3,39 @@ def call(Map params = [:]) { def providers def messageBody def messageSubject +def sendMail switch(currentBuild.currentResult) { case "SUCCESS": providers = [] messageSubject = "Build succeeded in Jenkins: ${currentBuild.fullDisplayName}" messageBody = """See ${currentBuild.absoluteUrl}""" +// only send successfuly builds if the previous build was unsuccessful or incomplete +sendMail = currentBuild.previousBuild == null || !"SUCCESS".equals(currentBuild.previousBuild.result) break case "UNSTABLE": providers = [[$class: 'CulpritsRecipientProvider']] messageSubject = "Build unstable in Jenkins: ${currentBuild.fullDisplayName}" messageBody = """See ${currentBuild.absoluteUrl}""" +sendMail = true break case "FAILURE": providers = [[$class: 'CulpritsRecipientProvider']] messageSubject = "Build failed in Jenkins: ${currentBuild.fullDisplayName}" messageBody = """See ${currentBuild.absoluteUrl}""" +sendMail = true break case "ABORTED": providers = [[$class: 'CulpritsRecipientProvider']] messageSubject = "Build aborted in Jenkins: ${currentBuild.fullDisplayName}" messageBody = """See ${currentBuild.absoluteUrl}""" +sendMail = true break default: // should never happen if we are actually being invoked. return } +jiraComment body: "${messageSubject}\n\n${messageBody}" + if (currentBuild.changeSets.empty) { messageBody = messageBody+"\n\nNo changes.\n"; } else { @@ -38,5 +46,7 @@ def call(Map params = [:]) { } } } -emailext body: messageBody, recipientProviders: providers, replyTo: 'd...@maven.apache.org', subject: messageSubject, to: 'notificati...@maven.apache.org' +if (sendMail) { +emailext body: messageBody, recipientProviders: providers, replyTo: 'd...@maven.apache.org', subject: messageSubject, to: 'notificati...@maven.apache.org' +} } \ No newline at end of file -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-env] branch master updated: [MNG-6316] Don't let JIRA step timeouts fail build
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git The following commit(s) were added to refs/heads/master by this push: new 686e4e3 [MNG-6316] Don't let JIRA step timeouts fail build 686e4e3 is described below commit 686e4e3fb944ae009a4d171c7f01a31f3b612463 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 29 09:09:53 2017 + [MNG-6316] Don't let JIRA step timeouts fail build --- vars/jenkinsNotify.groovy | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vars/jenkinsNotify.groovy b/vars/jenkinsNotify.groovy index ac26135..0f0d3c6 100644 --- a/vars/jenkinsNotify.groovy +++ b/vars/jenkinsNotify.groovy @@ -34,8 +34,11 @@ def call(Map params = [:]) { // should never happen if we are actually being invoked. return } -jiraComment body: "${messageSubject}\n\n${messageBody}" - +try { +jiraComment body: "${messageSubject}\n\n${messageBody}" +} catch (e) { +echo "jiraComment failed: ${e.message}" +} if (currentBuild.changeSets.empty) { messageBody = messageBody+"\n\nNo changes.\n"; } else { -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-env] 01/02: testing emailext templates
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git commit 05487d4745643c6ebb9fef1b968b00ea09501488 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 29 10:45:20 2017 + testing emailext templates --- vars/jenkinsNotify.groovy | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/vars/jenkinsNotify.groovy b/vars/jenkinsNotify.groovy index 22ed880..8c46042 100644 --- a/vars/jenkinsNotify.groovy +++ b/vars/jenkinsNotify.groovy @@ -3,6 +3,7 @@ def call(Map params = [:]) { // determine the message details def providers def messageBody +def messageTail = '' def messageSubject def sendMail switch(currentBuild.currentResult) { @@ -18,18 +19,21 @@ def call(Map params = [:]) { messageSubject = "Build unstable in Jenkins: ${currentBuild.fullDisplayName}" messageBody = """See ${currentBuild.absoluteUrl}""" sendMail = true +messageTail = '\nFailing tests:\n${FAILED_TESTS}\n\nBuild log:\n${BUILD_LOG}' break case "FAILURE": providers = [[$class: 'CulpritsRecipientProvider']] messageSubject = "Build failed in Jenkins: ${currentBuild.fullDisplayName}" messageBody = """See ${currentBuild.absoluteUrl}""" sendMail = true +messageTail = '\nFailing tests:\n${FAILED_TESTS}\n\nBuild log:\n${BUILD_LOG}' break case "ABORTED": providers = [[$class: 'CulpritsRecipientProvider']] messageSubject = "Build aborted in Jenkins: ${currentBuild.fullDisplayName}" messageBody = """See ${currentBuild.absoluteUrl}""" sendMail = true +messageTail = '\nBuild log:\n${BUILD_LOG}' break default: // should never happen if we are actually being invoked. @@ -61,9 +65,9 @@ def call(Map params = [:]) { } } } -messageBody = messageBody + '\n${FAILED_TESTS}\n${BUILD_LOG}' +messageBody = messageBody + messageTail // send the mail -if (sendMail) { +//if (sendMail) { emailext body: messageBody, recipientProviders: providers, replyTo: 'd...@maven.apache.org', subject: messageSubject, to: 'notificati...@maven.apache.org' -} +//} } \ No newline at end of file -- To stop receiving notification emails like this one, please contact "commits@maven.apache.org" <commits@maven.apache.org>.
[maven-jenkins-env] 02/02: tweaks
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git commit 62f988c2bb60f4353258b7fb0e5e5a486935393e Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 29 10:56:22 2017 + tweaks --- vars/jenkinsNotify.groovy | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vars/jenkinsNotify.groovy b/vars/jenkinsNotify.groovy index 8c46042..bd39b73 100644 --- a/vars/jenkinsNotify.groovy +++ b/vars/jenkinsNotify.groovy @@ -19,14 +19,14 @@ def call(Map params = [:]) { messageSubject = "Build unstable in Jenkins: ${currentBuild.fullDisplayName}" messageBody = """See ${currentBuild.absoluteUrl}""" sendMail = true -messageTail = '\nFailing tests:\n${FAILED_TESTS}\n\nBuild log:\n${BUILD_LOG}' +messageTail = '\nBuild log:\n${BUILD_LOG}' break case "FAILURE": providers = [[$class: 'CulpritsRecipientProvider']] messageSubject = "Build failed in Jenkins: ${currentBuild.fullDisplayName}" messageBody = """See ${currentBuild.absoluteUrl}""" sendMail = true -messageTail = '\nFailing tests:\n${FAILED_TESTS}\n\nBuild log:\n${BUILD_LOG}' +messageTail = '\nBuild log:\n${BUILD_LOG}' break case "ABORTED": providers = [[$class: 'CulpritsRecipientProvider']] @@ -65,9 +65,9 @@ def call(Map params = [:]) { } } } -messageBody = messageBody + messageTail +messageBody = messageBody + '\n${FAILED_TESTS}\n' + messageTail // send the mail -//if (sendMail) { +if (sendMail) { emailext body: messageBody, recipientProviders: providers, replyTo: 'd...@maven.apache.org', subject: messageSubject, to: 'notificati...@maven.apache.org' -//} +} } \ No newline at end of file -- To stop receiving notification emails like this one, please contact "commits@maven.apache.org" <commits@maven.apache.org>.
[maven-jenkins-env] branch master updated (2e6dd14 -> 62f988c)
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git. from 2e6dd14 testing emailext templates new 05487d4 testing emailext templates new 62f988c tweaks 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: vars/jenkinsNotify.groovy | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-env] branch master updated: testing emailext templates
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git The following commit(s) were added to refs/heads/master by this push: new 2e6dd14 testing emailext templates 2e6dd14 is described below commit 2e6dd1428258c6517d422a9e49027f5109101606 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 29 10:40:19 2017 + testing emailext templates --- vars/jenkinsNotify.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/jenkinsNotify.groovy b/vars/jenkinsNotify.groovy index b73fe1c..22ed880 100644 --- a/vars/jenkinsNotify.groovy +++ b/vars/jenkinsNotify.groovy @@ -61,6 +61,7 @@ def call(Map params = [:]) { } } } +messageBody = messageBody + '\n${FAILED_TESTS}\n${BUILD_LOG}' // send the mail if (sendMail) { emailext body: messageBody, recipientProviders: providers, replyTo: 'd...@maven.apache.org', subject: messageSubject, to: 'notificati...@maven.apache.org' -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-env] branch master updated: debugging
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git The following commit(s) were added to refs/heads/master by this push: new 6f1f215 debugging 6f1f215 is described below commit 6f1f2158ad0c84ef8faa190d69d09c31d053f49e Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 29 11:05:34 2017 + debugging --- vars/jenkinsNotify.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/jenkinsNotify.groovy b/vars/jenkinsNotify.groovy index bd39b73..10238b6 100644 --- a/vars/jenkinsNotify.groovy +++ b/vars/jenkinsNotify.groovy @@ -36,6 +36,7 @@ def call(Map params = [:]) { messageTail = '\nBuild log:\n${BUILD_LOG}' break default: +echo "Unknown status: ${currentBuild.currentResult}" // should never happen if we are actually being invoked. return } -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-lib] branch master updated: More tweaking... ffs pipeline you don't make it easy to get the actual build result
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-lib.git The following commit(s) were added to refs/heads/master by this push: new d02661b More tweaking... ffs pipeline you don't make it easy to get the actual build result d02661b is described below commit d02661b4c5b813973acec4c989c2601d4c81db44 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 29 11:36:55 2017 + More tweaking... ffs pipeline you don't make it easy to get the actual build result --- vars/asfMavenTlpStdBuild.groovy | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/vars/asfMavenTlpStdBuild.groovy b/vars/asfMavenTlpStdBuild.groovy index bafea47..1ed06ca 100644 --- a/vars/asfMavenTlpStdBuild.groovy +++ b/vars/asfMavenTlpStdBuild.groovy @@ -48,20 +48,29 @@ def call(Map params = [:]) { properties([buildRetention]) try { parallel(tasks) -currentBuild.result = "SUCCESS" // JENKINS-34376 seems to make it hard to detect the aborted builds } catch (org.jenkinsci.plugins.workflow.steps.FlowInterruptedException e) { // this ambiguous condition means a user probably aborted if (e.causes.size() == 0) { currentBuild.result = "ABORTED" -} +} else { + currentBuild.result = "FAILURE" +} throw e } catch (hudson.AbortException e) { // this ambiguous condition means during a shell step, user probably aborted if (e.getMessage().contains('script returned exit code 143')) { currentBuild.result = "ABORTED" +} else { + currentBuild.result = "FAILURE" } throw e + } catch (InterruptedException e) { +currentBuild.result = "ABORTED" +throw e + } catch (Throwable e) { +currentBuild.result = "FAILURE" +throw e } finally { stage("Notifications") { jenkinsNotify() -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-env] branch master updated: [MNG-6316] Pick up jira issue keys using selector
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git The following commit(s) were added to refs/heads/master by this push: new ea052a0 [MNG-6316] Pick up jira issue keys using selector ea052a0 is described below commit ea052a02cdb2bb74bd22bce08633ca14cf272828 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 29 09:21:21 2017 + [MNG-6316] Pick up jira issue keys using selector --- vars/jenkinsNotify.groovy | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/vars/jenkinsNotify.groovy b/vars/jenkinsNotify.groovy index 0f0d3c6..269e386 100644 --- a/vars/jenkinsNotify.groovy +++ b/vars/jenkinsNotify.groovy @@ -34,10 +34,13 @@ def call(Map params = [:]) { // should never happen if we are actually being invoked. return } -try { -jiraComment body: "${messageSubject}\n\n${messageBody}" -} catch (e) { -echo "jiraComment failed: ${e.message}" +def jiraIssues = jiraIssueSelector(issueSelector: [$class: 'DefaultIssueSelector']) +for (def jiraIssue in jiraIssues) { +try { +jiraComment body: "${messageSubject}\n\n${messageBody}", issueKey: jiraIssue +} catch (e) { +echo "WARNING: Could not update ${jiraIssue}: ${e.message}" +} } if (currentBuild.changeSets.empty) { messageBody = messageBody+"\n\nNo changes.\n"; -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-env] branch master updated: trying to debug failing build issue
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git The following commit(s) were added to refs/heads/master by this push: new 90b3f6c trying to debug failing build issue 90b3f6c is described below commit 90b3f6c1b2a6795dad16702855427b39113b5659 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 29 11:28:49 2017 + trying to debug failing build issue --- vars/jenkinsNotify.groovy | 19 --- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/vars/jenkinsNotify.groovy b/vars/jenkinsNotify.groovy index c9d27eb..bc8b0f2 100644 --- a/vars/jenkinsNotify.groovy +++ b/vars/jenkinsNotify.groovy @@ -1,5 +1,6 @@ #!/usr/bin/env groovy def call(Map params = [:]) { +echo "Build result: ${currentBuild.currentResult}" // determine the message details def providers def messageBody @@ -42,13 +43,17 @@ def call(Map params = [:]) { } // comment on any jira tickets -def jiraIssues = jiraIssueSelector(issueSelector: [$class: 'DefaultIssueSelector']) -for (def jiraIssue in jiraIssues) { -try { -jiraComment body: "${messageSubject}\n\n${messageBody}", issueKey: jiraIssue -} catch (e) { -echo "WARNING: Could not update ${jiraIssue}: ${e.message}" -} +try { +def jiraIssues = jiraIssueSelector(issueSelector: [$class: 'DefaultIssueSelector']) +for (def jiraIssue in jiraIssues) { +try { +jiraComment body: "${messageSubject}\n\n${messageBody}", issueKey: jiraIssue +} catch (e) { +echo "WARNING: Could not update ${jiraIssue}: ${e.message}" +} +} +} catch (e) { +echo "WARNING: Could not determine JIRA issues: ${e.message}" } // set the build description to the jira ticket id's if (!jiraIssues.empty) { -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-env] branch master updated: more safety
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git The following commit(s) were added to refs/heads/master by this push: new 16de61b more safety 16de61b is described below commit 16de61b1639ee071771709de04b2aab0597ad732 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 29 11:39:12 2017 + more safety --- vars/jenkinsNotify.groovy | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vars/jenkinsNotify.groovy b/vars/jenkinsNotify.groovy index bc8b0f2..c419230 100644 --- a/vars/jenkinsNotify.groovy +++ b/vars/jenkinsNotify.groovy @@ -43,8 +43,9 @@ def call(Map params = [:]) { } // comment on any jira tickets +def jiraIssues = null try { -def jiraIssues = jiraIssueSelector(issueSelector: [$class: 'DefaultIssueSelector']) +jiraIssues = jiraIssueSelector(issueSelector: [$class: 'DefaultIssueSelector']) for (def jiraIssue in jiraIssues) { try { jiraComment body: "${messageSubject}\n\n${messageBody}", issueKey: jiraIssue @@ -56,7 +57,7 @@ def call(Map params = [:]) { echo "WARNING: Could not determine JIRA issues: ${e.message}" } // set the build description to the jira ticket id's -if (!jiraIssues.empty) { +if (jiraIssues != null && !jiraIssues.empty) { currentBuild.description = "${jiraIssues.join(', ')}" } -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-lib] branch master updated: [JENKINS-34376] Workaround Jenkins issue to detect aborted builds better
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-lib.git The following commit(s) were added to refs/heads/master by this push: new 9dfa4cd [JENKINS-34376] Workaround Jenkins issue to detect aborted builds better 9dfa4cd is described below commit 9dfa4cd551626ea6de1d9fac44872d063e34e040 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 29 11:18:40 2017 + [JENKINS-34376] Workaround Jenkins issue to detect aborted builds better --- vars/asfMavenTlpStdBuild.groovy | 14 ++ 1 file changed, 14 insertions(+) diff --git a/vars/asfMavenTlpStdBuild.groovy b/vars/asfMavenTlpStdBuild.groovy index 024c08b..bafea47 100644 --- a/vars/asfMavenTlpStdBuild.groovy +++ b/vars/asfMavenTlpStdBuild.groovy @@ -48,6 +48,20 @@ def call(Map params = [:]) { properties([buildRetention]) try { parallel(tasks) +currentBuild.result = "SUCCESS" +// JENKINS-34376 seems to make it hard to detect the aborted builds + } catch (org.jenkinsci.plugins.workflow.steps.FlowInterruptedException e) { +// this ambiguous condition means a user probably aborted +if (e.causes.size() == 0) { + currentBuild.result = "ABORTED" +} +throw e + } catch (hudson.AbortException e) { +// this ambiguous condition means during a shell step, user probably aborted +if (e.getMessage().contains('script returned exit code 143')) { + currentBuild.result = "ABORTED" +} +throw e } finally { stage("Notifications") { jenkinsNotify() -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-parent] branch failing-build updated: break the build
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch failing-build in repository https://gitbox.apache.org/repos/asf/maven-parent.git The following commit(s) were added to refs/heads/failing-build by this push: new d61585c break the build d61585c is described below commit d61585cd41f0e51ac66450bbd71d697a5cf0508b Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 29 11:25:20 2017 + break the build --- pom.xml | 19 --- 1 file changed, 19 deletions(-) diff --git a/pom.xml b/pom.xml index 9264038..ad686cd 100644 --- a/pom.xml +++ b/pom.xml @@ -1,24 +1,5 @@ - - http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-parent] 01/01: break the build
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch failing-build in repository https://gitbox.apache.org/repos/asf/maven-parent.git commit 49d5ef372e38e451745f108641f2d0473183159b Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 29 11:24:00 2017 + break the build --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b345b6e..9264038 100644 --- a/pom.xml +++ b/pom.xml @@ -1088,7 +1088,7 @@ under the License. apache-rat-plugin -.repository/** +.re-bropository/** -- To stop receiving notification emails like this one, please contact "commits@maven.apache.org" <commits@maven.apache.org>.
[maven-parent] branch failing-build created (now 49d5ef3)
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a change to branch failing-build in repository https://gitbox.apache.org/repos/asf/maven-parent.git. at 49d5ef3 break the build This branch includes the following new commits: new 49d5ef3 break the build 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. -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-plugin-tools] branch unstable-build deleted (was ecec121)
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a change to branch unstable-build in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git. was ecec121 make a test fail This change permanently discards the following revisions: discard ecec121 make a test fail -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jenkins-lib] branch master updated: Ensure the email on failure is always sent if we start the build
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-lib.git The following commit(s) were added to refs/heads/master by this push: new af25f08 Ensure the email on failure is always sent if we start the build af25f08 is described below commit af25f0866ae2100d0297185e0fb181128f3da8fb Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 29 14:32:36 2017 + Ensure the email on failure is always sent if we start the build --- vars/asfMavenTlpStdBuild.groovy | 107 +--- 1 file changed, 67 insertions(+), 40 deletions(-) diff --git a/vars/asfMavenTlpStdBuild.groovy b/vars/asfMavenTlpStdBuild.groovy index 6ecaf19..8d471cf 100644 --- a/vars/asfMavenTlpStdBuild.groovy +++ b/vars/asfMavenTlpStdBuild.groovy @@ -1,53 +1,79 @@ +#!/usr/bin/env groovy + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + def call(Map params = [:]) { - def oses = params.containsKey('os') ? params.os : ['linux', 'windows'] - def jdks = params.containsKey('jdks') ? params.jdks : ['7','8','9'] - def maven = params.containsKey('maven') ? params.maven : '3.x.x' - def failFast = params.containsKey('failFast') ? params.failFast : true - Map tasks = [failFast: failFast] - boolean first = true - for (String os in oses) { -for (def jdk in jdks) { - String label = jenkinsEnv.labelForOS(os); - String jdkName = jenkinsEnv.jdkFromVersion(os, "${jdk}") - String mvnName = jenkinsEnv.mvnFromVersion(os, "${maven}") - echo "OS: ${os} JDK: ${jdk} Maven: ${maven} => Label: ${label} JDK: ${jdkName} Maven: ${mvnName}" - if (label == null || jdkName == null || mvnName == null) { -echo "Skipping ${os}-jdk${jdk} as unsupported by Jenkins Environment" -continue; - } - String stageId = "${os}-jdk${jdk}" - tasks[stageId] = { -node(label) { - stage("Checkout ${stageId}") { -dir('m') { - checkout scm + try { +// set build retention time first +def buildRetention +if (env.BRANCH_NAME == 'master') { + buildRetention = buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '3', daysToKeepStr: '21', numToKeepStr: '25')) +} else { + buildRetention = buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '1', daysToKeepStr: '7', numToKeepStr: '5')) +} +properties([buildRetention]) + +// now determine the matrix of parallel builds +def oses = params.containsKey('os') ? params.os : ['linux', 'windows'] +def jdks = params.containsKey('jdks') ? params.jdks : ['7','8','9'] +def maven = params.containsKey('maven') ? params.maven : '3.x.x' +def failFast = params.containsKey('failFast') ? params.failFast : true +Map tasks = [failFast: failFast] +boolean first = true +for (String os in oses) { + for (def jdk in jdks) { +String label = jenkinsEnv.labelForOS(os); +String jdkName = jenkinsEnv.jdkFromVersion(os, "${jdk}") +String mvnName = jenkinsEnv.mvnFromVersion(os, "${maven}") +echo "OS: ${os} JDK: ${jdk} Maven: ${maven} => Label: ${label} JDK: ${jdkName} Maven: ${mvnName}" +if (label == null || jdkName == null || mvnName == null) { + echo "Skipping ${os}-jdk${jdk} as unsupported by Jenkins Environment" + continue; +} +String stageId = "${os}-jdk${jdk}" +tasks[stageId] = { + node(label) { +stage("Checkout ${stageId}") { + dir('m') { +checkout scm + } } - } - stage("Build ${stageId}") { -withMaven(jdk:jdkName, maven:mvnName, mavenLocalRepo:'.repository') { - dir ('m') { -if (isUnix()) { - sh 'mvn clean verify -Dmaven.test.failure.ignore=true -Dfindbugs.failOnError=false' -} else { -
[maven-jenkins-env] branch master updated: Add license headers
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jenkins-env.git The following commit(s) were added to refs/heads/master by this push: new 6c77351 Add license headers 6c77351 is described below commit 6c77351e3029741c6f350e8e419c0fb5f9feab2d Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 29 14:32:57 2017 + Add license headers --- vars/jenkinsEnv.groovy| 19 +++ vars/jenkinsNotify.groovy | 20 2 files changed, 39 insertions(+) diff --git a/vars/jenkinsEnv.groovy b/vars/jenkinsEnv.groovy index f4b4bff..7b8324d 100644 --- a/vars/jenkinsEnv.groovy +++ b/vars/jenkinsEnv.groovy @@ -1,5 +1,24 @@ #!/usr/bin/env groovy +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + class jenkinsEnv implements Serializable { def labelForOS(String os) { switch (os) { diff --git a/vars/jenkinsNotify.groovy b/vars/jenkinsNotify.groovy index c419230..99e3ce4 100644 --- a/vars/jenkinsNotify.groovy +++ b/vars/jenkinsNotify.groovy @@ -1,4 +1,24 @@ #!/usr/bin/env groovy + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + def call(Map params = [:]) { echo "Build result: ${currentBuild.currentResult}" // determine the message details -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-parent] branch failing-build deleted (was d61585c)
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a change to branch failing-build in repository https://gitbox.apache.org/repos/asf/maven-parent.git. was d61585c break the build This change permanently discards the following revisions: discard d61585c break the build discard 49d5ef3 break the build -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-plugin-tools] 01/01: make a test fail
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch unstable-build in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git commit ecec1218dfa7619bdcf5bfd83df3099233329b43 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Wed Nov 29 11:50:16 2017 + make a test fail --- .../test/java/org/apache/maven/tools/plugin/util/PluginUtilsTest.java| 1 + 1 file changed, 1 insertion(+) diff --git a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/PluginUtilsTest.java b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/PluginUtilsTest.java index a5c740b..859e5ac 100644 --- a/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/PluginUtilsTest.java +++ b/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/util/PluginUtilsTest.java @@ -30,6 +30,7 @@ public class PluginUtilsTest { public void testShouldTrimArtifactIdToFindPluginId() { +assertEquals( "true", "false" ); assertEquals( "artifactId", PluginDescriptor.getGoalPrefixFromArtifactId( "maven-artifactId-plugin" ) ); assertEquals( "artifactId", PluginDescriptor.getGoalPrefixFromArtifactId( "maven-plugin-artifactId" ) ); assertEquals( "artifactId", PluginDescriptor.getGoalPrefixFromArtifactId( "artifactId-maven-plugin" ) ); -- To stop receiving notification emails like this one, please contact "commits@maven.apache.org" <commits@maven.apache.org>.
[maven-plugin-tools] branch unstable-build created (now ecec121)
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a change to branch unstable-build in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git. at ecec121 make a test fail This branch includes the following new commits: new ecec121 make a test fail 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. -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
maven-surefire git commit: Try out the new style Jenkinsfile
Repository: maven-surefire Updated Branches: refs/heads/new-jenkinsfile [created] 41a765437 Try out the new style Jenkinsfile Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/41a76543 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/41a76543 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/41a76543 Branch: refs/heads/new-jenkinsfile Commit: 41a765437c2ea8f0a76fa72bd5e12e04b14be3a7 Parents: e27b51e Author: Stephen ConnollyAuthored: Thu Nov 30 21:56:51 2017 + Committer: Stephen Connolly Committed: Thu Nov 30 21:56:51 2017 + -- Jenkinsfile | 51 --- 1 file changed, 20 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/41a76543/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 9863659..d9f2bfa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,31 +1,20 @@ -pipeline { -agent none -stages { -stage('Parallel Unix and Windows Build') { -steps { -parallel unix: { -node("${env.NIX_LABEL}") { -checkout scm -withEnv(["JAVA_HOME=${tool('JDK 1.8.0_144')}", "PATH+MAVEN=${tool('Maven 3.5.0')}/bin:${env.JAVA_HOME}/bin"]) { -sh "mvn clean install jacoco:report -B -U -e -fae -V -P run-its,jenkins -Dsurefire.useFile=false -Dfailsafe.useFile=false -Dintegration-test-port=8084 \\\"-Djdk.home=${tool('JDK 9 b181')}\\\"" -} -jacoco changeBuildStatus: false, execPattern: '**/*.exec', sourcePattern: '**/src/main/java', exclusionPattern: 'pkg/*.class,plexusConflict/*.class,**/surefire570/**/*.class,siblingAggregator/*.class,surefire257/*.class,surefire979/*.class,org/apache/maven/surefire/crb/*.class,org/apache/maven/plugins/surefire/selfdestruct/*.class,org/apache/maven/plugins/surefire/dumppid/*.class,org/apache/maven/plugin/surefire/*.class,org/apache/maven/plugin/failsafe/*.class,jiras/**/*.class,org/apache/maven/surefire/testng/*.class,org/apache/maven/surefire/testprovider/*.class,**/test/*.class,**/org/apache/maven/surefire/group/parse/*.class' -junit healthScaleFactor: 0.0, allowEmptyResults: true, keepLongStdio: true, testResults: '**/surefire-integration-tests/target/failsafe-reports/**/*.xml,**/surefire-integration-tests/target/surefire-reports/**/*.xml,**/maven-*/target/surefire-reports/**/*.xml,**/surefire-*/target/surefire-reports/**/*.xml,**/common-*/target/surefire-reports/**/*.xml' -} -}, -windows: { -node("${env.WIN_LABEL}") { -checkout scm -withEnv(["JAVA_HOME=${tool('JDK 1.8_121 (Windows Only)')}", "PATH+MAVEN=${tool('Maven 3.5.0 (Windows)')}\\bin;${env.JAVA_HOME}\\bin"]) { -bat "mvn clean install jacoco:report -B -U -e -fae -V -P run-its,jenkins -Dsurefire.useFile=false -Dfailsafe.useFile=false -Dintegration-test-port=8084" -} -} -} -} -} -} -options { -buildDiscarder(logRotator(numToKeepStr:'10')) -timeout(time: 10, unit: 'HOURS') -} -} +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +asfMavenTlpStdBuild(jdks:['8'])
maven-surefire git commit: enable the full matrix of jdks
Repository: maven-surefire Updated Branches: refs/heads/new-jenkinsfile 41a765437 -> f440a9335 enable the full matrix of jdks Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/f440a933 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/f440a933 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/f440a933 Branch: refs/heads/new-jenkinsfile Commit: f440a9335204f0ed58639b109dbbaa5e322bf897 Parents: 41a7654 Author: Stephen ConnollyAuthored: Thu Nov 30 22:01:16 2017 + Committer: Stephen Connolly Committed: Thu Nov 30 22:01:16 2017 + -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/f440a933/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index d9f2bfa..09ac70f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,4 +17,4 @@ * under the License. */ -asfMavenTlpStdBuild(jdks:['8']) +asfMavenTlpStdBuild()
maven-surefire git commit: ok so surefire is now java 8+ only
Repository: maven-surefire Updated Branches: refs/heads/new-jenkinsfile f440a9335 -> 2cb2bd39c ok so surefire is now java 8+ only Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/2cb2bd39 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/2cb2bd39 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/2cb2bd39 Branch: refs/heads/new-jenkinsfile Commit: 2cb2bd39c69b199a0542195d650eaecc951858c3 Parents: f440a93 Author: Stephen ConnollyAuthored: Thu Nov 30 22:03:07 2017 + Committer: Stephen Connolly Committed: Thu Nov 30 22:03:07 2017 + -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/2cb2bd39/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 09ac70f..8c7d48e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,4 +17,4 @@ * under the License. */ -asfMavenTlpStdBuild() +asfMavenTlpStdBuild(jdks:[8,9])
maven-surefire git commit: surefire is actually just java 8 for the build... that seems not good
Repository: maven-surefire Updated Branches: refs/heads/new-jenkinsfile 2cb2bd39c -> e2ad8e9b3 surefire is actually just java 8 for the build... that seems not good Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/e2ad8e9b Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/e2ad8e9b Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/e2ad8e9b Branch: refs/heads/new-jenkinsfile Commit: e2ad8e9b37b0ba04ac49e6e991b174014088dc02 Parents: 2cb2bd3 Author: Stephen ConnollyAuthored: Thu Nov 30 22:05:43 2017 + Committer: Stephen Connolly Committed: Thu Nov 30 22:05:43 2017 + -- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/e2ad8e9b/Jenkinsfile -- diff --git a/Jenkinsfile b/Jenkinsfile index 8c7d48e..2437c1c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,4 +17,4 @@ * under the License. */ -asfMavenTlpStdBuild(jdks:[8,9]) +asfMavenTlpStdBuild(jdk:[8])
[maven-release] branch master updated: Add Apache license header (a tad ridiculous)
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-release.git The following commit(s) were added to refs/heads/master by this push: new 44d3344 Add Apache license header (a tad ridiculous) 44d3344 is described below commit 44d3344f4d8b985dd4b35e8bbfce80c5c70c6d1e Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Mon Nov 27 09:01:20 2017 + Add Apache license header (a tad ridiculous) --- Jenkinsfile | 19 +++ 1 file changed, 19 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 35f02a9..09ac70f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1 +1,20 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + asfMavenTlpStdBuild() -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-parent] branch master updated: Adding Jenkinsfile
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-parent.git The following commit(s) were added to refs/heads/master by this push: new 3b86a32 Adding Jenkinsfile 3b86a32 is described below commit 3b86a32caea79885c6c4d3c6f9184b19ced0442f Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Mon Nov 27 09:04:24 2017 + Adding Jenkinsfile --- Jenkinsfile | 20 1 file changed, 20 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000..09ac70f --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,20 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +asfMavenTlpStdBuild() -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-dist-tool] branch master updated: Add Jenkinsfile
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-dist-tool.git The following commit(s) were added to refs/heads/master by this push: new 5484043 Add Jenkinsfile 5484043 is described below commit 54840431404c1f6309ede4b4905f37e99d62724b Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Mon Nov 27 09:20:50 2017 + Add Jenkinsfile --- Jenkinsfile | 20 1 file changed, 20 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000..09ac70f --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,20 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +asfMavenTlpStdBuild() -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-doxia-sitetools] branch master updated: Add Jenkinsfile
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git The following commit(s) were added to refs/heads/master by this push: new 5770edb Add Jenkinsfile 5770edb is described below commit 5770edb24b6f0ac45e50f6540c90479b534fdc29 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Mon Nov 27 09:23:37 2017 + Add Jenkinsfile --- Jenkinsfile | 20 1 file changed, 20 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000..09ac70f --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,20 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +asfMavenTlpStdBuild() -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-doxia-linkcheck] branch master updated: Add Jenkinsfile
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-doxia-linkcheck.git The following commit(s) were added to refs/heads/master by this push: new 0f28b65 Add Jenkinsfile 0f28b65 is described below commit 0f28b6501b54a59dec3f9712d59e7d420ddec782 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Mon Nov 27 09:23:07 2017 + Add Jenkinsfile --- Jenkinsfile | 20 1 file changed, 20 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000..09ac70f --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,20 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +asfMavenTlpStdBuild() -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-doxia] branch master updated: Add Jenkinsfile
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-doxia.git The following commit(s) were added to refs/heads/master by this push: new ae31b84 Add Jenkinsfile ae31b84 is described below commit ae31b84d575b6df8c0a4c9b786152820307f25be Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Mon Nov 27 09:26:11 2017 + Add Jenkinsfile --- Jenkinsfile | 20 1 file changed, 20 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000..09ac70f --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,20 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +asfMavenTlpStdBuild() -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-fluido-skin] branch master updated: Add Jenkinsfile
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git The following commit(s) were added to refs/heads/master by this push: new cc3e35a Add Jenkinsfile cc3e35a is described below commit cc3e35a45ec33b7d99a176159e3dc499b87ab961 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Mon Nov 27 09:29:14 2017 + Add Jenkinsfile --- Jenkinsfile | 20 1 file changed, 20 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000..09ac70f --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,20 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +asfMavenTlpStdBuild() -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-enforcer] branch master updated: Add Jenkinsfile
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git The following commit(s) were added to refs/heads/master by this push: new 91f57bb Add Jenkinsfile 91f57bb is described below commit 91f57bbd86e670f07aa4bd262decce19a78d0857 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Mon Nov 27 09:28:48 2017 + Add Jenkinsfile --- Jenkinsfile | 20 1 file changed, 20 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000..09ac70f --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,20 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +asfMavenTlpStdBuild() -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-jxr] branch master updated: Add Jenkinsfile
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-jxr.git The following commit(s) were added to refs/heads/master by this push: new a3de9bd Add Jenkinsfile a3de9bd is described below commit a3de9bd420225d06c6a9bd5a8b50bbe90fa03055 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Mon Nov 27 09:29:37 2017 + Add Jenkinsfile --- Jenkinsfile | 20 1 file changed, 20 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000..09ac70f --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,20 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +asfMavenTlpStdBuild() -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-default-skin] branch master updated: Add Jenkinsfile
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-default-skin.git The following commit(s) were added to refs/heads/master by this push: new fff7b5d Add Jenkinsfile fff7b5d is described below commit fff7b5dfc2a15c590307e16cd60f565261aa3b23 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Mon Nov 27 09:18:26 2017 + Add Jenkinsfile --- Jenkinsfile | 20 1 file changed, 20 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000..09ac70f --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,20 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +asfMavenTlpStdBuild() -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].
[maven-apache-parent] branch master updated: Add Jenkinsfile
This is an automated email from the ASF dual-hosted git repository. stephenc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-apache-parent.git The following commit(s) were added to refs/heads/master by this push: new e0a8388 Add Jenkinsfile e0a8388 is described below commit e0a8388a5e2e9bbb0f7e49ba276dbfc2ac59f759 Author: Stephen Connolly <stephen.alan.conno...@gmail.com> AuthorDate: Mon Nov 27 09:17:50 2017 + Add Jenkinsfile --- Jenkinsfile | 20 1 file changed, 20 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000..09ac70f --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,20 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +asfMavenTlpStdBuild() -- To stop receiving notification emails like this one, please contact ['"commits@maven.apache.org" <commits@maven.apache.org>'].