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 224ecfc588a67f6a953bff4c903baa071a3b5539 Merge: b9bd4af 89aca7b Author: Emmanuel Bourg <[email protected]> Date: Thu Nov 19 12:32:42 2015 +0100 Merge tag 'upstream/1.6' Upstream version 1.6 .gitignore | 7 + plexus-component-annotations/pom.xml | 4 +- .../plexus/component/annotations/Component.java | 2 +- .../component/annotations/Configuration.java | 2 +- .../plexus/component/annotations/Requirement.java | 2 +- .../src/site/apt/index.apt | 23 +++ plexus-component-annotations/src/site/site.xml | 36 ++++ plexus-component-javadoc/pom.xml | 20 ++- .../plexus/javadoc/AbstractPlexusTaglet.java | 12 +- .../plexus/javadoc/PlexusComponentTaglet.java | 2 +- .../plexus/javadoc/PlexusConfigurationTaglet.java | 2 +- .../plexus/javadoc/PlexusRequirementTaglet.java | 2 +- plexus-component-metadata/pom.xml | 14 +- .../src/it/descriptor-1/pom.xml | 2 +- .../src/main/java/testing/ChildComponent.java | 2 +- .../src/main/java/testing/MyComponent.java | 2 +- .../src/it/descriptor-1/validate.groovy | 2 +- .../component/repository/ComponentDescriptor.java | 8 +- .../component/repository/ComponentRequirement.java | 2 +- .../repository/ComponentRequirementList.java | 2 +- .../repository/ComponentSetDescriptor.java | 2 +- .../plexus/maven/plugin/PlexusDescriptorMojo.java | 2 +- .../plexus/maven/plugin/PlexusMergeMojo.java | 2 +- .../maven/plugin/PlexusTestDescriptorMojo.java | 2 +- .../ClassComponentDescriptorExtractor.java | 5 +- .../metadata/ComponentDescriptorExtractor.java | 2 +- .../ComponentDescriptorExtractorSupport.java | 14 +- .../ComponentDescriptorWriteException.java | 2 +- .../plexus/metadata/DefaultMetadataGenerator.java | 19 +-- .../SourceComponentDescriptorExtractor.java | 21 ++- .../plexus/metadata/ann/AnnInvocationHandler.java | 2 +- .../codehaus/plexus/metadata/ann/AnnReader.java | 124 +------------- .../gleaner/AnnotationComponentGleaner.java | 2 +- .../metadata/gleaner/ClassComponentGleaner.java | 2 +- .../gleaner/ComponentGleanerException.java | 2 +- .../metadata/gleaner/ComponentGleanerSupport.java | 4 +- .../metadata/gleaner/QDoxComponentGleaner.java | 185 ++++++++------------- .../metadata/gleaner/SourceComponentGleaner.java | 6 +- .../plexus/metadata/merge/ComponentsXmlMerger.java | 2 +- .../org/codehaus/plexus/metadata/merge/Driver.java | 2 +- .../codehaus/plexus/metadata/merge/MXParser.java | 33 ++-- .../plexus/metadata/merge/MergeException.java | 2 +- .../plexus/metadata/merge/MergeStrategy.java | 2 +- .../org/codehaus/plexus/metadata/merge/Merger.java | 2 +- .../plexus/metadata/merge/PlexusXmlMerger.java | 2 +- .../merge/support/AbstractMergeableElement.java | 24 ++- .../support/AbstractMergeableElementList.java | 46 +++-- .../merge/support/AbstractMergeableSupport.java | 2 +- .../metadata/merge/support/ComponentElement.java | 2 +- .../merge/support/ComponentSetElement.java | 2 +- .../metadata/merge/support/ComponentsElement.java | 2 +- .../merge/support/ConfigurationElement.java | 2 +- .../metadata/merge/support/DescriptorTag.java | 2 +- .../metadata/merge/support/MergeStrategies.java | 2 +- .../plexus/metadata/merge/support/Mergeable.java | 2 +- .../metadata/merge/support/PlexusRootElement.java | 2 +- .../metadata/merge/support/PlexusXmlTag.java | 2 +- .../metadata/merge/support/RequirementElement.java | 2 +- .../merge/support/RequirementsElement.java | 2 +- .../main/resources/META-INF/plexus/components.xml | 2 +- .../DefaultComponentDescriptorWriterTest.java | 2 +- .../plexus/metadata/gleaner/AbstractClass.java | 2 +- .../metadata/gleaner/AbstractWithAnnoClass.java | 2 +- .../plexus/metadata/gleaner/ChildComponent.java | 2 +- .../plexus/metadata/gleaner/MyComponent.java | 2 +- .../metadata/gleaner/NoAnnotationsClass.java | 2 +- .../plexus/metadata/gleaner/NoAnnotationsIntf.java | 2 +- .../metadata/gleaner/QDoxComponentGleanerTest.java | 16 +- .../metadata/merge/ComponentsXmlMergerTest.java | 2 +- plexus-container-default/pom.xml | 2 +- .../codehaus/plexus/PlexusContainerException.java | 2 +- ...exusTestCase.java => PlexusJUnit4TestCase.java} | 69 +++++--- .../java/org/codehaus/plexus/PlexusTestCase.java | 2 +- .../component/composition/CompositionResolver.java | 2 +- .../CycleDetectedInComponentGraphException.java | 2 +- .../composition/DefaultCompositionResolver.java | 2 +- .../UndefinedComponentComposerException.java | 2 +- .../AbstractComponentConfigurator.java | 2 +- .../configurator/BasicComponentConfigurator.java | 2 +- .../ComponentConfigurationException.java | 2 +- .../configurator/ComponentConfigurator.java | 2 +- .../configurator/ConfigurationListener.java | 2 +- .../converters/AbstractConfigurationConverter.java | 2 +- .../converters/basic/AbstractBasicConverter.java | 2 +- .../converters/basic/ByteConverter.java | 2 +- .../converters/basic/CharConverter.java | 2 +- .../converters/basic/DateConverter.java | 12 +- .../converters/basic/UriConverter.java | 2 +- .../converters/composite/ArrayConverter.java | 2 +- .../converters/composite/CollectionConverter.java | 2 +- .../converters/composite/MapConverter.java | 9 +- .../composite/ObjectWithFieldsConverter.java | 2 +- .../composite/PlexusConfigurationConverter.java | 2 +- .../converters/composite/PropertiesConverter.java | 9 +- .../converters/lookup/ConverterLookup.java | 2 +- .../expression/DefaultExpressionEvaluator.java | 2 +- .../expression/ExpressionEvaluationException.java | 2 +- .../expression/ExpressionEvaluator.java | 2 +- .../expression/TypeAwareExpressionEvaluator.java | 2 +- .../discovery/DiscoveryListenerDescriptor.java | 2 +- .../factory/AbstractComponentFactory.java | 2 +- .../plexus/component/factory/ComponentFactory.java | 2 +- .../component/factory/ComponentFactoryManager.java | 2 +- .../factory/ComponentInstantiationException.java | 2 +- .../factory/DefaultComponentFactoryManager.java | 2 +- .../UndefinedComponentFactoryException.java | 2 +- .../factory/java/JavaComponentFactory.java | 2 +- .../plexus/component/manager/ComponentManager.java | 2 +- .../manager/PerLookupComponentManager.java | 2 +- .../UndefinedComponentManagerException.java | 2 +- .../component/repository/ComponentDependency.java | 4 +- .../component/repository/ComponentDescriptor.java | 12 +- .../component/repository/ComponentRequirement.java | 4 +- .../repository/ComponentRequirementList.java | 4 +- .../repository/ComponentSetDescriptor.java | 4 +- .../exception/ComponentConfigurationException.java | 2 +- .../ComponentDescriptorUnmarshallingException.java | 2 +- .../ComponentImplementationNotFoundException.java | 2 +- .../exception/ComponentLifecycleException.java | 2 +- .../exception/ComponentLookupException.java | 6 +- .../ComponentLookupRuntimeException.java} | 32 ++-- ...nentManagerImplementationNotFoundException.java | 2 +- .../exception/ComponentProfileException.java | 2 +- .../exception/ComponentRepositoryException.java | 2 +- .../component/repository/io/PlexusTools.java | 68 +++----- .../configuration/DefaultPlexusConfiguration.java | 2 +- .../configuration/PlexusConfigurationMerger.java | 40 ++--- .../io/XmlPlexusConfigurationWriter.java | 15 +- .../source/ChainedConfigurationSource.java | 10 +- .../configuration/xml/XmlPlexusConfiguration.java | 7 +- .../InitializeSystemPropertiesPhase.java | 19 +-- .../codehaus/plexus/context/ContextException.java | 2 +- .../codehaus/plexus/context/DefaultContext.java | 2 +- .../plexus/lifecycle/AbstractLifecycleHandler.java | 14 +- .../lifecycle/DefaultLifecycleHandlerManager.java | 2 +- .../plexus/lifecycle/LifecycleHandlerManager.java | 2 +- .../plexus/logging/AbstractLogEnabled.java | 2 +- .../codehaus/plexus/logging/AbstractLogger.java | 2 +- .../plexus/logging/AbstractLoggerManager.java | 2 +- .../codehaus/plexus/logging/BaseLoggerManager.java | 9 +- .../org/codehaus/plexus/logging/LogEnabled.java | 2 +- .../java/org/codehaus/plexus/logging/Logger.java | 2 +- .../org/codehaus/plexus/logging/LoggerManager.java | 2 +- .../plexus/logging/console/ConsoleLogger.java | 2 +- .../logging/console/ConsoleLoggerManager.java | 9 +- .../plexus/lifecycle/phase/Contextualizable.java | 2 +- .../plexus/lifecycle/phase/Disposable.java | 2 +- .../plexus/lifecycle/phase/Initializable.java | 2 +- .../lifecycle/phase/InitializationException.java | 2 +- .../plexus/lifecycle/phase/LogDisablePhase.java | 2 +- .../lifecycle/phase/PhaseExecutionException.java | 2 +- .../plexus/lifecycle/phase/StartingException.java | 2 +- .../plexus/lifecycle/phase/StoppingException.java | 2 +- plexus-container-default/src/site/site.xml | 36 +++- .../plexus/DefaultComponentLookupManagerTest.java | 2 +- .../plexus/DyanamicComponentKungFuTest.java | 2 +- .../codehaus/plexus/PlexusJUnit4TestCaseTest.java | 28 ++++ .../org/codehaus/plexus/PlexusTestCaseTest.java | 2 +- .../component/composition/AbstractComponent.java | 2 +- .../AbstractCompositionResolverTest.java | 2 +- .../plexus/component/composition/Component.java | 2 +- .../plexus/component/composition/ComponentA.java | 2 +- .../plexus/component/composition/ComponentB.java | 2 +- .../plexus/component/composition/ComponentC.java | 2 +- .../plexus/component/composition/ComponentD.java | 2 +- .../plexus/component/composition/ComponentE.java | 2 +- .../plexus/component/composition/ComponentF.java | 2 +- .../ComponentWithSeveralFieldsOfTheSameType.java | 2 +- .../component/composition/DefaultComponent.java | 2 +- .../component/composition/DefaultComponentA.java | 2 +- .../component/composition/DefaultComponentB.java | 2 +- .../component/composition/DefaultComponentC.java | 2 +- .../DefaultComponentComposerManagerTest.java | 2 +- .../DefaultCompositionResolverTest.java | 2 +- .../component/configurator/AbstractComponent.java | 2 +- .../AbstractComponentConfiguratorTest.java | 8 +- .../plexus/component/configurator/Component.java | 2 +- .../configurator/ComponentWithArrayFields.java | 2 +- .../ComponentWithCollectionFields.java | 2 +- .../configurator/ComponentWithCompositeFields.java | 2 +- .../configurator/ComponentWithMapField.java | 2 +- .../configurator/ComponentWithPropertiesField.java | 2 +- .../configurator/ComponentWithSetters.java | 2 +- .../configurator/ConfigurableComponent.java | 2 +- .../component/configurator/DefaultComponent.java | 2 +- .../component/configurator/ImportantThing.java | 2 +- .../discovery/ComponentDiscovererTest.java | 2 +- .../discovery/DefaultDiscoveredComponent.java | 2 +- .../component/discovery/DiscoveredComponent.java | 2 +- .../plexus/component/factory/Component.java | 2 +- .../plexus/component/factory/ComponentImplA.java | 2 +- .../plexus/component/factory/ComponentImplB.java | 2 +- .../plexus/component/factory/ComponentImplC.java | 2 +- .../factory/java/JavaComponentFactoryTest.java | 2 +- .../ClassicSingletonComponentManagerTest.java | 2 +- .../plexus/component/manager/SlowComponent.java | 2 +- ...ponentClassicSingletonComponentManagerTest.java | 2 +- .../repository/ComponentDescriptorTest.java | 2 +- .../repository/ComponentRequirementTest.java | 2 +- .../component/repository/ComponentSetTest.java | 2 +- .../repository/DefaultComponentRepositoryTest.java | 2 +- .../ConfigurationResourceExceptionTest.java | 2 +- .../configuration/ConfigurationTestHelper.java | 2 +- .../DefaultPlexusConfigurationTest.java | 2 +- .../xml/XmlPlexusConfigurationTest.java | 2 +- .../plexus/logging/AbstractLoggerManagerTest.java | 2 +- .../plexus/logging/CustomLoggerManagerTest.java | 2 +- .../codehaus/plexus/logging/LogEnabledTest.java | 2 +- .../codehaus/plexus/logging/MockLogEnabled.java | 2 +- .../org/codehaus/plexus/logging/MockLogger.java | 2 +- .../codehaus/plexus/logging/MockLoggerManager.java | 2 +- .../logging/console/ConsoleLoggerManagerTest.java | 2 +- .../plexus/logging/console/ConsoleLoggerTest.java | 2 +- .../test/java/org/codehaus/plexus/test/Action.java | 2 +- .../org/codehaus/plexus/test/AddUserAction.java | 2 +- .../java/org/codehaus/plexus/test/Component.java | 2 +- .../plexus/test/DefaultLoadOnStartService.java | 2 +- .../DefaultLoadOnStartServiceWithRoleHint.java | 2 +- .../codehaus/plexus/test/LoadOnStartService.java | 2 +- .../test/LoadOnStartServiceWithRoleHint.java | 2 +- .../codehaus/plexus/test/PlexusContainerTest.java | 5 +- .../plexus/test/SimpleLifecycleHandler.java | 2 +- .../codehaus/plexus/test/lifecycle/phase/Eeny.java | 2 +- .../plexus/test/lifecycle/phase/Meeny.java | 2 +- .../codehaus/plexus/test/lifecycle/phase/Miny.java | 2 +- .../codehaus/plexus/test/lifecycle/phase/Mo.java | 2 +- .../codehaus/plexus/test/list/AbstractValve.java | 2 +- .../codehaus/plexus/test/list/DefaultPipeline.java | 7 +- .../org/codehaus/plexus/test/list/Pipeline.java | 2 +- .../java/org/codehaus/plexus/test/list/Valve.java | 2 +- .../org/codehaus/plexus/test/list/ValveFour.java | 2 +- .../org/codehaus/plexus/test/list/ValveOne.java | 2 +- .../org/codehaus/plexus/test/list/ValveThree.java | 2 +- .../org/codehaus/plexus/test/list/ValveTwo.java | 2 +- .../codehaus/plexus/test/map/AbstractActivity.java | 2 +- .../org/codehaus/plexus/test/map/Activity.java | 2 +- .../codehaus/plexus/test/map/ActivityManager.java | 2 +- .../org/codehaus/plexus/test/map/ActivityOne.java | 2 +- .../org/codehaus/plexus/test/map/ActivityTwo.java | 2 +- .../plexus/test/map/DefaultActivityManager.java | 2 +- .../plexus/test/map/NoComponentsMapTest.java | 2 +- .../src/test/resources/jar-repository/a.jar | Bin 0 -> 990 bytes .../src/test/resources/jar-repository/b.jar | Bin 0 -> 820 bytes .../src/test/resources/jar-repository/c.jar | Bin 0 -> 722 bytes .../src/test/resources/jar-repository/d.jar | Bin 0 -> 718 bytes .../test-components/component-a-1.0-SNAPSHOT.jar | Bin 0 -> 3329 bytes .../test-components/component-a-2.0-SNAPSHOT.jar | Bin 0 -> 3329 bytes .../test-components/component-b-1.0-SNAPSHOT.jar | Bin 0 -> 3329 bytes .../test-components/component-c-1.0-SNAPSHOT.jar | Bin 0 -> 3328 bytes .../plexus-archiver-1.0-alpha-8.jar | Bin 0 -> 150172 bytes .../test/test-components/plugin0-1.0-SNAPSHOT.jar | Bin 0 -> 5100 bytes .../test/test-components/plugin1-1.0-SNAPSHOT.jar | Bin 0 -> 4006 bytes pom.xml | 37 ++--- src/site/apt/history.apt | 35 ++-- src/site/apt/index.apt | 2 +- src/site/site.xml | 2 + 256 files changed, 736 insertions(+), 793 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
