You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by eo...@apache.org on 2018/12/26 11:13:14 UTC
[maven-assembly-plugin] branch MASSEMBLY-900 updated (0b3d983 ->
d33a906)
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a change to branch MASSEMBLY-900
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git.
discard 0b3d983 MASSEMBLY-900 Upgrade plexus-archiver to 4.0.0
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
new d33a906 MASSEMBLY-900 Upgrade plexus-archiver to 4.0.0
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 (0b3d983)
\
N -- N -- N refs/heads/MASSEMBLY-900 (d33a906)
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 | 5 +-
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 +------------
.../handler-def/pom.xml | 8 ---
.../invoker.properties | 5 +-
.../custom-handler-withFileEntries/pom.xml | 43 ------------
.../handler-def/pom.xml | 8 ---
.../invoker.properties | 6 +-
.../custom-handler-withMixedEntries/pom.xml | 43 ------------
.../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 -----
93 files changed, 123 insertions(+), 1716 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-900 Upgrade
plexus-archiver to 4.0.0
Posted by eo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch MASSEMBLY-900
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
commit d33a9061185caa57bdf43df41c43ae47a13487dc
Author: Enrico Olivelli <eo...@apache.org>
AuthorDate: Mon Dec 24 11:24:20 2018 +0100
MASSEMBLY-900 Upgrade plexus-archiver to 4.0.0
---
pom.xml | 2 +-
.../assembly/archive/archiver/PrefixedArchivedFileSet.java | 7 +++++++
.../plugins/assembly/archive/archiver/PrefixedFileSet.java | 10 +++++++++-
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 81a0246..7f5ed0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>3.6.0</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java
index bfe122d..2f1d12e 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java
@@ -24,6 +24,7 @@ import org.codehaus.plexus.components.io.fileselectors.FileSelector;
import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
import java.io.File;
+import org.codehaus.plexus.components.io.filemappers.FileMapper;
/**
*
@@ -31,6 +32,7 @@ import java.io.File;
class PrefixedArchivedFileSet
implements ArchivedFileSet
{
+ private final static FileMapper[] EMPTY_FILE_MAPPERS_ARRAY = new FileMapper[0];
private final String rootPrefix;
@@ -149,4 +151,9 @@ class PrefixedArchivedFileSet
return fileSet.getStreamTransformer();
}
+ @Override
+ public FileMapper[] getFileMappers()
+ {
+ return EMPTY_FILE_MAPPERS_ARRAY;
+ }
}
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java
index 922b29e..86d8071 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java
@@ -24,6 +24,7 @@ import org.codehaus.plexus.components.io.fileselectors.FileSelector;
import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
import java.io.File;
+import org.codehaus.plexus.components.io.filemappers.FileMapper;
/**
*
@@ -31,6 +32,7 @@ import java.io.File;
class PrefixedFileSet
implements FileSet
{
+ private final static FileMapper[] EMPTY_FILE_MAPPERS_ARRAY = new FileMapper[0];
private final String rootPrefix;
@@ -177,4 +179,10 @@ class PrefixedFileSet
{
return fileSet.getStreamTransformer();
}
-}
+
+ @Override
+ public FileMapper[] getFileMappers()
+ {
+ return EMPTY_FILE_MAPPERS_ARRAY;
+ }
+}
\ No newline at end of file