You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/12/27 17:44:21 UTC
[maven-assembly-plugin] branch MASSEMBLY-892 updated (ab7d401 ->
d203f39)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MASSEMBLY-892
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git.
discard ab7d401 Debugging ...
discard efbaafb [MASSEMBLY-892] - Upgrade maven-plugins parent to version 32
add 2ee29d1 [MASSEMBLY-893] Typo in FAQ
add 8f5c7a0 [MNGSITE-341] use https for sigs, hashes and KEYS
add 68b9158 [MPOM-205] use sha512 checksums instead of sha1
add 0d232af collapse identical catch blocks
add 3076fd3 Use diamond operator from java 7
add 96f6c82 fix typos use java7 methods/classes
add da917e4 Merge pull request #6 from turbanoff/use-java7-features
add 81609ea we do not use anymore svn :)
add eb1cab9 [MASSEMBLY-898] upgrade to plexus-io 3.1.1
add 23eb9ac use asfMavenTlpPlgnBuild
add e9bee66 use https.protocol for 1.7 build
add 6b3b67a fix it directory test... and use try-resources
add 6ad45c8 fix directories.....
add c4be15e [MASSEMBLY-899] Make deprecated and non used of parameter useJvmChmod parameter (plugin is now 1.7)
add 1bfc69e useJvmChmod not used anymore
add 01b305d Integration test maintainance: - Update maven-surefire-plugin, older versions have trouble with long paths on Windows - Rewrite verify.bsh to verify.groovy for better feedback to console - Remove invoker.properties that contain only contain the default goal (package) - Use latest maven-invoker-plugin + cleanup configuration - Don't use maven-invoker-plugin in ITs
add d33a906 MASSEMBLY-900 Upgrade plexus-archiver to 4.0.0
new d203f39 [MASSEMBLY-892] - Upgrade maven-plugins parent to version 33
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 (ab7d401)
\
N -- N -- N refs/heads/MASSEMBLY-892 (d203f39)
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:
Jenkinsfile | 2 +-
pom.xml | 15 +-
src/it/it-project-parent/pom.xml | 34 +-
.../projects/bugs/massembly-190/invoker.properties | 18 -
.../projects/bugs/massembly-285/invoker.properties | 18 -
.../projects/bugs/massembly-306/invoker.properties | 18 -
.../projects/bugs/massembly-375/invoker.properties | 18 -
.../handler-def/pom.xml | 8 -
.../invoker.properties | 5 +-
.../custom-containerDescriptorHandler/pom.xml | 46 +-
.../custom-containerDescriptorHandler/verify.bsh | 4 +-
.../handler-def/pom.xml | 8 -
.../invoker.properties | 5 +-
.../custom-handler-withFileEntries/pom.xml | 43 --
.../custom-handler-withFileEntries/verify.bsh | 4 +-
.../handler-def/pom.xml | 8 -
.../invoker.properties | 6 +-
.../custom-handler-withMixedEntries/pom.xml | 43 --
.../custom-handler-withMixedEntries/verify.bsh | 4 +-
.../invoker.properties | 18 -
.../metaInf-spring-aggregation/invoker.properties | 18 -
.../invoker.properties | 18 -
.../dep-with-transitive-filter/invoker.properties | 18 -
.../depSet-transFromProfile/invoker.properties | 18 -
.../dependencySet-matchScope/invoker.properties | 18 -
.../dependencySet-nonTransitive/invoker.properties | 18 -
.../dependencySet-notUnpacked/invoker.properties | 18 -
.../dependencySet-unpacked/invoker.properties | 18 -
.../invoker.properties | 18 -
.../invoker.properties | 18 -
.../invoker.properties | 18 -
.../include-project-artifact/invoker.properties | 18 -
.../include-project-attachments/invoker.properties | 18 -
.../include-provided/invoker.properties | 18 -
.../massembly-201/invoker.properties | 18 -
.../massembly-232/invoker.properties | 18 -
.../massembly-235/invoker.properties | 18 -
.../massembly-345/invoker.properties | 18 -
.../massembly-619/invoker.properties | 18 -
.../massembly-99/invoker.properties | 18 -
.../invoker.properties | 18 -
.../multiple-wildcard-includes/invoker.properties | 18 -
.../invoker.properties | 18 -
.../unpack-deps-correct-dir/invoker.properties | 18 -
.../invoker.properties | 18 -
.../bin/jars-in-archive-root/invoker.properties | 18 -
.../invoker.properties | 18 -
.../component-descriptors-merged/verify.bsh | 79 ---
.../component-descriptors-merged/verify.groovy | 56 +++
.../deps-unpacked-to-root-dir/invoker.properties | 18 -
.../deps-unpacked-to-root-dir/verify.bsh | 73 ---
.../deps-unpacked-to-root-dir/verify.groovy} | 25 +-
.../no-target-dir/invoker.properties | 18 -
.../multimodule-sources-copied/invoker.properties | 18 -
.../no-target-dir-multimodule/invoker.properties | 18 -
.../project/no-target-dir/invoker.properties | 18 -
.../project/sources-copied/invoker.properties | 18 -
.../src/no-target-dir/invoker.properties | 18 -
.../src/src-dir-copied/invoker.properties | 18 -
.../excludes-using-regex/invoker.properties | 18 -
.../filtered-module-sources/invoker.properties | 18 -
.../filtered-multimodule/invoker.properties | 18 -
.../include-parent-dir/invoker.properties | 18 -
.../invoker.properties | 18 -
.../multimodule-win-lineEndings/invoker.properties | 18 -
.../invoker.properties | 18 -
.../filters-defined-in-build/invoker.properties | 17 -
.../massembly-736/invoker.properties | 17 -
.../invoker.properties | 18 -
.../invoker.properties | 18 -
.../ignoreDirFormatExtensions/invoker.properties | 18 -
.../manifest-with-customEntry/invoker.properties | 18 -
.../manifest-with-mainClass/invoker.properties | 18 -
.../invoker.properties | 18 -
.../skipAssemblyCLIPropertySet/invoker.properties | 18 -
.../invoker.properties | 18 -
.../invoker.properties | 18 -
.../invoker.properties | 18 -
.../multimodule/massembly-298/invoker.properties | 18 -
.../multimodule/massembly-474/invoker.properties | 18 -
.../multimodule/massembly-619/invoker.properties | 18 -
.../invoker.properties | 18 -
.../invoker.properties | 18 -
.../invoker.properties | 18 -
.../two-level-multimodule/invoker.properties | 18 -
.../multimodule/two-level-multimodule/verify.bsh | 37 --
.../two-level-multimodule/verify.groovy} | 13 +-
.../invoker.properties | 18 -
.../two-levels-includeBaseDir-withBin/verify.bsh | 31 --
.../verify.groovy | 8 +-
.../invoker.properties | 18 -
.../verify.groovy | 10 +-
.../basic-repository/invoker.properties | 18 -
.../repositories/massembly-196/invoker.properties | 18 -
.../repositories/massembly-855/invoker.properties | 18 -
.../repo-with-snapshot-parents/invoker.properties | 18 -
.../assembly/AssemblerConfigurationSource.java | 8 +-
.../InvalidAssemblerConfigurationException.java | 2 +-
.../assembly/archive/ArchiveCreationException.java | 2 +-
.../archive/ArchiveExpansionException.java | 2 +-
.../plugins/assembly/archive/AssemblyArchiver.java | 2 +-
.../assembly/archive/DefaultAssemblyArchiver.java | 40 +-
.../archive/ManifestCreationFinalizer.java | 12 +-
.../archive/archiver/AssemblyProxyArchiver.java | 15 +-
.../archive/archiver/PrefixedArchivedFileSet.java | 9 +-
.../assembly/archive/archiver/PrefixedFileSet.java | 12 +-
.../assembly/archive/archiver/SarUnArchiver.java | 2 +-
.../archive/phase/AssemblyArchiverPhase.java | 2 +-
.../phase/AssemblyArchiverPhaseComparator.java | 2 +-
.../archive/phase/DependencySetAssemblyPhase.java | 2 +-
.../archive/phase/FileItemAssemblyPhase.java | 8 +-
.../archive/phase/FileSetAssemblyPhase.java | 2 +-
.../archive/phase/ModuleSetAssemblyPhase.java | 16 +-
.../archive/phase/RepositoryAssemblyPhase.java | 2 +-
.../wrappers/GroupVersionAlignmentWrapper.java | 2 +-
.../wrappers/RepoBuilderConfigSourceWrapper.java | 2 +-
.../archive/phase/wrappers/RepoInfoWrapper.java | 4 +-
.../assembly/archive/task/AddArtifactTask.java | 2 +-
.../archive/task/AddDependencySetsTask.java | 10 +-
.../assembly/archive/task/AddDirectoryTask.java | 6 +-
.../assembly/archive/task/AddFileSetsTask.java | 4 +-
.../assembly/archive/task/ArchiverTask.java | 2 +-
.../artifact/DefaultDependencyResolver.java | 6 +-
.../artifact/DependencyResolutionException.java | 2 +-
.../assembly/artifact/DependencyResolver.java | 4 +-
.../artifact/ResolutionManagementInfo.java | 2 +-
.../filter/AbstractLineAggregatingHandler.java | 6 +-
.../filter/ComponentsXmlArchiverFileFilter.java | 7 +-
.../filter/ContainerDescriptorHandler.java | 2 +-
.../filter/SimpleAggregatingDescriptorHandler.java | 32 +-
.../format/AssemblyFormattingException.java | 2 +-
.../plugins/assembly/format/ReaderFormatter.java | 6 +-
.../AssemblyInterpolationException.java | 2 +-
.../interpolation/AssemblyInterpolator.java | 8 +-
.../plugins/assembly/io/AssemblyReadException.java | 2 +-
.../maven/plugins/assembly/io/AssemblyReader.java | 2 +-
.../plugins/assembly/io/DefaultAssemblyReader.java | 24 +-
.../io/PrefixedClasspathLocatorStrategy.java | 2 +-
.../assembly/io/RelativeFileLocatorStrategy.java | 2 +-
.../assembly/mojos/AbstractAssemblyMojo.java | 23 +-
.../plugins/assembly/mojos/SingleAssemblyMojo.java | 2 +-
.../repository/DefaultRepositoryAssembler.java | 544 ++++++++++-----------
.../plugins/assembly/utils/AssemblyFileUtils.java | 2 +-
.../assembly/utils/AssemblyFormatUtils.java | 4 +-
.../maven/plugins/assembly/utils/FilterUtils.java | 10 +-
.../assembly/utils/InterpolationConstants.java | 4 +-
.../maven/plugins/assembly/utils/ProjectUtils.java | 8 +-
.../assembly/utils/TypeConversionUtils.java | 2 +-
src/site/fml/faq.fml | 2 +-
src/site/xdoc/download.xml.vm | 6 +-
.../archive/DefaultAssemblyArchiverTest.java | 6 +-
.../archiver/AssemblyProxyArchiverTest.java | 4 +-
.../phase/AssemblyArchiverPhaseComparatorTest.java | 2 +-
.../archive/phase/ModuleSetAssemblyPhaseTest.java | 18 +-
.../archive/task/AddDependencySetsTaskTest.java | 4 +-
.../artifact/ResolutionManagementInfoTest.java | 4 +-
.../ComponentsXmlArchiverFileFilterTest.java | 10 +-
.../assembly/io/DefaultAssemblyReaderTest.java | 8 +-
.../assembly/testutils/TestFileManager.java | 2 +-
.../plugins/assembly/utils/FilterUtilsTest.java | 8 +-
.../plugins/assembly/utils/ProjectUtilsTest.java | 16 +-
.../assembly/utils/TypeConversionUtilsTest.java | 4 +-
162 files changed, 596 insertions(+), 2241 deletions(-)
delete mode 100644 src/it/projects/bugs/massembly-190/invoker.properties
delete mode 100644 src/it/projects/bugs/massembly-285/invoker.properties
delete mode 100644 src/it/projects/bugs/massembly-306/invoker.properties
delete mode 100644 src/it/projects/bugs/massembly-375/invoker.properties
delete mode 100644 src/it/projects/container-descriptors/metaInf-services-aggregation/invoker.properties
delete mode 100644 src/it/projects/container-descriptors/metaInf-spring-aggregation/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/dep-with-transitive-filter/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/depSet-transFromProfile/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/dependencySet-matchScope/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/dependencySet-nonTransitive/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/dependencySet-notUnpacked/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/dependencySet-unpacked/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/dependencySet-withExecutedProject/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/include-project-artifact/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/include-project-attachments/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/include-provided/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/massembly-201/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/massembly-232/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/massembly-235/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/massembly-345/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/massembly-619/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/massembly-99/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/multiple-wildcard-includes/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/unpack-deps-correct-dir/invoker.properties
delete mode 100644 src/it/projects/dependency-sets/using-moduleSet-implied-depSet/invoker.properties
delete mode 100644 src/it/projects/descriptor-refs/bin/jars-in-archive-root/invoker.properties
delete mode 100644 src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/invoker.properties
delete mode 100644 src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/verify.bsh
create mode 100644 src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/verify.groovy
delete mode 100644 src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/invoker.properties
delete mode 100644 src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh
rename src/it/projects/{multimodule/two-levels-includeBaseDir-withSrc/verify.bsh => descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.groovy} (52%)
delete mode 100644 src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/invoker.properties
delete mode 100644 src/it/projects/descriptor-refs/project/multimodule-sources-copied/invoker.properties
delete mode 100644 src/it/projects/descriptor-refs/project/no-target-dir-multimodule/invoker.properties
delete mode 100644 src/it/projects/descriptor-refs/project/no-target-dir/invoker.properties
delete mode 100644 src/it/projects/descriptor-refs/project/sources-copied/invoker.properties
delete mode 100644 src/it/projects/descriptor-refs/src/no-target-dir/invoker.properties
delete mode 100644 src/it/projects/descriptor-refs/src/src-dir-copied/invoker.properties
delete mode 100644 src/it/projects/file-sets/excludes-using-regex/invoker.properties
delete mode 100644 src/it/projects/file-sets/filtered-module-sources/invoker.properties
delete mode 100644 src/it/projects/file-sets/filtered-multimodule/invoker.properties
delete mode 100644 src/it/projects/file-sets/include-parent-dir/invoker.properties
delete mode 100644 src/it/projects/file-sets/multimodule-unix-lineEndings/invoker.properties
delete mode 100644 src/it/projects/file-sets/multimodule-win-lineEndings/invoker.properties
delete mode 100644 src/it/projects/filtering-feature/fileset-to-tar-massembly-722/invoker.properties
delete mode 100644 src/it/projects/filtering-feature/filters-defined-in-build/invoker.properties
delete mode 100644 src/it/projects/filtering-feature/massembly-736/invoker.properties
delete mode 100644 src/it/projects/forking-tests/assembly-assembly-with-module-binaries/invoker.properties
delete mode 100644 src/it/projects/forking-tests/assembly-attached-with-module-binaries/invoker.properties
delete mode 100644 src/it/projects/mojo-configuration/ignoreDirFormatExtensions/invoker.properties
delete mode 100644 src/it/projects/mojo-configuration/manifest-with-customEntry/invoker.properties
delete mode 100644 src/it/projects/mojo-configuration/manifest-with-mainClass/invoker.properties
delete mode 100644 src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/invoker.properties
delete mode 100644 src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/invoker.properties
delete mode 100644 src/it/projects/mojo-tests/single-in-one-project-hierarchy/invoker.properties
delete mode 100644 src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/invoker.properties
delete mode 100644 src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/invoker.properties
delete mode 100644 src/it/projects/multimodule/massembly-298/invoker.properties
delete mode 100644 src/it/projects/multimodule/massembly-474/invoker.properties
delete mode 100644 src/it/projects/multimodule/massembly-619/invoker.properties
delete mode 100644 src/it/projects/multimodule/multimodule-binariesNotSource/invoker.properties
delete mode 100644 src/it/projects/multimodule/multimodule-sourceNotBinaries/invoker.properties
delete mode 100644 src/it/projects/multimodule/multimodule-wholeReactorFromChild/invoker.properties
delete mode 100644 src/it/projects/multimodule/two-level-multimodule/invoker.properties
delete mode 100644 src/it/projects/multimodule/two-level-multimodule/verify.bsh
copy src/it/projects/{files/multimodule-relativePath/verify.bsh => multimodule/two-level-multimodule/verify.groovy} (77%)
delete mode 100644 src/it/projects/multimodule/two-levels-includeBaseDir-withBin/invoker.properties
delete mode 100644 src/it/projects/multimodule/two-levels-includeBaseDir-withBin/verify.bsh
copy src/it/projects/{file-sets/dont-use-default-excludes => multimodule/two-levels-includeBaseDir-withBin}/verify.groovy (72%)
delete mode 100644 src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/invoker.properties
copy src/it/projects/{file-sets/excluding-svn-dirs => multimodule/two-levels-includeBaseDir-withSrc}/verify.groovy (68%)
delete mode 100644 src/it/projects/repositories/basic-repository/invoker.properties
delete mode 100644 src/it/projects/repositories/massembly-196/invoker.properties
delete mode 100644 src/it/projects/repositories/massembly-855/invoker.properties
delete mode 100644 src/it/projects/repositories/repo-with-snapshot-parents/invoker.properties
[maven-assembly-plugin] 01/01: [MASSEMBLY-892] - Upgrade
maven-plugins parent to version 33
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MASSEMBLY-892
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
commit d203f39d585585e977a662c79ca91633108a9fcf
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Thu Dec 27 18:44:18 2018 +0100
[MASSEMBLY-892] - Upgrade maven-plugins parent to version 33
---
pom.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7f5ed0b..c22c6ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>31</version>
+ <version>33</version>
<relativePath>../../pom/maven/maven-plugins/pom.xml</relativePath>
</parent>
@@ -62,7 +62,6 @@ under the License.
</distributionManagement>
<properties>
- <surefire.version>2.21.0</surefire.version>
<javaVersion>7</javaVersion>
<mdoVersion>2.0.0</mdoVersion>
<mavenArchiverVersion>3.2.0</mavenArchiverVersion>