[maven-dependency-plugin] 02/03: Merge tag 'upstream/2.7'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Jun 24 14:48:49 UTC 2015


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven-dependency-plugin.

commit 8af678a532a3300e01b4d17a1a009470936e57e5
Merge: 5cd9ef8 7b3dae1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jun 24 16:14:04 2015 +0200

    Merge tag 'upstream/2.7'
    
    Upstream version 2.7

 pom.xml                                            |  367 +++++++
 src/changes/changes.xml                            |   16 +
 src/it-harness-poms/copy-dependencies/pom.xml      |   42 +
 src/it-harness-poms/copy-dependencies2/pom.xml     |   33 +
 src/it-harness-poms/mdep-27/pom.xml                |   48 +
 src/it-harness-poms/mdep-50/pom.xml                |   41 +
 src/it-harness-poms/mdep-61/pom.xml                |   53 +
 src/it-harness-poms/mdep-66/pom.xml                |   53 +
 src/it-harness-poms/mdep-67/pom.xml                |   43 +
 src/it/analyze-dep-mgt/invoker.properties          |    1 +
 src/it/analyze-dep-mgt/pom.xml                     |   56 ++
 src/it/analyze-report/invoker.properties           |    1 +
 src/it/analyze-report/pom.xml                      |   74 ++
 src/it/analyze-report/src/main/java/Main.java      |   12 +
 src/it/analyze-report/verify.bsh                   |   14 +
 src/it/analyze/invoker.properties                  |    1 +
 src/it/analyze/pom.xml                             |   74 ++
 src/it/analyze/src/main/java/Main.java             |   12 +
 src/it/analyze/verify.bsh                          |   10 +
 src/it/build-classpath/invoker.properties          |    1 +
 src/it/build-classpath/pom.xml                     |   54 +
 src/it/build-classpath/test.properties             |    4 +
 src/it/build-classpath/verify.bsh                  |   28 +
 .../invoker.properties                             |    1 +
 .../pom.xml                                        |   83 ++
 .../verify.bsh                                     |   26 +
 src/it/copy-cli/invoker.properties                 |    1 +
 src/it/copy-cli/pom.xml                            |   32 +
 src/it/copy-cli/test.properties                    |    1 +
 src/it/copy-cli/verify.bsh                         |   19 +
 src/it/copy-dependencies/invoker.properties        |    1 +
 src/it/copy-dependencies/pom.xml                   |  107 ++
 src/it/copy-dependencies/verify.bsh                |   93 ++
 src/it/copy-from-reactor/child-a/pom.xml           |   39 +
 .../child-a/src/main/resources/DoNotDelete.xml     |   20 +
 src/it/copy-from-reactor/child-b/pom.xml           |   74 ++
 src/it/copy-from-reactor/invoker.properties        |    1 +
 src/it/copy-from-reactor/pom.xml                   |   53 +
 src/it/copy-from-reactor/verify.bsh                |   19 +
 src/it/copy/invoker.properties                     |    1 +
 src/it/copy/pom.xml                                |   64 ++
 src/it/copy/verify.bsh                             |   19 +
 src/it/dependency-properties/invoker.properties    |    1 +
 src/it/dependency-properties/pom.xml               |   88 ++
 src/it/dependency-properties/verify.bsh            |   28 +
 src/it/filterunpack/pom.xml                        |   58 ++
 src/it/filterunpack/verify.groovy                  |   23 +
 src/it/go-offline/invoker.properties               |    1 +
 src/it/go-offline/pom.xml                          |   47 +
 src/it/go-offline/test.properties                  |    1 +
 src/it/purge-local-repository-bad-pom/bad-pom.xml  |   47 +
 .../invoker.properties                             |    3 +
 src/it/purge-local-repository-bad-pom/pom.xml      |   47 +
 src/it/purge-local-repository-bad-pom/setup.bsh    |   16 +
 .../purge-local-repository-bad-pom/test.properties |    2 +
 src/it/purge-local-repository-bad-pom/verify.bsh   |   33 +
 .../invoker.properties                             |    1 +
 .../purge-local-repository-non-transitive/pom.xml  |   47 +
 .../test.properties                                |    2 +
 .../verify.bsh                                     |   19 +
 .../invoker.properties                             |    3 +
 src/it/purge-local-repository-reresolve/pom.xml    |   47 +
 src/it/purge-local-repository-reresolve/verify.bsh |   33 +
 .../invoker.properties                             |    1 +
 .../purge-local-repository-snapshots-only/pom.xml  |   52 +
 .../setup.bsh                                      |   18 +
 .../test.properties                                |    2 +
 .../verify.bsh                                     |   22 +
 .../invoker.properties                             |    3 +
 .../purge-local-repository-version-range/pom.xml   |   47 +
 .../test.properties                                |    2 +
 .../verify.bsh                                     |   33 +
 src/it/purge-local-repository/invoker.properties   |    1 +
 src/it/purge-local-repository/pom.xml              |   47 +
 src/it/purge-local-repository/setup.bsh            |   10 +
 src/it/purge-local-repository/test.properties      |    1 +
 src/it/purge-local-repository/verify.bsh           |   12 +
 .../child-a/pom.xml                                |   36 +
 .../child-a/src/main/resources/DoNotDelete.xml     |   20 +
 .../child-b/pom.xml                                |   74 ++
 .../invoker.properties                             |    1 +
 src/it/resolve-plugins-exclude-reactor/pom.xml     |   62 ++
 .../resolve-plugins-exclude-reactor/verify.groovy  |    7 +
 .../invoker.properties                             |    1 +
 src/it/resolve-plugins-with-exclude/pom.xml        |   54 +
 .../resolve-plugins-with-exclude/test.properties   |    1 +
 src/it/resolve-plugins-with-exclude/verify.groovy  |   10 +
 src/it/resolve-plugins/invoker.properties          |    1 +
 src/it/resolve-plugins/pom.xml                     |   39 +
 src/it/resolve-plugins/test.properties             |    1 +
 src/it/resolve/invoker.properties                  |    1 +
 src/it/resolve/pom.xml                             |   47 +
 src/it/resolve/test.properties                     |    1 +
 src/it/settings.xml                                |   73 ++
 .../setup-custom-ear-lifecycle/invoker.properties  |    1 +
 src/it/setup-custom-ear-lifecycle/manager/pom.xml  |   20 +
 .../org/apache/maven/archiver/LogArchiver.java     |   31 +
 .../org/apache/maven/archiver/LogUnArchiver.java   |   26 +
 .../main/resources/META-INF/plexus/components.xml  |   35 +
 src/it/setup-custom-ear-lifecycle/plugin/pom.xml   |   72 ++
 .../java/org/apache/maven/plugins/EarMojo.java     |   47 +
 .../main/resources/META-INF/plexus/components.xml  |   73 ++
 src/it/setup-custom-ear-lifecycle/pom.xml          |   26 +
 src/it/sources/invoker.properties                  |    1 +
 src/it/sources/pom.xml                             |   47 +
 src/it/sources/test.properties                     |    1 +
 src/it/tree/expected.txt                           |   14 +
 src/it/tree/invoker.properties                     |    1 +
 src/it/tree/pom.xml                                |   47 +
 src/it/tree/test.properties                        |    1 +
 src/it/tree/verify.bsh                             |   18 +
 src/it/unpack-cli/invoker.properties               |    2 +
 src/it/unpack-cli/pom.xml                          |   32 +
 src/it/unpack-cli/test.properties                  |    2 +
 src/it/unpack-cli/verify.bsh                       |   33 +
 src/it/unpack-custom-ear/invoker.properties        |    1 +
 src/it/unpack-custom-ear/pom.xml                   |   83 ++
 src/it/unpack-custom-ear/verify.groovy             |   21 +
 src/it/unpack-dependencies/invoker.properties      |    1 +
 src/it/unpack-dependencies/pom.xml                 |   71 ++
 src/it/unpack-dependencies/verify.groovy           |   23 +
 src/it/unpack/invoker.properties                   |    1 +
 src/it/unpack/pom.xml                              |   74 ++
 src/it/unpack/verify.bsh                           |   33 +
 .../plugin/dependency/AbstractAnalyzeMojo.java     |  388 ++++++++
 .../dependency/AbstractDependencyFilterMojo.java   |  402 ++++++++
 .../plugin/dependency/AbstractDependencyMojo.java  |  515 ++++++++++
 .../dependency/AbstractFromDependenciesMojo.java   |  220 +++++
 .../plugin/dependency/AbstractResolveMojo.java     |  181 ++++
 .../maven/plugin/dependency/AnalyzeDepMgt.java     |  373 +++++++
 .../plugin/dependency/AnalyzeDuplicateMojo.java    |  181 ++++
 .../maven/plugin/dependency/AnalyzeMojo.java       |   47 +
 .../maven/plugin/dependency/AnalyzeOnlyMojo.java   |   47 +
 .../maven/plugin/dependency/AnalyzeReportMojo.java |  237 +++++
 .../maven/plugin/dependency/AnalyzeReportView.java |  206 ++++
 .../plugin/dependency/BuildClasspathMojo.java      |  571 +++++++++++
 .../plugin/dependency/CopyDependenciesMojo.java    |  260 +++++
 .../apache/maven/plugin/dependency/GetMojo.java    |  357 +++++++
 .../apache/maven/plugin/dependency/ListMojo.java   |   38 +
 .../maven/plugin/dependency/PropertiesMojo.java    |  100 ++
 .../dependency/PurgeLocalRepositoryMojo.java       |  683 +++++++++++++
 .../apache/maven/plugin/dependency/TreeMojo.java   |  456 +++++++++
 .../plugin/dependency/UnpackDependenciesMojo.java  |  141 +++
 .../AbstractFromConfigurationMojo.java             |  568 +++++++++++
 .../dependency/fromConfiguration/ArtifactItem.java |  380 +++++++
 .../dependency/fromConfiguration/CopyMojo.java     |  149 +++
 .../ProcessArtifactItemsRequest.java               |  101 ++
 .../dependency/fromConfiguration/UnpackMojo.java   |  207 ++++
 .../plugin/dependency/resolvers/GoOfflineMojo.java |   71 ++
 .../dependency/resolvers/ListRepositoriesMojo.java |   83 ++
 .../resolvers/ResolveDependenciesMojo.java         |  103 ++
 .../resolvers/ResolveDependencySourcesMojo.java    |   59 ++
 .../dependency/resolvers/ResolvePluginsMojo.java   |  212 ++++
 .../AbstractSerializingVisitor.java                |   57 ++
 .../treeSerializers/DOTDependencyNodeVisitor.java  |   91 ++
 .../GraphmlDependencyNodeVisitor.java              |  123 +++
 .../treeSerializers/TGFDependencyNodeVisitor.java  |  158 +++
 .../dependency/utils/DependencySilentLog.java      |  327 ++++++
 .../dependency/utils/DependencyStatusSets.java     |  203 ++++
 .../plugin/dependency/utils/DependencyUtil.java    |  280 ++++++
 .../utils/filters/ArtifactItemFilter.java          |   34 +
 .../dependency/utils/filters/DestFileFilter.java   |  277 ++++++
 .../dependency/utils/filters/MarkerFileFilter.java |  150 +++
 .../utils/filters/ResolveFileFilter.java           |   53 +
 .../utils/markers/DefaultFileMarkerHandler.java    |  190 ++++
 .../dependency/utils/markers/MarkerHandler.java    |   45 +
 .../utils/markers/SourcesFileMarkerHandler.java    |  198 ++++
 .../utils/markers/UnpackFileMarkerHandler.java     |   96 ++
 .../utils/resolvers/ArtifactsResolver.java         |   36 +
 .../utils/resolvers/DefaultArtifactsResolver.java  |   99 ++
 .../utils/translators/ArtifactTranslator.java      |   34 +
 .../translators/ClassifierTypeTranslator.java      |  137 +++
 src/main/resources/META-INF/plexus/components.xml  |  100 ++
 src/main/resources/analyze-report.properties       |   25 +
 src/main/resources/analyze-report_de.properties    |   25 +
 src/main/resources/analyze-report_en.properties    |   22 +
 src/main/resources/analyze-report_pt_BR.properties |   25 +
 src/main/resources/analyze-report_sv.properties    |   25 +
 src/site/apt/examples/copying-artifacts.apt.vm     |  265 +++++
 .../examples/copying-project-dependencies.apt.vm   |   99 ++
 ...he-build-on-dependency-analysis-warnings.apt.vm |   69 ++
 .../apt/examples/filtering-the-dependency-tree.apt |   87 ++
 src/site/apt/examples/preparing-dependencies.apt   |   84 ++
 .../apt/examples/purging-local-repository.apt.vm   |  144 +++
 ...solving-conflicts-using-the-dependency-tree.apt |   55 ++
 src/site/apt/examples/unpacking-artifacts.apt.vm   |  123 +++
 .../examples/unpacking-project-dependencies.apt.vm |   65 ++
 .../apt/examples/using-dependencies-sources.apt.vm |   66 ++
 src/site/apt/index.apt                             |  146 +++
 src/site/apt/usage.apt.vm                          |  700 +++++++++++++
 src/site/fml/faq.fml                               |   91 ++
 src/site/site.xml                                  |   49 +
 .../dependency/AbstractDependencyMojoTestCase.java |   78 ++
 .../maven/plugin/dependency/TestAnalyzeDepMgt.java |  249 +++++
 .../dependency/TestAnalyzeDuplicateMojo.java       |  222 +++++
 .../plugin/dependency/TestBuildClasspathMojo.java  |  172 ++++
 .../dependency/TestCopyDependenciesMojo.java       |  776 +++++++++++++++
 .../dependency/TestCopyDependenciesMojo2.java      |  379 +++++++
 .../maven/plugin/dependency/TestGetMojo.java       |  192 ++++
 .../TestIncludeExcludeUnpackDependenciesMojo.java  |  184 ++++
 .../dependency/TestIncludeExcludeUnpackMojo.java   |  316 ++++++
 .../plugin/dependency/TestPropertiesMojo.java      |   73 ++
 .../maven/plugin/dependency/TestResolveMojo.java   |   87 ++
 .../apache/maven/plugin/dependency/TestSkip.java   |  327 ++++++
 .../maven/plugin/dependency/TestTreeMojo.java      |  231 +++++
 .../dependency/TestUnpackDependenciesMojo.java     |  678 +++++++++++++
 .../dependency/TestUnpackDependenciesMojo2.java    |  255 +++++
 .../fromConfiguration/TestArtifactItem.java        |   59 ++
 .../dependency/fromConfiguration/TestCopyMojo.java |  716 ++++++++++++++
 .../fromConfiguration/TestUnpackMojo.java          |  585 +++++++++++
 .../its/AbstractDependencyPluginITCase.java        |  324 ++++++
 .../dependency/its/DependencyPluginTest.java       |   89 ++
 .../dependency/its/ExecutionFailedException.java   |   50 +
 .../testUtils/DependencyArtifactStubFactory.java   |   59 ++
 .../dependency/testUtils/DependencyTestUtils.java  |  111 +++
 .../testUtils/stubs/DependencyProjectStub.java     | 1044 ++++++++++++++++++++
 .../stubs/DuplicateDependencies2ProjectStub.java   |   69 ++
 .../stubs/DuplicateDependenciesProjectStub.java    |   69 ++
 .../stubs/StubDefaultFileMarkerHandler.java        |   41 +
 .../dependency/testUtils/stubs/StubMarkerFile.java |   64 ++
 .../stubs/StubSourcesFileMarkerHandler.java        |   52 +
 .../stubs/StubUnpackFileMarkerHandler.java         |   64 ++
 .../dependency/utils/TestDependencyStatusSets.java |  123 +++
 .../dependency/utils/TestDependencyUtil.java       |  311 ++++++
 .../plugin/dependency/utils/TestSilentLog.java     |   81 ++
 .../utils/filters/TestDestFileFilter.java          |  229 +++++
 .../utils/filters/TestMarkerFileFilter.java        |  177 ++++
 .../utils/filters/TestResolveMarkerFileFilter.java |   90 ++
 .../markers/TestDefaultMarkerFileHandler.java      |  191 ++++
 .../markers/TestSourcesMarkerFileHandler.java      |  301 ++++++
 .../utils/markers/TestUnpackMarkerFileHandler.java |  283 ++++++
 .../translators/TestClassifierTypeTranslator.java  |  190 ++++
 .../plexus/util/interpolation/Interpolator.java    |   15 +
 .../util/interpolation/RegexBasedInterpolator.java |   47 +
 .../plexus/util/interpolation/ValueSource.java     |   13 +
 src/test/resources/its/check-harness/pom.xml       |   56 ++
 src/test/resources/its/check-harness/test.bat      |   13 +
 src/test/resources/its/get/pom.xml                 |   62 ++
 src/test/resources/its/pom.xml                     |   66 ++
 src/test/resources/its/readme.txt                  |    4 +
 src/test/resources/its/resolve/pom.xml             |   56 ++
 src/test/resources/its/siblingReference/a/pom.xml  |   30 +
 .../java/org/apache/dependency/HelloWorld.java     |   28 +
 .../java/org/apache/dependency/HelloWorld2.java    |   28 +
 src/test/resources/its/siblingReference/b/pom.xml  |   68 ++
 src/test/resources/its/siblingReference/pom.xml    |   35 +
 .../m2repo/maven/maven-parent/5/maven-parent-5.pom |  466 +++++++++
 .../maven/maven-parent/5/maven-parent-5.pom.sha1   |    1 +
 .../maven-metadata-local.xml                       |   11 +
 .../test/maven-dependency-plugin-test.pom          |  254 +++++
 .../maven/plugins/maven-metadata-central.xml       |    1 +
 .../plugins/maven-plugins/8/maven-plugins-8.pom    |  160 +++
 .../maven-plugins/8/maven-plugins-8.pom.sha1       |    1 +
 .../9-SNAPSHOT/maven-metadata-local.xml            |   11 +
 .../9-SNAPSHOT/maven-plugins-9-SNAPSHOT.pom        |  189 ++++
 .../plugins/maven-plugins/maven-metadata-local.xml |   11 +
 .../maven-site-plugin/maven-metadata-central.xml   |    4 +
 .../1.0/purge-local-repository-2-1.0.jar.sha1      |    1 +
 .../1.0/purge-local-repository-2-1.0.pom           |   39 +
 .../1.0/purge-local-repository-2-1.0.pom.sha1      |    1 +
 .../purge-local-repository-2/maven-metadata.xml    |   12 +
 .../maven-metadata.xml.sha1                        |    1 +
 .../1.0/purge-local-repository-1.0.jar.sha1        |    1 +
 .../1.0/purge-local-repository-1.0.pom             |   47 +
 .../1.0/purge-local-repository-1.0.pom.sha1        |    1 +
 .../purge-local-repository/maven-metadata.xml      |   12 +
 .../purge-local-repository/maven-metadata.xml.sha1 |    1 +
 .../resources/m2repo/test/resolve/1/resolve-1.pom  |   26 +
 .../m2repo/test/resolve/maven-metadata-local.xml   |   11 +
 .../unit/build-classpath-test/plugin-config.xml    |   38 +
 .../unit/copy-dependencies-test/plugin-config.xml  |   32 +
 .../resources/unit/copy-test/plugin-config.xml     |   38 +
 .../unit/duplicate-dependencies/plugin-config.xml  |   63 ++
 .../unit/duplicate-dependencies/plugin-config2.xml |   75 ++
 src/test/resources/unit/get-test/plugin-config.xml |   40 +
 .../unit/properties-test/plugin-config.xml         |   43 +
 .../resources/unit/resolve-test/plugin-config.xml  |   38 +
 .../skip-test/plugin-analyze-report-config.xml     |   46 +
 .../resources/unit/skip-test/plugin-config.xml     |   45 +
 .../resources/unit/skip-test/plugin-get-config.xml |   44 +
 .../resources/unit/tree-test/plugin-config.xml     |   38 +
 .../unpack-dependencies-test/plugin-config.xml     |   33 +
 .../unit/unpack-dependencies-test/test.txt         |   32 +
 .../unit/unpack-dependencies-test/test.zip         |  Bin 0 -> 400 bytes
 .../resources/unit/unpack-test/plugin-config.xml   |   38 +
 285 files changed, 27963 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-dependency-plugin.git



More information about the pkg-java-commits mailing list