You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2019/07/26 21:20:01 UTC
[maven] branch MNG-6169/MNG-6554 updated (e01bf98 -> 1afbff2)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-6169/MNG-6554
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard e01bf98 [MNG-6554] Packaging 'ear' binding plugin upgrades
add d9facde [MNG-6530] Introduce system property to disable global model cache
add a939654 [MNG-6256] Surround parameter of echo command with double quotes
add 8e5ecf0 fixed link (that goes to implementation in maven-core)
add 375cd7b [MNG-6559] Fix mailing list URL (#230)
add fdf5d92 renamed variables for better understanding
add 396291b [MNG-6069] Migrate to non deprecated parts of Commons CLI (#153)
add 2928dc6 refactoring: extracted initParent() method
add 049b7a7 refactoring: reduced try/catch scope
add ae1c32a [MNG-6533] Test: ProjectBuildingException miss reference to MavenProject
add 8b7055f [MNG-6533] Prefer passing the interim project in ProjectBuildingResult
add 27332cf [MNG-6533] ProjectBuilder report ModelProblem instead of Exception
add 24c762d [MNG-6533] catch InvalidArtifactRTException runtime exception
add bb3ec5d [MNG-5995] Remove dependency to maven-compat (#185)
add 7e3e545 [MNG-6573] Use Maven 3.6.0 for CI
add 15c6471 [MNG-6558] ToolchainsBuildingResult event is not sent on EventSpy
add b7249af Revert [MNG-6069] Migrate to non deprecated parts of Commons CLI
add 8f9075d [MNG-6571] cache VersionRange instances, they are immutable
add 6bd8bb9 [MNG-6571] forgot to put new instance in cache
add 657fbb7 Revert "[MNG-6571] forgot to put new instance in cache"
add 961746f [MNG-6571] separate caches for create from spec and version
add 4decfcf [MNG-6591] Upgrade to Wagon 3.3.2
add c674bcf [MNG-6495] ModelResolver cannot be null
add bd4a3a0 [MNG-6593] track input location for super-pom content
add 9dd4732 Revert "[MNG-6548] Lifecycle plugin version upgrades"
add 37676a2 [MNG-6599] use version from parent if necessary, like groupId
add 4bec550 [MNG-6600] add inputlocation tracking for default lifecycle executions
add 0b10fe7 [MNG-6597] add input location tracking for plugins configuration
add 49c8f17 [MNG-6601] add input location tracking for m-site-p converted reports
add f5a1374 [MNG-6572] use int or long instead of BigIntegers for little numbers in ComparableVersion
add 0be2644 [MNG-6538] Upgrade maven-resolver to 1.3.3
add 5306cd0 [MNG-6506] [MNG-6543] Upgrade Plexus Classworlds to 2.6.0
add a7acfe7 [MNG-6611] Update animal-sniffer-maven-plugin to version 1.17
add 95401cf [MNG-6605] Unable to suppress download/upload messages (in interactive mode)
add 0ba5753 [MNG-6618] adding org.slf4j.event in exported packages
add d66c9c0 [maven-release-plugin] prepare release maven-3.6.1
add 5222f03 [maven-release-plugin] prepare for next development iteration
add 55614d3 [MNG-6627] upgrade Plexus container to 2.0.0 for Reproducible Builds
add 715d90b Update DOAP Information for new release.
add 0940c7c [MNG-6405] Fix basedir in MavenProject.deepCopy (#225)
add 61d888c [MNG-6646] Upgrade maven-assembly-plugin to 3.1.1
add 763f76c [MNG-6642] Revert "[MNG-5995] Remove dependency to maven-compat (#185)"
add fdde73f Remove unused code that triggers Error Prone (#245)
add 80c6fe3 [MNG-6643] - Version comparison CLI does not work anymore
add baed5a2 [MNG-6629] - Make ID validation faster
add ebac165 [MNG-6630] - Make ComparableVersion faster
add 44ad1aa [MNG-6631] - Make DefaultArtifactVersion faster
add d34e8fb [MNG-6631] documented the performance intent
add 1e03388 [MNG-6632] - Remember artifact handlers after they've been used once
add 869b615 [MNG-6636] merge reports location tracking
add 5350ed8 [MNG-6644] don't fail if no input location tracking available
add 4ff24e3 [MNG-6643] Integration test
add 2760e3e (doc) - correct plural form of 'child'
add 3ac9718 [MNG-6655] Add support for "release" qualifier
add 1a18eb6 [MNG-6626] fix DefaultExceptionHandler NPE
add 6583012 [MNG-6069] Avoid (some) deprecated commons-cli methods
add ff8c5c8 MNG-6069: unittest with compact and spaced -D options
add 790dc0f [MNG-6633] - Reduce memory usage of excludes
add 6c01ec1 [MNG-6633] - Reduce memory usage of excludes - fix rat/checkstyle errors
add d3ace78 [MNG-6638] Prevent reparsing POMs in MavenMetadataSource
add 660e745 Always deploy snapshot from master (#250)
add 8524e04 fix Jenkinsfile as it is script
add a117168 oops fix branch name
add 3495521 -DdeployAtEnd=true doesn't deploy anything
add 275a971 Include Java 12 for testing
add 01405a2 [MNG-6667] Enhance the error reporting when trying to build a modelVersion that the current Maven doesn't understand
add aed5130 [MNG-6665] toolchain.xml file should support environment variables
add 8aaeb8a [MNG-6581] - Update to latest Modello plugin version
add 5035837 [MNG-6671] Upgrade Modello to 1.10.1
add 92b5191 Revert "Modello changes"
add 8f1cac0 [MNG-6671] Upgrade Modello to 1.11
add da05c25 Use properly quoted shell arguments with "$@"
add 25ffca0 [MNG-6672] Upgrade Maven Resolver to 1.4.0
add 3d76fae Merge branch 'MNG-6672'
add c2f13f7 [MNG-6675] Make Resolver debug log messages for projects and plugins consistent
add c5ede2f [MNG-6680] Convert Maven Settings Builder to JSR 330
add 58de88f MNG-6681 dependency type = extension+classifier
add edf6168 [MNG-6674] Upgrade Wagon to 3.3.3
add 0bffc8a [MNG-5577] Maven Artifact module has no Plexus annotations
add 59bd396 [MNG-6686] Convert Maven Embedder to JSR 330
add 353d3ea [MNG-6685] Convert Maven Model Builder to JSR 330
add 8da81ce [MNG-6701] Document maven.repo.local property
add 84bf187 [MNG-6700] Equal compile source roots are added multiple times
add 7ba9700 [MNG-6698] Lazily compute the ManagedVersionMap
add 4fa882c [MNG-6703] DefaultUrlNormalizer doesn't normalize all relative URIs
add 9b8ae7d [MNG-6702] Improve DefaultModelValidator performance:
add 53f04f0 [MNG-6705] Speep up Artifact version check and Parent interpolation
add 383c8c1 [MNG-6712] Downgrade maven-resolver:1.4.0 to 1.3.3
add f7b4a65 [MNG-6549] Remove unused transitive dependencies of Guava
add ecc317b added NODE_NAME to output
add 74e8532 [MNG-6718] Upgrade to plexus-utils 3.2.1 (#271)
add 690841e [MNG-6697] New fast model interpolator not using reflection (#261)
add 2d0c3bc [MNG-6704] MavenRepositorySystemUtils.newSession() misses assignment
add 809cac2 [MNG-6723] MavenProject.getParentFile() not set when using ProjectBuilder.build()
add dd0776d [MNG-6653] DefaultProjectBuildingRequest copy constructor does not copy all fields
new 1afbff2 [MNG-6554] Packaging 'ear' binding plugin upgrades
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 (e01bf98)
\
N -- N -- N refs/heads/MNG-6169/MNG-6554 (1afbff2)
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:
CONTRIBUTING.md | 4 +-
Jenkinsfile | 20 +-
apache-maven/README.txt | 2 +-
apache-maven/pom.xml | 2 +-
apache-maven/src/bin/mvn.cmd | 4 +-
deploySite.sh | 4 +-
doap_Maven.rdf | 11 +
maven-artifact/pom.xml | 18 +-
.../org/apache/maven/artifact/ArtifactUtils.java | 42 +-
.../org/apache/maven/artifact/DefaultArtifact.java | 12 +-
.../artifact/versioning/ComparableVersion.java | 339 ++++-
.../versioning/DefaultArtifactVersion.java | 91 +-
.../maven/artifact/versioning/VersionRange.java | 33 +-
.../artifact/versioning/ComparableVersionIT.java | 93 ++
.../artifact/versioning/ComparableVersionTest.java | 94 ++
.../artifact/versioning/VersionRangeTest.java | 19 +
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
.../AbstractArtifactComponentTestCase.java | 2 +-
.../manager/DefaultProfileManagerTest.java | 10 +-
maven-core/pom.xml | 2 +-
.../manager/DefaultArtifactHandlerManager.java | 10 +-
...actFilter.java => ExclusionArtifactFilter.java} | 26 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 112 +-
.../maven/exception/DefaultExceptionHandler.java | 9 +-
.../internal/DefaultLifecyclePluginAnalyzer.java | 22 +-
.../plugin/DefaultLifecycleBindingsInjector.java | 14 +-
.../DefaultPluginDependenciesResolver.java | 65 +-
.../maven/project/DefaultProjectBuilder.java | 437 +++---
.../project/DefaultProjectBuildingRequest.java | 2 +
.../DefaultProjectDependenciesResolver.java | 38 +-
.../org/apache/maven/project/MavenProject.java | 9 +-
.../project/artifact/MavenMetadataSource.java | 34 +-
.../building/DefaultToolchainsBuilder.java | 105 +-
.../toolchain/io/DefaultToolchainsWriter.java | 54 +
.../maven/toolchain/io/ToolchainsWriter.java | 48 +
.../main/resources/META-INF/maven/extension.xml | 1 +
.../main/resources/META-INF/plexus/components.xml | 6 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 53 -
.../exception/DefaultExceptionHandlerTest.java | 53 +-
.../org/apache/maven/plugin/PluginManagerTest.java | 22 -
.../project/DefaultMavenProjectBuilderTest.java | 68 +-
.../org/apache/maven/project/MavenProjectTest.java | 24 +
.../apache/maven/project/ProjectBuilderTest.java | 180 +++
.../artifact/DefaultMavenMetadataCacheTest.java | 8 +-
.../project/artifact/MavenMetadataSourceTest.java | 2 +
.../building/DefaultToolchainsBuilderTest.java | 150 +-
.../project-builder/MNG-6723/child/pom.xml | 11 +
.../test/projects/project-builder/MNG-6723/pom.xml | 11 +
.../resources/projects/artifactMissingVersion.xml | 34 +
.../pom.xml => resources/projects/badPom.xml} | 10 +-
.../projects/future-model-version-pom.xml | 8 +-
.../projects/future-schema-model-version-pom.xml | 8 +-
...gnment-child.xml => past-model-version-pom.xml} | 13 +-
maven-embedder/pom.xml | 37 +-
.../main/java/org/apache/maven/cli/CLIManager.java | 79 +-
.../org/apache/maven/cli/CLIReportingUtils.java | 2 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 43 +-
.../SettingsXmlConfigurationProcessor.java | 35 +-
.../maven/cli/event/ExecutionEventLogger.java | 12 +-
.../impl/UnsupportedSlf4jBindingConfiguration.java | 2 +-
.../cli/transfer/Slf4jMavenTransferListener.java | 4 +-
maven-embedder/src/site/apt/logging.apt | 24 +-
.../maven/cli/CLIManagerDocumentationTest.java | 7 +-
.../java/org/apache/maven/cli/CLIManagerTest.java | 31 +-
.../java/org/apache/maven/cli/MavenCliTest.java | 38 +
maven-model-builder/pom.xml | 10 +-
.../maven/model/building/DefaultModelBuilder.java | 54 +-
.../model/building/DefaultModelBuilderFactory.java | 4 +-
.../model/building/DefaultModelProcessor.java | 15 +-
.../maven/model/building/ModelBuildingRequest.java | 4 +-
.../maven/model/building/ModelProblemUtils.java | 4 +
.../DefaultDependencyManagementImporter.java | 7 +-
.../inheritance/DefaultInheritanceAssembler.java | 7 +-
.../AbstractStringBasedModelInterpolator.java | 88 +-
.../StringSearchModelInterpolator.java | 142 +-
.../StringVisitorModelInterpolator.java | 1457 ++++++++++++++++++++
.../apache/maven/model/io/DefaultModelReader.java | 7 +-
.../apache/maven/model/io/DefaultModelWriter.java | 7 +-
.../maven/model/locator/DefaultModelLocator.java | 6 +-
.../DefaultDependencyManagementInjector.java | 7 +-
.../DefaultPluginManagementInjector.java | 7 +-
.../normalization/DefaultModelNormalizer.java | 7 +-
.../model/path/DefaultModelPathTranslator.java | 11 +-
.../model/path/DefaultModelUrlNormalizer.java | 11 +-
.../maven/model/path/DefaultPathTranslator.java | 6 +-
.../maven/model/path/DefaultUrlNormalizer.java | 20 +-
.../plugin/DefaultPluginConfigurationExpander.java | 7 +-
.../plugin/DefaultReportConfigurationExpander.java | 7 +-
.../model/plugin/DefaultReportingConverter.java | 61 +-
.../model/profile/DefaultProfileInjector.java | 7 +-
.../model/profile/DefaultProfileSelector.java | 11 +-
.../profile/activation/FileProfileActivator.java | 11 +-
.../activation/JdkVersionProfileActivator.java | 7 +-
.../OperatingSystemProfileActivator.java | 7 +-
.../activation/PropertyProfileActivator.java | 7 +-
.../model/superpom/DefaultSuperPomProvider.java | 22 +-
.../model/validation/DefaultModelValidator.java | 439 ++++--
maven-model-builder/src/site/apt/index.apt | 6 +-
.../DefaultInheritanceAssemblerTest.java | 19 +-
.../AbstractModelInterpolatorTest.java | 5 +-
.../StringSearchModelInterpolatorTest.java | 2 +-
.../maven/model/path/DefaultUrlNormalizerTest.java | 47 +-
.../activation/AbstractProfileActivatorTest.java | 12 +-
.../validation/DefaultModelValidatorTest.java | 17 +-
maven-model/pom.xml | 3 +-
.../org/apache/maven/model/merge/ModelMerger.java | 18 +
maven-model/src/main/mdo/maven.mdo | 29 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
.../internal/DefaultArtifactDescriptorReader.java | 1 -
.../internal/DefaultVersionResolver.java | 41 +-
.../internal/MavenRepositorySystemUtils.java | 4 +-
maven-settings-builder/pom.xml | 12 +-
.../settings/building/DefaultSettingsBuilder.java | 24 +-
.../building/DefaultSettingsBuilderFactory.java | 10 +-
.../settings/crypto/DefaultSettingsDecrypter.java | 17 +-
.../maven/settings/io/DefaultSettingsReader.java | 7 +-
.../maven/settings/io/DefaultSettingsWriter.java | 7 +-
.../validation/DefaultSettingsValidator.java | 7 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
pom.xml | 33 +-
124 files changed, 4435 insertions(+), 1130 deletions(-)
create mode 100644 maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java
copy maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/{ExcludesArtifactFilter.java => ExclusionArtifactFilter.java} (61%)
create mode 100644 maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsWriter.java
create mode 100644 maven-core/src/main/java/org/apache/maven/toolchain/io/ToolchainsWriter.java
create mode 100644 maven-core/src/test/projects/project-builder/MNG-6723/child/pom.xml
create mode 100644 maven-core/src/test/projects/project-builder/MNG-6723/pom.xml
create mode 100644 maven-core/src/test/resources/projects/artifactMissingVersion.xml
copy maven-core/src/test/{projects/default-maven/cyclic-reference/pom.xml => resources/projects/badPom.xml} (53%)
copy maven-embedder/src/test/error-reporting-projects/aggregate-mojo-failure/project/pom.xml => maven-core/src/test/resources/projects/future-model-version-pom.xml (83%)
copy maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/local-repo/org/apache/maven/errortest/test-maven-ext-dep/1/test-maven-ext-dep-1.pom => maven-core/src/test/resources/projects/future-schema-model-version-pom.xml (79%)
copy maven-core/src/test/resources/projects/{base-directory-alignment/subproject/project-which-needs-directory-alignment-child.xml => past-model-version-pom.xml} (76%)
copy maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestTransferListener.java => maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java (51%)
create mode 100644 maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringVisitorModelInterpolator.java
[maven] 01/01: [MNG-6554] Packaging 'ear' binding plugin upgrades
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-6169/MNG-6554
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 1afbff210f3162e06a8448d7ec59143798b1592e
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Jan 8 17:09:51 2019 +0100
[MNG-6554] Packaging 'ear' binding plugin upgrades
* Upgrade to Maven EAR Plugin 3.0.1
* Upgrade to Maven Resources Plugin 3.1.0
* Upgrade to Maven Install Plugin 3.0.0-M1
* Upgrade to Maven Deploy Plugin 3.0.0-M1
---
.../src/main/resources/META-INF/plexus/default-bindings.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
index 4a303db..dcba632 100644
--- a/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
@@ -247,19 +247,19 @@ Mappings to default lifecycle, specific for each packaging.
<!-- START SNIPPET: ear-lifecycle -->
<phases>
<generate-resources>
- org.apache.maven.plugins:maven-ear-plugin:2.8:generate-application-xml
+ org.apache.maven.plugins:maven-ear-plugin:3.0.1:generate-application-xml
</generate-resources>
<process-resources>
- org.apache.maven.plugins:maven-resources-plugin:2.6:resources
+ org.apache.maven.plugins:maven-resources-plugin:3.1.0:resources
</process-resources>
<package>
- org.apache.maven.plugins:maven-ear-plugin:2.8:ear
+ org.apache.maven.plugins:maven-ear-plugin:3.0.1:ear
</package>
<install>
- org.apache.maven.plugins:maven-install-plugin:2.4:install
+ org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install
</install>
<deploy>
- org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy
+ org.apache.maven.plugins:maven-deploy-plugin:3.0.0-M1:deploy
</deploy>
</phases>
<!-- END SNIPPET: ear-lifecycle -->