[maven] branch master updated (d831747 -> 731fb75)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Jul 8 00:09:12 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a change to branch master
in repository maven.
from d831747 Updated maven-dependency-plugin version from 2.4 to 2.7
new 57de30f Imported Upstream version 3.1.1
new ce512ec Refreshed the patches
new 617e973 New dependency on libsisu-plexus-java >= 0.3.0
new 3912bc7 Updated the clean target
new 46e6f71 Removed the no_aop classifier from the sisu-guice dependency
new 7b95ae3 Set the exact version of modello used
new 5966b4a Depend on libplexus-utils2-java >= 3.0.15
new ed6765f Removed the dependency on libsisu-ioc-java
new d37ed4c Updated the Maven version in the substitution rules of debian/maven.buildRules
new 4099b57 Replaced the dependency on libaether-java with libeclipse-aether-java
new 38520e1 Updated the versions of the plugins in debian/maven.buildRules
new dba0dbc New build dependencies on liblogback-java and libmockito-java
new 12fb5e3 No longer add the plexus-container-default dependency to maven-model-builder
new da88f6d Install the new logging directory in the conf directory
new a181aff New dependency on libslf4j-java
new 731fb75 Install the guice dependencies (aopalliance and javax.inject) in the /usr/share/maven/lib/ directory
The 16 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitattributes | 10 +-
.gitignore | 4 +-
apache-maven/LICENSE.txt => LICENSE | 0
NOTICE | 7 +
README.bootstrap.txt | 4 +-
apache-maven/NOTICE.txt | 23 --
apache-maven/README.txt | 14 +-
apache-maven/pom.xml | 53 ++-
apache-maven/src/bin/m2.conf | 1 +
apache-maven/src/bin/mvn | 30 +-
apache-maven/src/bin/mvn.bat | 2 +-
apache-maven/src/bin/mvnDebug | 30 +-
apache-maven/src/bin/mvnDebug.bat | 4 +-
apache-maven/src/bin/mvnyjp | 34 +-
.../src/conf/logging/simplelogger.properties | 9 +-
apache-maven/src/conf/settings.xml | 2 +-
.../main/appended-resources/META-INF/LICENSE.vm | 49 +++
apache-maven/src/main/assembly/bin.xml | 40 +-
apache-maven/src/main/assembly/src.xml | 11 +-
build.xml | 6 +-
debian/changelog | 16 +-
debian/control | 15 +-
debian/maven.buildRules | 31 +-
debian/maven.install | 3 +-
debian/maven.links | 19 +-
debian/maven.rules | 2 +-
debian/patches/add_dependencies.diff | 29 +-
debian/patches/dep_versions.diff | 45 ++-
debian/patches/force_java15_compiler.diff | 6 +-
debian/patches/modello.diff | 6 +-
debian/patches/no_maven_assembly.diff | 6 +-
debian/patches/plugins_version.diff | 186 +++++----
debian/patches/secure-maven-central-access.diff | 8 +-
debian/rules | 1 +
doap_Maven.rdf | 11 +
maven-aether-provider/pom.xml | 55 ++-
.../internal/ArtifactDescriptorUtils.java | 18 +-
.../internal/DefaultArtifactDescriptorReader.java | 170 +++++---
.../repository/internal/DefaultModelCache.java | 4 +-
.../repository/internal/DefaultModelResolver.java | 20 +-
.../repository/internal/DefaultServiceLocator.java | 52 ---
.../internal/DefaultVersionRangeResolver.java | 106 +++--
.../internal/DefaultVersionResolver.java | 108 +++--
.../repository/internal/LocalSnapshotMetadata.java | 4 +-
.../internal/LocalSnapshotMetadataGenerator.java | 14 +-
.../repository/internal/MavenAetherModule.java | 74 ++++
.../maven/repository/internal/MavenMetadata.java | 37 +-
.../internal/MavenRepositorySystemSession.java | 106 -----
.../internal/MavenRepositorySystemUtils.java | 136 +++++++
.../repository/internal/MavenServiceLocator.java | 52 ---
.../repository/internal/MavenSnapshotMetadata.java | 100 +++++
.../repository/internal/RelocatedArtifact.java | 14 +-
.../internal/RemoteSnapshotMetadata.java | 74 +---
.../internal/RemoteSnapshotMetadataGenerator.java | 14 +-
.../internal/SnapshotMetadataGeneratorFactory.java | 12 +-
.../repository/internal/VersionsMetadata.java | 17 +-
.../internal/VersionsMetadataGenerator.java | 12 +-
.../internal/VersionsMetadataGeneratorFactory.java | 12 +-
.../maven/repository/internal/package-info.java | 19 +-
.../apache/maven/repository/internal/package.html | 3 -
maven-aether-provider/src/site/apt/index.apt | 33 ++
.../internal/AbstractRepositoryTestCase.java | 85 ++++
.../DefaultArtifactDescriptorReaderTest.java | 77 ++++
.../internal/DefaultVersionResolverTest.java | 96 +++++
...st.java => MavenRepositorySystemUtilsTest.java} | 12 +-
.../repository/internal/RepositorySystemTest.java | 220 +++++++++++
.../internal/util/ConsoleRepositoryListener.java | 132 +++++++
.../internal/util/ConsoleTransferListener.java | 186 +++++++++
.../07.20.3-SNAPSHOT/maven-metadata.xml | 49 +++
.../dep-mng5459/0.4.0-SNAPSHOT/maven-metadata.xml | 47 +++
.../artifact/1.0/artifact-1.0-classifier.zip | 0
.../repo/ut/simple/artifact/1.0/artifact-1.0.pom | 48 +++
.../repo/ut/simple/artifact/1.0/artifact-1.0.zip | 0
.../repo/ut/simple/artifact/maven-metadata.xml | 34 ++
.../ut/simple/dependency/1.0/dependency-1.0.pom | 31 ++
.../repo/ut/simple/dependency/maven-metadata.xml | 34 ++
.../repo/ut/simple/parent/1.0/parent-1.0.pom | 43 ++
.../repo/ut/simple/parent/maven-metadata.xml | 34 ++
maven-artifact/pom.xml | 8 +-
.../java/org/apache/maven/artifact/Artifact.java | 4 +
.../artifact/repository/ArtifactRepository.java | 34 +-
.../repository/ArtifactRepositoryPolicy.java | 1 -
.../artifact/versioning/ComparableVersion.java | 20 +-
.../versioning/DefaultArtifactVersion.java | 6 +-
.../maven/artifact/versioning/Restriction.java | 6 +-
maven-artifact/src/site/apt/index.apt | 35 ++
.../artifact/versioning/VersionRangeTest.java | 103 ++---
maven-compat/compatibility.cfl | 79 ----
maven-compat/pom.xml | 16 +-
.../apache/maven/artifact/ArtifactScopeEnum.java | 2 +-
.../artifact/deployer/DefaultArtifactDeployer.java | 30 +-
.../installer/DefaultArtifactInstaller.java | 18 +-
.../DefaultArtifactRepositoryFactory.java | 2 +-
.../metadata/DefaultRepositoryMetadataManager.java | 108 +++--
.../repository/metadata/MetadataBridge.java | 21 +-
.../maven/artifact/resolver/ArtifactResolver.java | 6 +-
.../artifact/resolver/DefaultArtifactResolver.java | 124 +++---
.../maven/profiles/DefaultProfileManager.java | 24 +-
.../maven/profiles/ProfilesConversionUtils.java | 13 +-
.../activation/SystemPropertyProfileActivator.java | 2 +-
.../apache/maven/project/MavenProjectBuilder.java | 3 +
.../java/org/apache/maven/project/ModelUtils.java | 100 ++---
.../maven/project/ProjectBuilderConfiguration.java | 3 +
.../org/apache/maven/project/ProjectUtils.java | 2 +-
.../DefaultModelInheritanceAssembler.java | 15 +-
.../AbstractStringBasedModelInterpolator.java | 12 +-
.../StringSearchModelInterpolator.java | 53 +--
.../maven/project/path/DefaultPathTranslator.java | 4 +-
.../project/validation/DefaultModelValidator.java | 11 +-
.../project/validation/ModelValidationResult.java | 2 +-
.../apache/maven/repository/MetadataGraphNode.java | 6 +-
.../repository/legacy/DefaultWagonManager.java | 34 +-
.../repository/legacy/LegacyRepositorySystem.java | 38 +-
.../repository/legacy/TransferListenerAdapter.java | 6 +-
.../DefaultArtifactRepositoryFactory.java | 2 +-
.../resolver/DefaultLegacyArtifactCollector.java | 10 +-
.../resolver/transform/ArtifactTransformation.java | 11 +-
.../transform/ArtifactTransformationManager.java | 1 -
.../repository/metadata/ArtifactMetadata.java | 16 +-
.../maven/repository/metadata/MetadataGraph.java | 2 +-
.../repository/metadata/MetadataGraphEdge.java | 10 +-
.../repository/metadata/MetadataResolution.java | 2 +-
.../metadata/MetadataResolutionResult.java | 4 +-
.../usability/plugin/ExpressionDocumenter.java | 24 +-
.../src/main/resources/META-INF/maven/plugin.xml | 21 +
.../AbstractArtifactComponentTestCase.java | 63 +--
.../resolver/DefaultArtifactResolverTest.java | 2 +-
.../maven/artifact/testutils/MockManager.java | 12 +-
.../transform/TransformationManagerTest.java | 17 +-
.../project/AbstractMavenProjectTestCase.java | 15 +-
.../maven/project/ClasspathArtifactResolver.java | 14 +-
.../project/LegacyLocalRepositoryManager.java | 147 ++++++-
.../org/apache/maven/project/ModelUtilsTest.java | 6 +-
.../apache/maven/project/ProjectClasspathTest.java | 7 +-
.../apache/maven/project/TestArtifactResolver.java | 15 +
.../maven/project/TestMavenRepositorySystem.java | 15 +
.../apache/maven/project/TestProjectBuilder.java | 18 +-
.../inheritance/t00/ProjectInheritanceTest.java | 2 +-
.../inheritance/t02/ProjectInheritanceTest.java | 12 +-
.../inheritance/t04/ProjectInheritanceTest.java | 12 +-
.../inheritance/t05/ProjectInheritanceTest.java | 13 +-
.../inheritance/t07/ProjectInheritanceTest.java | 15 +-
.../repository/LegacyRepositorySystemTest.java | 18 +-
.../legacy/LegacyRepositorySystemTest.java | 8 +
.../resolver/DefaultArtifactCollectorTest.java | 18 +-
.../DefaultClasspathTransformationTest.java | 15 +
.../DefaultGraphConflictResolutionPolicyTest.java | 15 +
.../metadata/DefaultGraphConflictResolverTest.java | 15 +
.../artifact/resolver/ArtifactResolverTest.xml | 2 +-
maven-core/pom.xml | 63 ++-
.../apache/maven/DefaultArtifactFilterManager.java | 11 +-
.../main/java/org/apache/maven/DefaultMaven.java | 189 ++++-----
.../maven/DefaultProjectDependenciesResolver.java | 6 +-
.../apache/maven/LoggingRepositoryListener.java | 6 +-
.../apache/maven/ProjectBuildFailureException.java | 22 +-
.../apache/maven/ProjectDependenciesResolver.java | 1 -
.../main/java/org/apache/maven/ReactorReader.java | 200 +++++-----
.../java/org/apache/maven/RepositoryUtils.java | 64 +--
.../ArtifactMetadataRetrievalException.java | 23 ++
.../repository/LegacyLocalRepositoryManager.java | 38 +-
.../repository/MavenArtifactRepository.java | 3 +-
.../maven/artifact/repository/RepositoryCache.java | 4 +
.../repository/metadata/io/MetadataReader.java | 2 +-
.../resolver/ArtifactResolutionRequest.java | 24 +-
.../resolver/filter/ExclusionSetFilter.java | 6 +-
.../classrealm/ArtifactClassRealmConstituent.java | 2 +-
.../apache/maven/classrealm/ClassRealmManager.java | 4 +-
.../maven/classrealm/DefaultClassRealmManager.java | 60 ++-
.../configuration/BeanConfigurationRequest.java | 2 +-
.../apache/maven/eventspy/AbstractEventSpy.java | 1 +
.../java/org/apache/maven/eventspy/EventSpy.java | 7 +-
.../eventspy/internal/EventSpyDispatcher.java | 3 +-
.../internal/EventSpyExecutionListener.java | 1 +
.../internal/EventSpyRepositoryListener.java | 7 +-
.../maven/exception/DefaultExceptionHandler.java | 31 +-
.../apache/maven/exception/ExceptionHandler.java | 5 +
.../apache/maven/exception/ExceptionSummary.java | 17 +-
.../execution/DefaultMavenExecutionRequest.java | 20 +-
.../execution/DefaultMavenExecutionResult.java | 3 +-
.../maven/execution/MavenExecutionRequest.java | 46 ++-
.../org/apache/maven/execution/MavenSession.java | 23 +-
.../org/apache/maven/execution/ReactorManager.java | 8 +-
.../apache/maven/lifecycle/MavenExecutionPlan.java | 26 +-
.../maven/lifecycle/internal/BuilderCommon.java | 35 +-
.../lifecycle/internal/CurrentPhaseForThread.java | 7 +-
.../DefaultLifecycleExecutionPlanCalculator.java | 40 +-
.../internal/DefaultLifecyclePluginAnalyzer.java | 4 +-
.../lifecycle/internal/DependencyContext.java | 9 +-
.../lifecycle/internal/ExecutionPlanItem.java | 4 +-
.../lifecycle/internal/LifecycleDebugLogger.java | 1 -
.../internal/LifecycleDependencyResolver.java | 52 ++-
.../lifecycle/internal/LifecycleModuleBuilder.java | 6 +-
.../internal/LifecyclePluginResolver.java | 1 -
.../internal/LifecycleThreadedBuilder.java | 22 +-
.../lifecycle/internal/LifecycleWeaveBuilder.java | 19 +-
.../lifecycle/internal/MojoDescriptorCreator.java | 2 -
.../maven/lifecycle/internal/MojoExecutor.java | 1 -
.../internal/ThreadConfigurationService.java | 1 -
.../lifecycle/internal/ThreadLockedArtifact.java | 10 +-
.../plugin/DefaultLifecycleBindingsInjector.java | 18 +-
.../apache/maven/plugin/BuildPluginManager.java | 32 +-
.../java/org/apache/maven/plugin/CacheUtils.java | 10 +-
.../maven/plugin/DefaultBuildPluginManager.java | 37 +-
.../maven/plugin/DefaultExtensionRealmCache.java | 2 +-
.../maven/plugin/DefaultPluginArtifactsCache.java | 12 +-
.../maven/plugin/DefaultPluginDescriptorCache.java | 10 +-
.../maven/plugin/DefaultPluginRealmCache.java | 31 +-
.../apache/maven/plugin/ExtensionRealmCache.java | 2 +-
.../org/apache/maven/plugin/LegacySupport.java | 2 +-
.../apache/maven/plugin/MavenPluginManager.java | 6 +-
.../apache/maven/plugin/PluginArtifactsCache.java | 8 +-
.../apache/maven/plugin/PluginDescriptorCache.java | 4 +-
.../maven/plugin/PluginParameterException.java | 67 +++-
.../plugin/PluginParameterExpressionEvaluator.java | 29 +-
.../org/apache/maven/plugin/PluginRealmCache.java | 6 +-
.../plugin/internal/DefaultLegacySupport.java | 26 +-
.../plugin/internal/DefaultMavenPluginManager.java | 23 +-
.../DefaultPluginDependenciesResolver.java | 91 ++---
.../plugin/internal/DefaultPluginManager.java | 1 -
.../maven/plugin/internal/PlexusUtilsInjector.java | 18 +-
.../internal/PluginDependenciesResolver.java | 12 +-
.../maven/plugin/internal/WagonExcluder.java | 8 +-
.../plugin/prefix/DefaultPluginPrefixRequest.java | 4 +-
.../prefix/NoPluginFoundForPrefixException.java | 4 +-
.../maven/plugin/prefix/PluginPrefixRequest.java | 4 +-
.../maven/plugin/prefix/PluginPrefixResult.java | 6 +-
.../internal/DefaultPluginPrefixResolver.java | 42 +-
.../prefix/internal/DefaultPluginPrefixResult.java | 2 +-
.../version/DefaultPluginVersionRequest.java | 6 +-
.../maven/plugin/version/PluginVersionRequest.java | 4 +-
.../version/PluginVersionResolutionException.java | 4 +-
.../maven/plugin/version/PluginVersionResult.java | 2 +-
.../internal/DefaultPluginVersionResolver.java | 45 ++-
.../internal/DefaultPluginVersionResult.java | 2 +-
.../DefaultDependencyResolutionRequest.java | 4 +-
.../project/DefaultDependencyResolutionResult.java | 4 +-
.../maven/project/DefaultMavenProjectHelper.java | 29 +-
.../project/DefaultModelBuildingListener.java | 18 +-
.../maven/project/DefaultProjectBuilder.java | 78 ++--
.../project/DefaultProjectBuildingHelper.java | 12 +-
.../project/DefaultProjectBuildingRequest.java | 2 +-
.../DefaultProjectDependenciesResolver.java | 71 ++--
.../maven/project/DefaultProjectRealmCache.java | 2 +-
.../maven/project/DependencyResolutionRequest.java | 6 +-
.../maven/project/DependencyResolutionResult.java | 4 +-
.../org/apache/maven/project/MavenProject.java | 153 +++++---
.../apache/maven/project/MavenProjectHelper.java | 40 +-
.../org/apache/maven/project/ProjectBuilder.java | 3 +
.../maven/project/ProjectBuildingRequest.java | 10 +-
.../apache/maven/project/ProjectModelResolver.java | 18 +-
.../apache/maven/project/ProjectRealmCache.java | 2 +-
.../maven/project/artifact/AttachedArtifact.java | 9 +-
.../project/artifact/MavenMetadataSource.java | 23 +-
.../apache/maven/repository/RepositorySystem.java | 15 +-
.../legacy/metadata/ArtifactMetadataSource.java | 2 +-
.../rtinfo/internal/DefaultRuntimeInformation.java | 12 +-
.../org/apache/maven/settings/SettingsUtils.java | 2 +-
.../apache/maven/toolchain/DefaultToolchain.java | 10 +-
.../apache/maven/toolchain/ToolchainPrivate.java | 4 +-
.../java/DefaultJavaToolchainFactory.java | 15 +-
.../META-INF/plexus/artifact-handlers.xml | 345 +---------------
.../main/resources/META-INF/plexus/components.xml | 10 +-
...{artifact-handlers.xml => default-bindings.xml} | 267 +++----------
.../org/apache/maven/messages/build.properties | 17 +
maven-core/src/site/apt/artifact-handlers.apt | 59 +++
.../src/site/apt/configuration-management.apt | 17 +
maven-core/src/site/apt/default-bindings.apt.vm | 63 +--
.../apt/getting-to-container-configured-mojos.apt | 17 +
maven-core/src/site/apt/index.apt | 61 +++
maven-core/src/site/apt/inheritance.apt | 17 +
maven-core/src/site/apt/lifecycles.apt.vm | 37 +-
maven-core/src/site/apt/offline-mode.apt | 17 +
.../src/site/apt/plugin-execution-isolation.apt | 17 +
.../apt/scripting-support/marmalade-support.apt | 17 +
maven-core/src/site/site.xml | 3 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 21 +-
.../maven/MavenLifecycleParticipantTest.java | 5 +-
.../src/test/java/org/apache/maven/MavenTest.java | 19 +-
.../maven/ProjectDependenciesResolverTest.java | 17 +-
.../artifact/handler/ArtifactHandlerTest.java | 89 +++++
.../exception/DefaultExceptionHandlerTest.java | 60 +++
.../lifecycle/MojoExecutionXPathContainer.java | 3 -
.../internal/BuildListCalculatorTest.java | 4 +-
.../lifecycle/internal/BuilderCommonTest.java | 4 +-
.../internal/ConcurrencyDependencyGraphTest.java | 3 +-
.../internal/ConcurrentBuildLoggerTest.java | 3 +-
.../lifecycle/internal/ExecutionPlanItemTest.java | 3 +-
.../LifecycleExecutionPlanCalculatorTest.java | 6 +-
.../internal/LifecycleWeaveBuilderTest.java | 7 +-
.../lifecycle/internal/PhaseRecorderTest.java | 2 +
.../lifecycle/internal/ProjectBuildListTest.java | 3 +-
.../lifecycle/internal/ThreadOutputMuxerTest.java | 4 +-
.../lifecycle/internal/stub/AboutTheStubs.html | 19 +
.../internal/stub/BuildPluginManagerStub.java | 4 +-
.../internal/stub/DefaultLifecyclesStub.java | 1 +
.../internal/stub/PluginPrefixResolverStub.java | 2 +-
.../internal/stub/PluginVersionResolverStub.java | 2 +-
.../stub/ProjectDependenciesResolverStub.java | 6 +-
.../org/apache/maven/plugin/PluginManagerTest.java | 4 +
.../maven/plugin/PluginParameterExceptionTest.java | 164 ++++++++
.../PluginParameterExpressionEvaluatorTest.java | 20 +-
.../plugin/internal/DefaultLegacySupportTest.java | 74 ++++
.../project/AbstractMavenProjectTestCase.java | 15 +-
.../project/DefaultMavenProjectBuilderTest.java | 4 +-
.../project/LegacyLocalRepositoryManager.java | 147 ++++++-
.../org/apache/maven/project/MavenProjectTest.java | 30 +-
.../apache/maven/project/PomConstructionTest.java | 49 ++-
.../apache/maven/project/ProjectBuilderTest.java | 19 +-
.../apache/maven/project/TestMetadataSource.java | 4 +-
.../artifact/DefaultMavenMetadataCacheTest.java | 2 +
.../canonical/CanonicalProjectBuilderTest.java | 13 +-
.../maven/project/harness/Xpp3DomNodePointer.java | 4 +-
.../maven/repository/TestRepositoryConnector.java | 18 +-
.../repository/TestRepositoryConnectorFactory.java | 12 +-
.../maven/repository/TestRepositorySystem.java | 2 +-
.../settings/PomConstructionWithSettingsTest.java | 22 +-
.../apache/maven/settings/SettingsUtilsTest.java | 82 +++-
.../reporting-plugin-config/sub/pom.xml | 5 +-
.../projects/modelsource/module01}/pom.xml | 13 +-
.../test/resources/projects/modelsource/pom.xml | 13 +
maven-embedder/pom.xml | 44 ++-
.../main/java/org/apache/maven/embedder/App.java | 15 +
.../java/org/apache/maven/embedder/AppTest.java | 15 +
.../main/java/org/apache/maven/cli/CLIManager.java | 13 +-
.../org/apache/maven/cli/CLIReportingUtils.java | 111 +-----
.../main/java/org/apache/maven/cli/MavenCli.java | 328 +++++++++-------
.../org/apache/maven/cli/MavenLoggerManager.java | 162 --------
.../org/apache/maven/cli/PrintStreamLogger.java | 187 ---------
.../cli/{ => event}/DefaultEventSpyContext.java | 2 +-
.../cli/{ => event}/ExecutionEventLogger.java | 13 +-
.../maven/cli/logging/BaseSlf4jConfiguration.java | 25 +-
.../maven/cli/logging/Slf4jConfiguration.java | 30 +-
.../cli/logging/Slf4jConfigurationFactory.java | 83 ++++
.../org/apache/maven/cli/logging/Slf4jLogger.java | 145 +++++++
.../maven/cli/logging/Slf4jLoggerManager.java | 110 ++++++
.../maven/cli/logging/Slf4jStdoutLogger.java | 306 +++++++++++++++
.../cli/logging/impl/Log4j2Configuration.java | 47 ++-
.../cli/logging/impl/LogbackConfiguration.java | 61 +++
.../cli/logging/impl/Slf4jSimpleConfiguration.java | 63 +++
.../AbstractMavenTransferListener.java | 12 +-
.../BatchModeMavenTransferListener.java | 2 +-
.../ConsoleMavenTransferListener.java | 14 +-
.../{ => transfer}/QuietMavenTransferListener.java | 4 +-
.../Slf4jMavenTransferListener.java} | 34 +-
.../src/main/java/org/slf4j/MavenSlf4jFriend.java | 19 +-
.../org/slf4j/impl/MavenSlf4jSimpleFriend.java | 23 +-
.../META-INF/maven/slf4j-configuration.properties | 6 +-
maven-embedder/src/site/apt/cli.apt.vm | 28 ++
maven-embedder/src/site/apt/index.apt.vm | 34 ++
maven-embedder/src/site/apt/logging.apt | 112 ++++++
maven-embedder/src/site/site.xml | 4 +
.../java/org/apache/maven/cli/CLIManagerTest.java | 108 +++++
.../maven/cli/event/ExecutionEventLoggerTest.java | 61 +++
maven-model-builder/pom.xml | 12 +-
.../maven/model/building/DefaultModelBuilder.java | 168 +++++---
.../building/DefaultModelBuildingRequest.java | 6 +-
.../maven/model/building/DefaultModelProblem.java | 19 +-
.../building/DefaultModelProblemCollector.java | 26 +-
.../maven/model/building/FileModelSource.java | 30 +-
.../apache/maven/model/building/ModelCacheTag.java | 6 +-
.../org/apache/maven/model/building/ModelData.java | 12 +-
.../apache/maven/model/building/ModelProblem.java | 17 +-
.../model/building/ModelProblemCollector.java | 9 +-
...Listener.java => ModelProblemCollectorExt.java} | 21 +-
.../building/ModelProblemCollectorRequest.java | 101 +++++
.../apache/maven/model/building/ModelSource.java | 4 +
.../apache/maven/model/building/ModelSource2.java | 56 +++
.../inheritance/DefaultInheritanceAssembler.java | 19 +-
.../AbstractStringBasedModelInterpolator.java | 9 +-
.../interpolation/ProblemDetectingValueSource.java | 4 +-
.../StringSearchModelInterpolator.java | 435 +++++++++++++--------
.../DefaultDependencyManagementInjector.java | 2 +-
.../DefaultPluginManagementInjector.java | 3 +-
.../apache/maven/model/merge/MavenModelMerger.java | 75 +++-
.../normalization/DefaultModelNormalizer.java | 2 +-
.../model/plugin/DefaultReportingConverter.java | 10 +-
.../profile/DefaultProfileActivationContext.java | 57 ++-
.../model/profile/DefaultProfileInjector.java | 2 +-
.../model/profile/DefaultProfileSelector.java | 8 +-
.../model/profile/ProfileActivationContext.java | 7 +
.../profile/activation/FileProfileActivator.java | 13 +-
.../activation/JdkVersionProfileActivator.java | 62 +--
.../OperatingSystemProfileActivator.java | 91 ++---
.../activation/PropertyProfileActivator.java | 116 +++---
.../model/validation/DefaultModelValidator.java | 244 ++++++------
.../resources/org/apache/maven/model/pom-4.0.0.xml | 6 +-
maven-model-builder/src/site/apt/index.apt | 74 +++-
maven-model-builder/src/site/apt/super-pom.apt.vm | 17 +
.../building/DefaultModelBuilderFactoryTest.java | 5 +
.../model/building/SimpleProblemCollector.java | 30 +-
.../validation/DefaultModelValidatorTest.java | 39 +-
.../src/test/resources/poms/factory/simple.xml | 4 +-
...ctId-pom.xml => missing-report-version-pom.xml} | 24 ++
maven-model/pom.xml | 8 +-
.../apache/maven/model/io/xpp3/package-info.java | 31 +-
.../org/apache/maven/model/io/xpp3/package.html | 9 -
.../org/apache/maven/model/merge/ModelMerger.java | 71 ++--
.../org/apache/maven/model/merge/package-info.java | 12 +-
.../java/org/apache/maven/model/merge/package.html | 3 -
.../java/org/apache/maven/model/package-info.java | 20 +-
.../main/java/org/apache/maven/model/package.html | 4 -
maven-model/src/main/mdo/maven.mdo | 382 +++++++++---------
maven-model/src/site/apt/index.apt | 17 +
maven-plugin-api/pom.xml | 22 +-
.../maven/plugin/descriptor/MojoDescriptor.java | 62 ++-
.../maven/plugin/descriptor/PluginDescriptor.java | 6 +
maven-plugin-api/src/main/mdo/plugin.mdo | 40 +-
maven-plugin-api/src/site/apt/index.apt | 27 +-
maven-plugin-api/src/test/resources/plugin.xml | 20 +
maven-repository-metadata/pom.xml | 8 +-
.../src/main/mdo/metadata.mdo | 40 +-
maven-repository-metadata/src/site/apt/index.apt | 35 ++
maven-settings-builder/pom.xml | 8 +-
.../maven/settings/building/SettingsProblem.java | 2 +-
maven-settings/pom.xml | 8 +-
maven-settings/src/main/mdo/settings.mdo | 5 +-
maven-settings/src/site/apt/index.apt | 17 +
pom.xml | 279 ++++++-------
src/site/resources/images/maven-deps.png | Bin 57486 -> 58951 bytes
src/site/site.xml | 10 +-
src/site/xdoc/index.xml | 9 +-
421 files changed, 9227 insertions(+), 4872 deletions(-)
rename apache-maven/LICENSE.txt => LICENSE (100%)
create mode 100644 NOTICE
delete mode 100644 apache-maven/NOTICE.txt
copy maven-embedder/src/test/resources/META-INF/maven/org.apache.maven/maven-core/pom.properties => apache-maven/src/conf/logging/simplelogger.properties (69%)
create mode 100644 apache-maven/src/main/appended-resources/META-INF/LICENSE.vm
delete mode 100644 maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultServiceLocator.java
create mode 100644 maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java
delete mode 100644 maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSession.java
create mode 100644 maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
delete mode 100644 maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenServiceLocator.java
create mode 100644 maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java
copy maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java => maven-aether-provider/src/main/java/org/apache/maven/repository/internal/package-info.java (77%)
delete mode 100644 maven-aether-provider/src/main/java/org/apache/maven/repository/internal/package.html
create mode 100644 maven-aether-provider/src/site/apt/index.apt
create mode 100644 maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
create mode 100644 maven-aether-provider/src/test/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReaderTest.java
create mode 100644 maven-aether-provider/src/test/java/org/apache/maven/repository/internal/DefaultVersionResolverTest.java
rename maven-aether-provider/src/test/java/org/apache/maven/repository/internal/{DefaultServiceLocatorTest.java => MavenRepositorySystemUtilsTest.java} (77%)
create mode 100644 maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java
create mode 100644 maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleRepositoryListener.java
create mode 100644 maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java
create mode 100644 maven-aether-provider/src/test/resources/repo/org/apache/maven/its/dep-mng5324/07.20.3-SNAPSHOT/maven-metadata.xml
create mode 100644 maven-aether-provider/src/test/resources/repo/org/apache/maven/its/dep-mng5459/0.4.0-SNAPSHOT/maven-metadata.xml
copy maven-embedder/src/test/error-reporting-projects/parent-parse-ioex/pom.xml => maven-aether-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0-classifier.zip (100%)
create mode 100644 maven-aether-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.pom
copy maven-embedder/src/test/error-reporting-projects/parent-parse-ioex/pom.xml => maven-aether-provider/src/test/resources/repo/ut/simple/artifact/1.0/artifact-1.0.zip (100%)
create mode 100644 maven-aether-provider/src/test/resources/repo/ut/simple/artifact/maven-metadata.xml
create mode 100644 maven-aether-provider/src/test/resources/repo/ut/simple/dependency/1.0/dependency-1.0.pom
create mode 100644 maven-aether-provider/src/test/resources/repo/ut/simple/dependency/maven-metadata.xml
create mode 100644 maven-aether-provider/src/test/resources/repo/ut/simple/parent/1.0/parent-1.0.pom
create mode 100644 maven-aether-provider/src/test/resources/repo/ut/simple/parent/maven-metadata.xml
create mode 100644 maven-artifact/src/site/apt/index.apt
delete mode 100644 maven-compat/compatibility.cfl
copy maven-core/src/main/resources/META-INF/plexus/{artifact-handlers.xml => default-bindings.xml} (64%)
create mode 100644 maven-core/src/site/apt/artifact-handlers.apt
create mode 100644 maven-core/src/site/apt/index.apt
create mode 100644 maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
create mode 100644 maven-core/src/test/java/org/apache/maven/exception/DefaultExceptionHandlerTest.java
create mode 100644 maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java
create mode 100644 maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java
copy {maven-embedder/src/test/projects/isolated-project-getting-parent-pom/project => maven-core/src/test/resources/projects/modelsource/module01}/pom.xml (52%)
create mode 100644 maven-core/src/test/resources/projects/modelsource/pom.xml
delete mode 100644 maven-embedder/src/main/java/org/apache/maven/cli/MavenLoggerManager.java
delete mode 100644 maven-embedder/src/main/java/org/apache/maven/cli/PrintStreamLogger.java
rename maven-embedder/src/main/java/org/apache/maven/cli/{ => event}/DefaultEventSpyContext.java (96%)
rename maven-embedder/src/main/java/org/apache/maven/cli/{ => event}/ExecutionEventLogger.java (97%)
copy maven-core/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java => maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java (61%)
copy maven-core/src/main/java/org/apache/maven/lifecycle/MissingProjectException.java => maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java (61%)
create mode 100644 maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfigurationFactory.java
create mode 100644 maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
create mode 100644 maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLoggerManager.java
create mode 100644 maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java
copy maven-core/src/main/java/org/apache/maven/plugin/InvalidPluginDescriptorException.java => maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java (53%)
create mode 100644 maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java
create mode 100644 maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java
copy maven-embedder/src/main/java/org/apache/maven/cli/{ => transfer}/AbstractMavenTransferListener.java (90%)
rename maven-embedder/src/main/java/org/apache/maven/cli/{ => transfer}/BatchModeMavenTransferListener.java (96%)
rename maven-embedder/src/main/java/org/apache/maven/cli/{ => transfer}/ConsoleMavenTransferListener.java (90%)
rename maven-embedder/src/main/java/org/apache/maven/cli/{ => transfer}/QuietMavenTransferListener.java (90%)
rename maven-embedder/src/main/java/org/apache/maven/cli/{AbstractMavenTransferListener.java => transfer/Slf4jMavenTransferListener.java} (70%)
copy maven-core/src/main/java/org/apache/maven/InternalErrorException.java => maven-embedder/src/main/java/org/slf4j/MavenSlf4jFriend.java (72%)
copy maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataUtils.java => maven-embedder/src/main/java/org/slf4j/impl/MavenSlf4jSimpleFriend.java (61%)
copy maven-core/src/test/resources/projects/build.properties => maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties (66%)
create mode 100644 maven-embedder/src/site/apt/cli.apt.vm
create mode 100644 maven-embedder/src/site/apt/index.apt.vm
create mode 100644 maven-embedder/src/site/apt/logging.apt
create mode 100644 maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java
create mode 100644 maven-embedder/src/test/java/org/apache/maven/cli/event/ExecutionEventLoggerTest.java
copy maven-model-builder/src/main/java/org/apache/maven/model/building/{AbstractModelBuildingListener.java => ModelProblemCollectorExt.java} (69%)
create mode 100644 maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorRequest.java
create mode 100644 maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource2.java
copy maven-model-builder/src/test/resources/poms/validation/{missing-plugin-artifactId-pom.xml => missing-report-version-pom.xml} (63%)
copy maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java => maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java (54%)
delete mode 100644 maven-model/src/main/java/org/apache/maven/model/io/xpp3/package.html
copy maven-core/src/main/java/org/apache/maven/exception/ExceptionHandler.java => maven-model/src/main/java/org/apache/maven/model/merge/package-info.java (80%)
delete mode 100644 maven-model/src/main/java/org/apache/maven/model/merge/package.html
copy maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java => maven-model/src/main/java/org/apache/maven/model/package-info.java (76%)
delete mode 100644 maven-model/src/main/java/org/apache/maven/model/package.html
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven.git
More information about the pkg-java-commits
mailing list