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/02 20:44:58 UTC
[maven] branch MNG-6845 updated (59d9e41 -> bd31f61)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-6845
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 59d9e41 [MNG-6845] Upgrade to apache-rat-plugin 0.13
add cdb2cd0 [MNG-6071] Normalize relative paths for working directory
add 720e46d Revert "[MNG-5587] When the build fails emit any errors without the user having to specify -e or -X"
add 45076f3 Improve license handling
add 35658fd Run Integration Tests with Java 8, 11, 13 and 14
add 716cc1f [MNG-5669] same pom.xml is read multiple times
add b0d2846 [MNG-6859] Build not reproducible when built from source release
add d9bf929 [MNG-6562] added WARNING on default bindings plugins unlocked versions
add 9ae008a use https://repository.a.o/ for Apache SNAPSHOT plugins
add f2e9afd Refactor getLocalRepository() in tests by using the repositorySystem
add d204f02 [MNG-6874] - Upgrade Maven Parent to 34
add 9e92a93 [MNG-6872] - Found CVEs in your dependencies - plexus-utils (tests)
add 5cdb833 [MNG-5669] Fix infinitive loop in case pom.xml is being updated during the process (e.g. maven-shade-plugin writing reduced-pom with excluded dependencies)
add c548ce5 Adjust JDKs in Jenkinsfile
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
new bd31f61 [MNG-6845] Upgrade to apache-rat-plugin 0.13
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 (59d9e41)
\
N -- N -- N refs/heads/MNG-6845 (bd31f61)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 6 +-
apache-maven/pom.xml | 8 +-
.../main/appended-resources/META-INF/LICENSE.vm | 19 +-
.../licenses/{ASL-2.0.txt => Apache-2.0.txt} | 0
apache-maven/src/main/assembly/component.xml | 1 +
.../java/org/apache/maven/building/FileSource.java | 31 +++
.../org/apache/maven/building/StringSource.java | 33 ++-
.../java/org/apache/maven/building/UrlSource.java | 32 ++-
.../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 | 41 +---
.../main/java/org/apache/maven/DefaultMaven.java | 28 +--
.../maven/DefaultProjectDependenciesResolver.java | 13 +-
.../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 +
.../apache/maven/graph/DefaultGraphBuilder.java | 13 +-
.../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 | 47 ++++-
.../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 +-
.../apache/maven/project/ReactorModelCache.java | 78 ++++++-
.../artifact/DefaultMavenMetadataCache.java | 7 +-
.../project/artifact/DefaultMetadataSource.java | 7 +-
.../artifact/DefaultProjectArtifactsCache.java | 7 +-
.../project/artifact/MavenMetadataSource.java | 23 ++-
.../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/lifecycle/DefaultLifecyclesTest.java | 10 +
.../project/AbstractMavenProjectTestCase.java | 7 +-
.../project/DefaultMavenProjectBuilderTest.java | 6 +-
.../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 +
.../test/projects/project-builder/MNG-6723/pom.xml | 38 ++++
.../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 | 4 +-
.../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 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 1 +
.../java/org/apache/maven/cli/ResolveFile.java | 3 +-
.../java/org/apache/maven/cli/MavenCliTest.java | 19 +-
.../maven/model/building/ArtifactModelSource.java | 27 ++-
.../maven/model/building/DefaultModelBuilder.java | 223 ++++++++++++++++-----
.../maven/model/building/FileModelSource.java | 9 +-
.../apache/maven/model/building/ModelCache.java | 29 +++
.../apache/maven/model/building/ModelCacheTag.java | 26 +++
.../model/superpom/DefaultSuperPomProvider.java | 2 +-
.../maven/plugin/descriptor/PluginDescriptor.java | 10 +
.../plugin/descriptor/PluginDescriptorBuilder.java | 128 ++++++++----
.../internal/DefaultArtifactDescriptorReader.java | 7 +-
.../repository/internal/DefaultModelResolver.java | 7 +-
pom.xml | 2 +-
254 files changed, 1579 insertions(+), 1072 deletions(-)
rename apache-maven/src/main/appended-resources/licenses/{ASL-2.0.txt => Apache-2.0.txt} (100%)
delete mode 100644 maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java
delete mode 100644 maven-core/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java
copy maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java => maven-model-builder/src/main/java/org/apache/maven/model/building/ArtifactModelSource.java (69%)
[maven] 01/01: [MNG-6845] Upgrade to apache-rat-plugin 0.13
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-6845
in repository https://gitbox.apache.org/repos/asf/maven.git
commit bd31f6190dd9f0925592fc7503acc145c47f94c1
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri Jan 10 10:22:57 2020 +0100
[MNG-6845] Upgrade to apache-rat-plugin 0.13
---
pom.xml | 26 +-------------------------
1 file changed, 1 insertion(+), 25 deletions(-)
diff --git a/pom.xml b/pom.xml
index ef2764d..6c00a53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -544,6 +544,7 @@ under the License.
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <version>0.13</version>
<configuration>
<excludes>
<exclude>.asf.yaml</exclude>
@@ -559,31 +560,6 @@ under the License.
</excludes>
</configuration>
</plugin>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <versionRange>[0.10,)</versionRange>
- <goals>
- <goal>check</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
<plugins>