You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/04/25 16:01:38 UTC

[maven] branch runITsWithJavaEA updated (4cc44f2 -> c6d34fd)

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a change to branch runITsWithJavaEA
in repository https://gitbox.apache.org/repos/asf/maven.git.


 discard 4cc44f2  Build with Java 15
     add 9f070e7  [MNG-6866] extract methods, apply SLA, introduce mass mojo adding
     add 2628d71  [MNG-6882] - Change the URL's in tests etc. from http to https
     add b962ff3  [MNG-5577] Simplify tests to reduce use of wiring.
     add d420774  [MNG-5577] Don't use LegacyRepositoryLayout in tests.
     add 9567da2  [MNG-5577] Convert maven-core to JSR 330
     add c423a09  [MNG-6867] extract methods, apply SLA
     add d127bce  Revert "[MNG-6867] extract methods, apply SLA"
     add bf7b99a  [MNG-6884] - Cleanup POM File after version upgrade
     add af1bf4c  [MNG-6886] upgrade plexus-cipher to 1.8 and update changed groupId (#335)
     add 8f6e02f  update xmlunit (#336)
     add 0efaf46  README improvement
     add e22b055  added Jira badge
     add ec92934  [MNG-4660] --resume-from flag resolves inter-module dependencies
     add f6c07d9  [MNG-6863] --also-make is being ignored when calling --resume-from
     add ca62152  apache-rat-plugin - section not needed after upgrading the parent pom
     new c6d34fd  Build with Java 15

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (4cc44f2)
            \
             N -- N -- N   refs/heads/runITsWithJavaEA (c6d34fd)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README.md                                          |  14 +-
 apache-maven/pom.xml                               |   4 +
 maven-compat/pom.xml                               |   5 +
 .../factory/DefaultArtifactFactoryTest.java        |  10 +
 .../transform/TransformationManagerTest.java       |  10 +
 .../project/AbstractMavenProjectTestCase.java      |   2 +-
 .../apache/maven/project/ProjectClasspathTest.java |  13 +-
 .../apache/maven/project/TestProjectBuilder.java   |  28 --
 .../maven/repository/LegacyRepositoryLayout.java   |  89 -------
 .../repository/legacy/DefaultWagonManagerTest.java |  10 +
 .../resolver/DefaultArtifactCollectorTest.java     |  10 +
 .../conflict/AbstractConflictResolverTest.java     |  10 +
 .../DefaultGraphConflictResolutionPolicyTest.java  |   7 +-
 maven-core/pom.xml                                 |   3 +-
 .../main/java/org/apache/maven/DefaultMaven.java   |  28 +-
 .../maven/DefaultProjectDependenciesResolver.java  |  13 +-
 .../main/java/org/apache/maven/ReactorReader.java  | 105 +++++++-
 .../artifact/factory/DefaultArtifactFactory.java   |  11 +-
 .../artifact/handler/DefaultArtifactHandler.java   |   6 +-
 .../manager/DefaultArtifactHandlerManager.java     |  11 +-
 .../repository/layout/DefaultRepositoryLayout.java |   7 +-
 .../metadata/io/DefaultMetadataReader.java         |   7 +-
 .../resolver/DefaultResolutionErrorHandler.java    |   6 +-
 .../apache/maven/bridge/MavenRepositorySystem.java |  23 +-
 .../internal/DefaultBeanConfigurator.java          |   7 +-
 .../eventspy/internal/EventSpyDispatcher.java      |  13 +-
 .../maven/exception/DefaultExceptionHandler.java   |   7 +-
 .../DefaultMavenExecutionRequestPopulator.java     |   2 +
 .../org/apache/maven/execution/MavenSession.java   |   2 +-
 .../apache/maven/graph/DefaultGraphBuilder.java    | 148 ++++++-----
 .../maven/lifecycle/DefaultLifecycleExecutor.java  |  33 +--
 .../apache/maven/lifecycle/DefaultLifecycles.java  |  13 +-
 .../lifecycle/internal/BuildListCalculator.java    |  15 +-
 .../internal/DefaultExecutionEventCatapult.java    |   7 +-
 .../DefaultLifecycleExecutionPlanCalculator.java   |  26 +-
 .../internal/DefaultLifecycleMappingDelegate.java  |  18 +-
 .../internal/DefaultLifecyclePluginAnalyzer.java   |  16 +-
 .../DefaultLifecycleTaskSegmentCalculator.java     |  21 +-
 .../internal/DefaultMojoExecutionConfigurator.java |   7 +-
 .../lifecycle/internal/LifecycleDebugLogger.java   |  23 +-
 .../lifecycle/internal/LifecycleModuleBuilder.java |  23 +-
 .../internal/LifecyclePluginResolver.java          |  17 +-
 .../maven/lifecycle/internal/LifecycleStarter.java |  25 +-
 .../lifecycle/internal/MojoDescriptorCreator.java  |  27 +-
 .../maven/lifecycle/internal/MojoExecutor.java     |  35 +--
 .../lifecycle/internal/builder/BuilderCommon.java  |  21 +-
 .../multithreaded/MultiThreadedBuilder.java        |  13 +-
 .../singlethreaded/SingleThreadedBuilder.java      |  18 +-
 .../plugin/DefaultLifecycleBindingsInjector.java   |  11 +-
 .../maven/plugin/DefaultBuildPluginManager.java    |  21 +-
 .../maven/plugin/DefaultExtensionRealmCache.java   |   7 +-
 .../maven/plugin/DefaultPluginArtifactsCache.java  |   7 +-
 .../maven/plugin/DefaultPluginDescriptorCache.java |   7 +-
 .../maven/plugin/DefaultPluginRealmCache.java      |   7 +-
 .../plugin/internal/DefaultLegacySupport.java      |   8 +-
 .../plugin/internal/DefaultMavenPluginManager.java |  31 ++-
 .../DefaultPluginDependenciesResolver.java         |  13 +-
 .../plugin/internal/DefaultPluginManager.java      |  23 +-
 .../internal/DefaultPluginPrefixResolver.java      |  19 +-
 .../internal/DefaultPluginVersionResolver.java     |  19 +-
 .../maven/project/DefaultMavenProjectHelper.java   |  18 +-
 .../maven/project/DefaultProjectBuilder.java       |  25 +-
 .../project/DefaultProjectBuildingHelper.java      |  21 +-
 .../DefaultProjectDependenciesResolver.java        |  15 +-
 .../maven/project/DefaultProjectRealmCache.java    |   7 +-
 .../artifact/DefaultMavenMetadataCache.java        |   7 +-
 .../project/artifact/DefaultMetadataSource.java    |   7 +-
 .../artifact/DefaultProjectArtifactsCache.java     |   7 +-
 .../project/artifact/MavenMetadataSource.java      |  32 ++-
 .../rtinfo/internal/DefaultRuntimeInformation.java |  11 +-
 .../settings/DefaultMavenSettingsBuilder.java      |  11 +-
 .../maven/toolchain/DefaultToolchainManager.java   |  13 +-
 .../toolchain/DefaultToolchainManagerPrivate.java  |   7 +-
 .../maven/toolchain/DefaultToolchainsBuilder.java  |  11 +-
 .../maven/toolchain/java/JavaToolchainFactory.java |  11 +-
 .../configuration/DefaultBeanConfiguratorTest.java |   8 +-
 .../maven/graph/DefaultGraphBuilderTest.java       | 290 +++++++++++++++++++++
 .../maven/lifecycle/DefaultLifecyclesTest.java     |  10 +
 .../apache/maven/project/PomConstructionTest.java  | 114 ++++----
 .../apache/maven/project/TestMetadataSource.java   |  10 +-
 .../artifact/DefaultMavenMetadataCacheTest.java    |   2 +-
 .../artifact/DefaultProjectArtifactsCacheTest.java |   7 +-
 .../maven/repository/LegacyRepositoryLayout.java   |  89 -------
 .../repository/TestRepositoryConnectorFactory.java |   7 +-
 .../maven/repository/TestRepositorySystem.java     |  22 +-
 .../internal/DefaultRuntimeInformationTest.java    |  11 +
 .../artifact-id-inheritance/child/pom.xml          |   2 +-
 .../artifact-id-inheritance/pom.xml                |   4 +-
 .../basedir-aligned-interpolation/pom.xml          |   2 +-
 .../pom-with-unusual-name.xml                      |   2 +-
 .../baseuri-interpolation/pom.xml                  |   2 +-
 .../boolean-interpolation/pom.xml                  |   2 +-
 .../build-extension-inheritance/pom.xml            |   2 +-
 .../build-extension-inheritance/sub/pom.xml        |   2 +-
 .../complete-model/w-parent/pom.xml                |   2 +-
 .../complete-model/w-parent/sub/pom.xml            |  34 +--
 .../complete-model/wo-parent/pom.xml               |  34 +--
 .../contributors-inheritance/child-2/pom.xml       |   2 +-
 .../contributors-inheritance/pom.xml               |   2 +-
 .../dependency-inheritance/maven-parent.xml        |   2 +-
 .../dependency-inheritance/pom.xml                 |   2 +-
 .../dependency-inheritance/sub/pom.xml             |   2 +-
 .../dependency-order/w-plugin-mgmt/pom.xml         |   2 +-
 .../dependency-order/wo-plugin-mgmt/pom.xml        |   2 +-
 .../developers-inheritance/child-2/pom.xml         |   2 +-
 .../developers-inheritance/pom.xml                 |   2 +-
 .../distribution-management/pom.xml                |   2 +-
 .../resources-project-builder/empty-scm/pom.xml    |   2 +-
 .../equal-plugin-deps/pom.xml                      |   2 +-
 .../equal-plugin-exec-ids/pom.xml                  |   2 +-
 .../full-interpolation/pom.xml                     |   2 +-
 .../pom.xml                                        |   4 +-
 .../sub/pom.xml                                    |   2 +-
 .../active-profile/pom.xml                         |   2 +-
 .../active-profile/sub/pom.xml                     |   2 +-
 .../no-profile/pom.xml                             |   2 +-
 .../no-profile/sub/pom.xml                         |   2 +-
 .../interpolation-cli-wins/pom.xml                 |   2 +-
 .../jdk-activation/pom.xml                         |   2 +-
 .../join-different-containers-same-id/pom.xml      |   2 +-
 .../licenses-inheritance/child-2/pom.xml           |   4 +-
 .../licenses-inheritance/pom.xml                   |   4 +-
 .../limited-inheritance/child/pom.xml              |   6 +-
 .../limited-inheritance/pom.xml                    |  10 +-
 .../mailing-lists-inheritance/child-2/pom.xml      |   2 +-
 .../mailing-lists-inheritance/pom.xml              |   2 +-
 .../managed-profile-dependency/pom.xml             |   2 +-
 .../managed-profile-dependency/sub/pom.xml         |   2 +-
 .../merged-filter-order/pom.xml                    |   2 +-
 .../merged-filter-order/sub/pom.xml                |   2 +-
 .../w-plugin-mgmt/pom.xml                          |   2 +-
 .../w-plugin-mgmt/sub/pom.xml                      |   2 +-
 .../wo-plugin-mgmt/pom.xml                         |   2 +-
 .../wo-plugin-mgmt/sub/pom.xml                     |   2 +-
 .../w-plugin-mgmt/pom.xml                          |   2 +-
 .../w-plugin-mgmt/sub/pom.xml                      |   2 +-
 .../wo-plugin-mgmt/pom.xml                         |   2 +-
 .../wo-plugin-mgmt/sub/pom.xml                     |   2 +-
 .../merged-plugin-exec-order/w-plugin-mgmt/pom.xml |   2 +-
 .../w-plugin-mgmt/sub/pom.xml                      |   2 +-
 .../wo-plugin-mgmt/pom.xml                         |   2 +-
 .../wo-plugin-mgmt/sub/pom.xml                     |   2 +-
 .../resources-project-builder/micromailer/pom.xml  |   2 +-
 .../micromailer/spice-parent-9.pom                 |   2 +-
 .../multiple-repos/pom.xml                         |   4 +-
 .../multiple-repos/sub/pom.xml                     |   4 +-
 .../nested-build-dir-interpolation/pom.xml         |   2 +-
 .../parent-pom-packaging/pom.xml                   |   2 +-
 .../parent-pom-packaging/sub/pom.xml               |   2 +-
 .../platform-file-separator/pom.xml                |   2 +-
 .../plugin-config-append/no-profile/pom.xml        |   2 +-
 .../no-profile/subproject/pom.xml                  |   2 +-
 .../plugin-config-append/with-profile/pom.xml      |   2 +-
 .../with-profile/subproject/pom.xml                |   2 +-
 .../plugin-config-attributes/w-plugin-mgmt/pom.xml |   2 +-
 .../plugin-config-attributes/w-profile/pom.xml     |   2 +-
 .../wo-plugin-mgmt/pom.xml                         |   2 +-
 .../plugin-config-merging/child/pom.xml            |   2 +-
 .../plugin-config-merging/pom.xml                  |   2 +-
 .../plugin-config-order/w-plugin-mgmt/pom.xml      |   2 +-
 .../plugin-config-order/wo-plugin-mgmt/pom.xml     |   2 +-
 .../plugin-exec-config-order/w-plugin-mgmt/pom.xml |   2 +-
 .../wo-plugin-mgmt/pom.xml                         |   2 +-
 .../plugin-exec-goals-order/w-plugin-mgmt/pom.xml  |   2 +-
 .../plugin-exec-goals-order/wo-plugin-mgmt/pom.xml |   2 +-
 .../plugin-exec-inheritance/pom.xml                |   2 +-
 .../plugin-exec-inheritance/w-merge/pom.xml        |   2 +-
 .../plugin-exec-inheritance/wo-merge/pom.xml       |   2 +-
 .../pom.xml                                        |   2 +-
 .../sub/pom.xml                                    |   2 +-
 .../plugin-exec-merging-wo-version/pom.xml         |   2 +-
 .../plugin-exec-merging-wo-version/sub/pom.xml     |   2 +-
 .../plugin-exec-merging/w-plugin-mgmt/pom.xml      |   2 +-
 .../plugin-exec-merging/w-plugin-mgmt/sub/pom.xml  |   2 +-
 .../plugin-exec-merging/wo-plugin-mgmt/pom.xml     |   2 +-
 .../plugin-exec-merging/wo-plugin-mgmt/sub/pom.xml |   2 +-
 .../plugin-exec-order-and-default-exec/pom.xml     |   2 +-
 .../plugin-exec-order-with-lifecycle/pom.xml       |   2 +-
 .../plugin-exec-order/w-plugin-mgmt/pom.xml        |   2 +-
 .../plugin-exec-order/wo-plugin-mgmt/pom.xml       |   2 +-
 .../plugin-exec-w-and-wo-id/w-plugin-mgmt/pom.xml  |   2 +-
 .../plugin-exec-w-and-wo-id/wo-plugin-mgmt/pom.xml |   2 +-
 .../plugin-inheritance-merge-order/pom.xml         |   2 +-
 .../plugin-inheritance-merge-order/sub/pom.xml     |   2 +-
 .../plugin-inheritance-order/child/pom.xml         |   2 +-
 .../plugin-inheritance-order/pom.xml               |   2 +-
 .../plugin-injection-merge-order/pom.xml           |   2 +-
 .../plugin-management-duplicate/pom.xml            |   2 +-
 .../plugin-management-duplicate/sub/pom.xml        |   2 +-
 .../child/pom.xml                                  |   2 +-
 .../plugin-management-for-implicit-plugin/pom.xml  |   2 +-
 .../plugin-management-inheritance/pom.xml          |   2 +-
 .../pom-encoding/latin-1/pom.xml                   |   2 +-
 .../pom-encoding/utf-8/pom.xml                     |   2 +-
 .../pom-inheritance/pom.xml                        |  22 +-
 .../pom-inheritance/sub/pom.xml                    |   2 +-
 .../prerequisites-inheritance/child/pom.xml        |   2 +-
 .../prerequisites-inheritance/pom.xml              |   2 +-
 .../profile-dependencies-multiple-profiles/pom.xml |   2 +-
 .../profile-injected-dependencies/pom.xml          |   2 +-
 .../profile-injection-order/pom.xml                |   2 +-
 .../profile-plugin-mng-dependencies/pom.xml        |   2 +-
 .../profile-plugin-mng-dependencies/sub/pom.xml    |   2 +-
 .../profile-plugins/pom.xml                        |   2 +-
 .../profile-properties-interpolation/pom.xml       |   4 +-
 .../properties-inheritance/pom.xml                 |   2 +-
 .../properties-inheritance/sub/pom.xml             |   2 +-
 .../repo-inheritance/pom.xml                       |   2 +-
 .../reporting-plugin-config/pom.xml                |   2 +-
 .../reporting-plugin-config/sub/pom.xml            |   2 +-
 .../system-property-interpolation/pom.xml          |   2 +-
 .../resources-project-builder/unc-path/pom.xml     |   2 +-
 .../resources-project-builder/unc-path/sub/pom.xml |   2 +-
 .../dep-mgmt-in-profile/pom.xml                    |   2 +-
 .../unique-dependency-key/dep-mgmt/pom.xml         |   2 +-
 .../unique-dependency-key/deps-in-profile/pom.xml  |   2 +-
 .../unique-dependency-key/deps/pom.xml             |   2 +-
 .../artifact-repo-in-profile/pom.xml               |   6 +-
 .../unique-repo-id/artifact-repo/pom.xml           |   6 +-
 .../unique-repo-id/plugin-repo-in-profile/pom.xml  |   6 +-
 .../unique-repo-id/plugin-repo/pom.xml             |   6 +-
 .../child/pom.xml                                  |  14 +-
 .../unprefixed-expression-interpolation/pom.xml    |   2 +-
 .../url-append/child/pom.xml                       |   2 +-
 .../url-append/parent/pom.xml                      |  10 +-
 .../url-inheritance/another-parent/pom.xml         |   2 +-
 .../url-inheritance/another-parent/sub/pom.xml     |   2 +-
 .../url-inheritance/pom.xml                        |  24 +-
 .../url-inheritance/sub/pom.xml                    |   2 +-
 .../url-no-decoding/pom.xml                        |  10 +-
 .../xml-coalesce-text/pom.xml                      |   2 +-
 .../xml-markup-interpolation/pom.xml               |   2 +-
 .../xml-whitespace/pom.xml                         |   2 +-
 .../xml-whitespace/sub/pom.xml                     |   2 +-
 maven-embedder/pom.xml                             |   2 +-
 .../java/org/apache/maven/cli/MavenCliTest.java    |  19 +-
 .../maven/plugin/descriptor/PluginDescriptor.java  |  10 +
 .../plugin/descriptor/PluginDescriptorBuilder.java | 128 ++++++---
 pom.xml                                            |  88 +++----
 239 files changed, 1596 insertions(+), 1038 deletions(-)
 delete mode 100644 maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java
 create mode 100644 maven-core/src/test/java/org/apache/maven/graph/DefaultGraphBuilderTest.java
 delete mode 100644 maven-core/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java


[maven] 01/01: Build with Java 15

Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch runITsWithJavaEA
in repository https://gitbox.apache.org/repos/asf/maven.git

commit c6d34fd2ebd44b2f151e2cb037d43ff8452de460
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Sep 28 22:01:14 2019 +0200

    Build with Java 15
---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 313fbb8..ca84c18 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,10 +20,10 @@
 properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'5':'1'))])
 
 def buildOs = 'linux'
-def buildJdk = '8'
+def buildJdk = '15'
 def buildMvn = '3.6.2'
 def runITsOses = ['linux', 'windows']
-def runITsJdks = ['8', '11', '14', '15']
+def runITsJdks = ['15']
 def runITsMvn = '3.6.2'
 def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V" // -DmavenDistro=... -Dmaven.test.failure.ignore=true
 def tests