This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-containers1.5.
commit 4c5ce1dc59e6c2834ff4bdee97dcd67d1a3b3642 Merge: 5c11c38 38fba5d Author: Emmanuel Bourg <[email protected]> Date: Thu May 18 14:30:01 2017 +0200 Merge tag 'upstream/1.7.1' Upstream version 1.7.1 .travis.yml | 22 +++++++++ plexus-component-annotations/pom.xml | 2 +- plexus-component-javadoc/pom.xml | 7 ++- plexus-component-javadoc/src/it/basic/pom.xml | 2 +- plexus-component-metadata/pom.xml | 34 ++++++++++---- .../src/it/annotation-processing-test/pom.xml | 6 +-- .../src/it/descriptor-1/pom.xml | 4 +- .../src/it/source-encoding/latin-1/pom.xml | 45 ------------------ .../latin-1/src/main/java/test/Component.java | 12 ----- .../src/it/source-encoding/pom.xml | 20 -------- .../src/it/source-encoding/utf-8/pom.xml | 45 ------------------ .../utf-8/src/main/java/test/Component.java | 12 ----- .../src/it/source-encoding/validate.groovy | 13 ------ .../maven/plugin/AbstractDescriptorMojo.java | 30 +++++++++--- .../plexus/maven/plugin/PlexusDescriptorMojo.java | 21 ++++----- .../plexus/maven/plugin/PlexusMergeMojo.java | 16 +++---- .../maven/plugin/PlexusTestDescriptorMojo.java | 21 ++++----- .../ClassComponentDescriptorExtractor.java | 4 ++ .../metadata/DefaultComponentDescriptorWriter.java | 3 +- .../plexus/metadata/DefaultMetadataGenerator.java | 41 +++++++++++----- .../plexus/metadata/MetadataGenerationRequest.java | 2 + .../SourceComponentDescriptorExtractor.java | 2 + .../plexus/metadata/ann/AnnInvocationHandler.java | 2 +- .../gleaner/AnnotationComponentGleaner.java | 7 ++- .../plexus/metadata/merge/AbstractMerger.java | 15 +++--- .../plexus/metadata/merge/ComponentsXmlMerger.java | 2 +- .../codehaus/plexus/metadata/merge/MXParser.java | 6 ++- .../org/codehaus/plexus/metadata/merge/Merger.java | 2 +- .../plexus/metadata/merge/PlexusXmlMerger.java | 2 +- .../merge/support/AbstractMergeableElement.java | 5 +- .../support/AbstractMergeableElementList.java | 3 +- .../merge/support/AbstractMergeableSupport.java | 14 +++--- .../metadata/merge/support/ComponentElement.java | 5 +- .../merge/support/ComponentSetElement.java | 2 +- .../metadata/merge/support/ComponentsElement.java | 2 +- .../merge/support/ConfigurationElement.java | 2 +- .../metadata/merge/support/DescriptorTag.java | 2 +- .../plexus/metadata/merge/support/Mergeable.java | 2 +- .../metadata/merge/support/PlexusRootElement.java | 2 +- .../metadata/merge/support/RequirementElement.java | 2 +- .../merge/support/RequirementsElement.java | 2 +- .../main/resources/META-INF/plexus/components.xml | 14 ++++++ .../metadata/merge/ComponentsXmlMergerTest.java | 6 +-- plexus-container-default/pom.xml | 2 +- .../org/codehaus/plexus/PlexusJUnit4TestCase.java | 8 ++-- .../java/org/codehaus/plexus/PlexusTestCase.java | 15 +++--- .../converters/ComponentValueSetter.java | 1 - .../component/repository/ComponentRepository.java | 1 - .../exception/ComponentLookupRuntimeException.java | 5 -- .../source/ChainedConfigurationSource.java | 1 - .../InitializeComponentRegistryPhase.java | 1 - .../InitializeLoggerManagerPhase.java | 1 - .../InitializeUserConfigurationSourcePhase.java | 1 - .../codehaus/plexus/context/DefaultContext.java | 2 +- .../plexus/lifecycle/AbstractLifecycleHandler.java | 1 - .../codehaus/plexus/logging/BaseLoggerManager.java | 1 - .../logging/console/ConsoleLoggerManager.java | 1 - .../plexus/lifecycle/phase/LogDisablePhase.java | 1 - .../plexus/lifecycle/phase/LogEnablePhase.java | 1 - .../plexus/test/AbstractStartableComponent.java | 2 +- .../codehaus/plexus/test/list/DefaultPipeline.java | 1 - pom.xml | 54 ++++++++++++++++++---- 62 files changed, 271 insertions(+), 292 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-containers1.5.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
