[maven-enforcer] 06/13: Merge tag 'upstream/1.4.1'
Markus Koschany
apo at moszumanska.debian.org
Mon Oct 10 20:31:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository maven-enforcer.
commit 1659bb95980c58d6d622684fd7a99f5abb21d697
Merge: e52af2f 94d5cbe
Author: Markus Koschany <apo at debian.org>
Date: Mon Oct 10 20:58:49 2016 +0200
Merge tag 'upstream/1.4.1'
Upstream version 1.4.1
# gpg: Signatur vom Mo 10 Okt 2016 20:58:48 CEST
# gpg: mittels RSA-Schlüssel D9AD14B9513B51E4
# gpg: Korrekte Signatur von "Markus Koschany <apo at gambaru.de>" [ultimativ]
# gpg: alias "Markus Koschany <markus at koschany.net>" [ultimativ]
# gpg: alias "Markus Koschany <apo at debian.org>" [ultimativ]
maven-enforcer-plugin/LICENSE => LICENSE | 178 +-------
NOTICE | 5 +
README.TXT | 24 ++
deploySite.bat | 21 +
deploySite.sh | 23 +
enforcer-api/pom.xml | 30 +-
enforcer-api/src/custom-rule-sample/pom.xml | 19 +
.../apache/maven/enforcer/rule/MyCustomRule.java | 19 +
.../src/custom-rule-sample/src/usage-pom.xml | 20 +
enforcer-api/src/custom-rule-sample/usage-pom.xml | 20 +
.../src/main/assembly/custom-rule-sample.xml | 24 +-
.../maven/enforcer/rule/api/EnforcerLevel.java | 30 +-
.../maven/enforcer/rule/api/EnforcerRule.java | 10 +-
.../maven/enforcer/rule/api/EnforcerRule2.java | 23 +-
.../enforcer/rule/api/EnforcerRuleException.java | 1 -
.../enforcer/rule/api/EnforcerRuleHelper.java | 11 +-
.../src/site/apt/writing-a-custom-rule.apt.vm | 4 +-
enforcer-rules/pom.xml | 26 +-
.../plugins/enforcer/AbstractBanDependencies.java | 112 +++--
.../enforcer/AbstractPropertyEnforcerRule.java | 150 +++++++
.../plugins/enforcer/AbstractRequireFiles.java | 54 ++-
.../enforcer/AbstractStandardEnforcerRule.java | 41 +-
.../plugins/enforcer/AbstractVersionEnforcer.java | 46 +-
.../apache/maven/plugins/enforcer/AlwaysFail.java | 4 +-
.../apache/maven/plugins/enforcer/AlwaysPass.java | 5 +-
.../enforcer/BanDistributionManagement.java | 151 +++++++
.../BanDuplicatePomDependencyVersions.java | 217 ++++++++++
.../enforcer/BanTransitiveDependencies.java | 202 +++++++++
.../maven/plugins/enforcer/BannedDependencies.java | 176 ++++----
.../maven/plugins/enforcer/BannedPlugins.java | 3 +-
.../maven/plugins/enforcer/BannedRepositories.java | 221 ++++++++++
.../enforcer/DefaultEnforcementRuleHelper.java | 10 +-
.../plugins/enforcer/DependencyConvergence.java | 316 ++++++++------
.../enforcer/EnforcerExpressionEvaluator.java | 27 +-
.../maven/plugins/enforcer/EvaluateBeanshell.java | 25 +-
.../apache/maven/plugins/enforcer/NoSnapshots.java | 12 +-
.../plugins/enforcer/ReactorModuleConvergence.java | 478 +++++++++++++++++++++
.../plugins/enforcer/RequireActiveProfile.java | 77 ++--
.../enforcer/RequireEnvironmentVariable.java | 91 ++++
.../plugins/enforcer/RequireFilesDontExist.java | 2 +-
.../maven/plugins/enforcer/RequireFilesExist.java | 2 +-
.../maven/plugins/enforcer/RequireFilesSize.java | 72 ++--
.../maven/plugins/enforcer/RequireJavaVersion.java | 24 +-
.../plugins/enforcer/RequireMavenVersion.java | 4 +-
.../plugins/enforcer/RequireNoRepositories.java | 106 +++--
.../apache/maven/plugins/enforcer/RequireOS.java | 114 +++--
.../plugins/enforcer/RequirePluginVersions.java | 354 ++++++++-------
.../plugins/enforcer/RequirePrerequisite.java | 134 ++++++
.../maven/plugins/enforcer/RequireProperty.java | 68 ++-
.../maven/plugins/enforcer/RequireReleaseDeps.java | 84 ++--
.../plugins/enforcer/RequireReleaseVersion.java | 16 +-
.../plugins/enforcer/RequireSameVersions.java | 129 ++++++
.../plugins/enforcer/RequireUpperBoundDeps.java | 378 ++++++++++++++++
.../plugins/enforcer/utils/ArtifactMatcher.java | 219 ++++++++++
.../enforcer/utils/DependencyVersionMap.java | 176 ++++----
.../utils/DistributionManagementCheck.java | 87 ++++
.../plugins/enforcer/utils/EnforcerRuleUtils.java | 106 +++--
.../plugins/enforcer/utils/PluginWrapper.java | 18 +-
enforcer-rules/src/site/apt/Images.odp | Bin 0 -> 13598 bytes
.../src/site/apt/banDistributionManagement.apt.vm | 174 ++++++++
...ies.apt.vm => banTransitiveDependencies.apt.vm} | 58 ++-
.../src/site/apt/bannedDependencies.apt.vm | 51 ++-
...requireProperty.apt.vm => bannedPlugins.apt.vm} | 56 +--
.../src/site/apt/bannedRepositories.apt.vm | 119 +++++
.../src/site/apt/dependencyConvergence.apt.vm | 34 +-
enforcer-rules/src/site/apt/index.apt | 46 +-
.../src/site/apt/reactorModuleConvergence.apt.vm | 257 +++++++++++
...Property.apt.vm => requireActiveProfile.apt.vm} | 70 ++-
...on.apt.vm => requireEnvironmentVariable.apt.vm} | 29 +-
.../src/site/apt/requireJavaVersion.apt.vm | 6 +-
.../src/site/apt/requireMavenVersion.apt.vm | 8 +-
.../src/site/apt/requireNoRepositories.apt.vm | 58 +--
enforcer-rules/src/site/apt/requireOS.apt.vm | 10 +-
.../src/site/apt/requirePluginVersions.apt.vm | 4 +-
.../src/site/apt/requirePrerequisite.apt.vm | 74 ++++
enforcer-rules/src/site/apt/requireProperty.apt.vm | 26 +-
.../src/site/apt/requireSameVersions.apt.vm | 86 ++++
...ergence.apt.vm => requireUpperBoundDeps.apt.vm} | 79 ++--
.../src/site/resources/images/module.png | Bin 0 -> 16967 bytes
.../site/resources/images/root-with-modules.png | Bin 0 -> 10294 bytes
.../images/root-with-parent-and-modules.png | Bin 0 -> 16919 bytes
.../src/site/resources/images/root-with-parent.png | Bin 0 -> 10154 bytes
enforcer-rules/src/site/resources/images/root.png | Bin 0 -> 3588 bytes
.../enforcer/BanDistributionManagementTest.java | 285 ++++++++++++
.../enforcer/BannedDependenciesTestSetup.java | 109 +++++
.../maven/plugins/enforcer/EnforcerTestUtils.java | 5 +-
.../maven/plugins/enforcer/MockPathTranslator.java | 1 -
.../plugins/enforcer/MockPlexusContainer.java | 1 -
.../apache/maven/plugins/enforcer/MockProject.java | 7 +-
.../enforcer/ReactorModuleConvergenceTest.java | 338 +++++++++++++++
.../plugins/enforcer/RequireActiveProfileTest.java | 193 +++++++++
.../plugins/enforcer/RequirePrerequisiteTest.java | 165 +++++++
.../plugins/enforcer/TestBannedDependencies.java | 405 ++++++++++-------
.../plugins/enforcer/TestBannedRepositories.java | 159 +++++++
.../plugins/enforcer/TestEvaluateBeanshell.java | 40 +-
.../maven/plugins/enforcer/TestNoSnapshots.java | 21 +-
...ty.java => TestRequireEnvironmentVariable.java} | 41 +-
.../enforcer/TestRequireFilesDontExist.java | 20 +-
.../plugins/enforcer/TestRequireFilesExist.java | 22 +-
.../plugins/enforcer/TestRequireFilesSize.java | 26 +-
.../enforcer/TestRequireNoRepositories.java | 26 +-
.../maven/plugins/enforcer/TestRequireOS.java | 3 +-
.../enforcer/TestRequirePluginVersions.java | 92 ++--
.../plugins/enforcer/TestRequireProperty.java | 10 +-
.../plugins/enforcer/TestRequireReleaseDeps.java | 24 +-
.../utils/MockEnforcerExpressionEvaluator.java | 4 +-
.../enforcer/utils/TestArtifactMatcher.java | 163 +++++++
.../no-repositories/child/pom.xml | 22 +-
.../requireNoRepositories/no-repositories/pom.xml | 22 +-
.../snapshot-plugin-repositories/child/pom.xml | 22 +-
.../snapshot-plugin-repositories/pom.xml | 22 +-
.../snapshot-repositories/child/pom.xml | 22 +-
.../snapshot-repositories/pom.xml | 22 +-
.../with-plugin-repositories/child/pom.xml | 22 +-
.../with-plugin-repositories/pom.xml | 22 +-
.../with-repositories/child/pom.xml | 22 +-
.../with-repositories/pom.xml | 22 +-
.../checkPluginPropertyVersion/pom.xml | 22 +-
.../checkPluginVersionProfile/pom.xml | 22 +-
.../getPomRecursively/b/c/pom.xml | 22 +-
.../getPomRecursively/b/pom.xml | 22 +-
.../getPomRecursively/pom.xml | 22 +-
.../parentExpression/child/pom.xml | 22 +-
.../requirePluginVersions/parentExpression/pom.xml | 22 +-
.../parentRelativePath/parent/pom.xml | 22 +-
.../parentRelativePath/pom.xml | 22 +-
.../parentRelativePathDirectory/parent/pom.xml | 22 +-
.../parentRelativePathDirectory/pom.xml | 22 +-
maven-enforcer-plugin/NOTICE | 9 -
maven-enforcer-plugin/pom.xml | 133 +++---
.../src/it/always-fail/invoker.properties | 1 -
.../src/it/builds_a_pom_noop/module/pom.xml | 12 -
.../src/it/builds_a_pom_noop/pom.xml | 31 --
.../src/it/dependencies_converge/module/pom.xml | 12 -
.../dependencies_not_converging/invoker.properties | 1 -
.../it/dependencies_not_converging/module/pom.xml | 12 -
.../invoker.properties | 1 -
.../module/pom.xml | 12 -
.../repository/menforcer126_maven-plugin-1.0.pom | 27 ++
.../it/mrm/repository/menforcer128_api-1.4.0.pom | 26 ++
.../it/mrm/repository/menforcer128_api-1.5.0.pom | 26 ++
.../it/mrm/repository/menforcer128_api-1.6.0.pom | 26 ++
.../mrm/repository/menforcer128_classic-0.9.9.pom | 34 ++
...menforcer134_model-1.0-20130423.042904-7222.pom | 26 ++
...menforcer134_model-1.0-20130423.044324-5638.pom | 26 ++
.../menforcer134_modelbuilder-1.0-SNAPSHOT.pom | 34 ++
.../menforcer134_project-1.0-SNAPSHOT.pom | 39 ++
.../mrm/repository/menforcer138_archiver-2.1.1.pom | 44 ++
.../menforcer138_classworlds-1.1-alpha-2.pom | 26 ++
...r138_container-default-1.0-alpha-9-stable-1.pom | 39 ++
.../it/mrm/repository/menforcer138_io-2.0.3.pom | 34 ++
.../it/mrm/repository/menforcer138_utils-1.0.4.pom | 26 ++
.../it/mrm/repository/menforcer138_utils-3.0.pom | 26 ++
.../src/it/mrm/repository/menforcer146_b-1.0.pom | 34 ++
.../src/it/mrm/repository/menforcer146_x-1.1.pom | 26 ++
.../src/it/mrm/repository/menforcer146_x-2.1.pom | 26 ++
.../src/it/mrm/repository/menforcer146_x-3.1.pom | 26 ++
.../src/it/mrm/repository/menforcer152-1.0.pom | 27 ++
.../it/mrm/repository/menforcer158_utils-1.0.pom | 26 ++
.../it/mrm/repository/menforcer72_junit-3.8.1.pom | 26 ++
.../mrm/repository/menforcer72_logging-1.1.1.pom | 27 ++
.../repository/menforcer85_api-1.0-SNAPSHOT.pom | 26 ++
maven-enforcer-plugin/src/it/mrm/settings.xml | 73 ++++
maven-enforcer-plugin/src/it/pom.xml | 20 +
.../projects/always-fail-warn/invoker.properties | 18 +
.../always-fail-warn}/pom.xml | 4 +-
.../src/it/projects/always-fail-warn/verify.groovy | 19 +-
.../src/it/projects/always-fail/invoker.properties | 18 +
.../src/it/{ => projects}/always-fail/pom.xml | 0
.../src/it/{ => projects}/always-pass/pom.xml | 0
.../invoker.properties | 18 +
.../module1/pom.xml | 37 +-
.../module2/pom.xml | 34 +-
.../pom.xml | 24 +-
.../verify.groovy | 22 +-
.../module1/pom.xml | 35 +-
.../module2}/pom.xml | 47 +-
.../pom.xml | 27 +-
.../verify.groovy | 20 +-
.../ban-distribution-management}/pom.xml | 5 +-
.../ban-distribution-management/verify.groovy | 20 +-
.../ban-pom-dependency-version/invoker.properties | 18 +
.../ban-pom-dependency-version}/pom.xml | 32 +-
.../ban-pom-dependency-version/verify.groovy | 60 ++-
.../invoker.properties | 18 +
.../ban-transitive-dependencies-fail}/pom.xml | 36 +-
.../ban-transitive-dependencies-fail/verify.groovy | 55 +--
.../ban-transitive-dependencies}/pom.xml | 36 +-
.../invoker.properties | 18 +
.../banned-dependencies-versionrange-fail}/pom.xml | 16 +-
.../verify.groovy | 21 +-
.../banned-dependencies-versionrange}/pom.xml | 14 +-
.../banned-dependencies-wildcards/pom.xml | 12 +-
.../it/{ => projects}/banned-dependencies/pom.xml | 2 +-
.../src/it/{ => projects}/banned-plugins/pom.xml | 0
.../it/projects/builds_a_pom_noop/module/pom.xml | 30 ++
.../src/it/projects/builds_a_pom_noop/pom.xml | 49 +++
.../projects/dependencies_converge/module/pom.xml | 30 ++
.../{ => projects}/dependencies_converge/pom.xml | 22 +-
.../dependencies_not_converging/invoker.properties | 18 +
.../dependencies_not_converging/module/pom.xml | 30 ++
.../dependencies_not_converging/pom.xml | 22 +-
.../invoker.properties | 18 +
.../module/pom.xml | 30 ++
.../dependencies_not_converging_test_scope/pom.xml | 22 +-
.../it/{ => projects}/evaluate-beanshell/pom.xml | 0
.../src/it/projects/multimodule/invoker.properties | 18 +
.../src/it/projects/multimodule/module1/pom.xml | 67 ++-
.../src/it/projects/multimodule/module2/pom.xml | 74 ++--
.../{always-pass => projects/multimodule}/pom.xml | 111 ++---
.../require-active-profile-all}/pom.xml | 17 +-
.../require-active-profile-from-settings}/pom.xml | 18 +-
.../{ => projects}/require-active-profile/pom.xml | 0
.../require-files-dont-exist/pom.xml | 0
.../it/{ => projects}/require-files-exist/pom.xml | 0
.../it/{ => projects}/require-files-size/pom.xml | 0
.../it/{ => projects}/require-java-version/pom.xml | 0
.../{ => projects}/require-maven-version/pom.xml | 0
.../{ => projects}/require-no-repositories/pom.xml | 0
.../invoker.properties | 18 +
.../require-no-repositories_failure}/pom.xml | 115 ++---
.../require-no-repositories_failure/verify.groovy | 56 +--
.../pom.xml | 0
.../invoker.properties | 25 ++
.../require-plugin-versions-expressions/pom.xml | 155 +++++++
.../pom.xml | 94 ++++
.../META-INF/MANIFEST.MF | 2 +
.../invoker.properties | 18 +
.../pom.xml | 94 ++++
.../pom.xml | 101 +++++
.../{ => projects}/require-plugin-versions/pom.xml | 0
.../src/it/{ => projects}/require-property/pom.xml | 0
.../require-release-dependencies-excludes/pom.xml | 63 +++
.../invoker.properties | 18 +
.../pom.xml | 63 +++
.../require-release-dependencies/pom.xml | 0
.../{ => projects}/require-release-version/pom.xml | 0
.../invoker.properties | 18 +
.../projects/require-same-versions_failure/pom.xml | 87 ++++
.../projects/require-same-versions_success/pom.xml | 88 ++++
.../invoker.properties | 18 +
.../pom.xml | 67 +++
.../verify.groovy | 29 ++
.../pom.xml | 67 +++
.../invoker.properties | 18 +
.../pom.xml | 60 +++
.../verify.groovy | 55 +--
.../pom.xml | 58 +++
.../invoker.properties | 18 +
.../module/pom.xml | 30 ++
.../require-upper-bound-deps_failure/pom.xml | 62 +++
.../require-upper-bound-deps_failure/verify.groovy | 32 ++
.../module/pom.xml | 30 ++
.../require-upper-bound-deps_success/pom.xml | 62 +++
.../invoker.properties | 18 +
.../projects/resolve_collect_dependencies/pom.xml | 72 ++++
.../src/assembly/extjars.xml | 31 ++
.../resolve_collect_dependencies/verify.groovy | 54 +--
.../goals.txt | 1 -
.../require-release-dependencies-excludes/pom.xml | 44 --
maven-enforcer-plugin/src/it/settings.xml | 55 ---
.../maven/plugins/enforcer/DisplayInfoMojo.java | 32 +-
.../apache/maven/plugins/enforcer/EnforceMojo.java | 239 ++++++-----
.../maven/plugins/enforcer/util/EnforcerUtils.java | 18 +
.../META-INF/m2e/lifecycle-mapping-metadata.xml | 35 ++
maven-enforcer-plugin/src/site/apt/usage.apt.vm | 28 +-
maven-enforcer-plugin/src/site/site.xml | 5 +-
.../maven/plugins/enforcer/TestEnforceMojo.java | 136 +++---
pom.xml | 206 +++------
src/site/resources/download.cgi | 22 +
src/site/site.xml | 33 +-
src/site/xdoc/download.xml.vm | 126 ++++++
272 files changed, 11091 insertions(+), 2833 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-enforcer.git
More information about the pkg-java-commits
mailing list