You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gi...@apache.org on 2023/05/03 21:31:01 UTC
[maven-assembly-plugin] branch dependabot/maven/org.codehaus.plexus-plexus-archiver-4.6.3 updated (068ad75e -> 06263825)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch dependabot/maven/org.codehaus.plexus-plexus-archiver-4.6.3
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
discard 068ad75e Bump plexus-archiver from 4.6.0 to 4.6.3
add 6c7b43c4 [MASSEMBLY-974] Drop deprecated repository element (#113)
add b1471007 Bump jaxen from 1.2.0 to 2.0.0
add 5e21150e Bump commons-fileupload in /src/it/projects/bugs/massembly-580
add 529b387d Bump postgresql in /src/it/projects/bugs/massembly-730
add 05cc5b9e [MASSEMBLY-978] Bump plexus-utils to 3.5.1
add 14d58b28 [MASSEMBLY-979] Bump maven-common-artifact-filters from 3.3.1 to 3.3.2 (#92)
add 2bdcfbc4 [MASSEMBLY-981] Bump log4j from 1.x to 2.x in integration tests (#122)
add ef41d252 [MASSEMBLY-982] Drop dependency to maven-compat, drop RepositorySystem (#126)
add f9911acf [MASSEMBLY-972] Upgrade parent pom to 39
add 07c6a2ee [MASSEMBLY-972] Apply formatting
add 7b896da2 [MASSEMBLY-972] Fix to tests
add 7a4d3ee4 [MASSEMBLY-972] Ignore formatting commit
add 7c565c4f [MASSEMBLY-974] Drop deprecated repository element from model
add 6652c844 [MASSEMBLY-973] Bump zstd-jni from 1.5.4-2 to 1.5.5-1 (#130)
add 6a369e92 Bump maven-filtering from 3.3.0 to 3.3.1
add bbc4883b Bump plexus-io from 3.4.0 to 3.4.1
add 40129259 [MASSEMBLY-983] Bump maven-invoker-plugin to 3.5.1 to support running tests on Java 20
add 3d75293f [MASSEMBLY-983] Fix integration test to run correctly on Mac M1
add 56c5bb80 [MASSEMBLY-983] Add Java 20 to ci
add 6e4e40c3 Disable merge button and add jira autolink
add ec22b614 Fix jira autolink
add 434f110b [MASSEMBLY-974] Drop deprecated repository element from documentation
add 6abd687f configure notifications
add ef2c05ef [MASSEMBLY-984] Refresh download page
add 998f01a7 [MASSEMBLY-985] Cleanup declared dependencies
add 17e7eb53 [MASSEMBLY-965] integration test ensuring correct copy of symbolic link (#82)
add 2d61b0fd [MASSEMBLY-986] Minimal default Manifest configuration of jar archiver should be respected (#134)
add 06263825 Bump plexus-archiver from 4.6.0 to 4.6.3
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 (068ad75e)
\
N -- N -- N refs/heads/dependabot/maven/org.codehaus.plexus-plexus-archiver-4.6.3 (06263825)
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.
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 11 +
.../invoker.properties => .git-blame-ignore-revs | 5 +-
.github/workflows/maven-verify.yml | 2 +
pom.xml | 116 ++-
.../projects/basic-features/add-classpath/pom.xml | 2 +-
.../pom.xml | 2 +-
.../verify.bsh | 2 +-
src/it/projects/bugs/massembly-306/pom.xml | 12 +-
src/it/projects/bugs/massembly-580/pom.xml | 2 +-
src/it/projects/bugs/massembly-583/child2/pom.xml | 6 +-
src/it/projects/bugs/massembly-730/pom.xml | 2 +-
src/it/projects/bugs/massembly-891/pom.xml | 2 +-
src/it/projects/bugs/massembly-891/verify.groovy | 2 +-
.../projects/dependency-sets/massembly-969/pom.xml | 38 +-
.../massembly-969/src/main/assembly/bin.xml | 5 +
.../dependency-sets/massembly-969/verify.groovy | 22 +-
.../pom.xml | 12 +-
.../file-sets/symbolic-links/setup.groovy} | 68 +-
.../src/main/assembly-resources/test.txt | 0
.../src/main/assembly/src.xml | 1 -
.../symbolic-links/verify.groovy} | 24 +-
.../projects/repositories/basic-repository/pom.xml | 66 --
.../basic-repository/src/assemble/bin.xml | 38 -
.../org/apache/maven/plugin/assembly/test/App.java | 33 -
.../apache/maven/plugin/assembly/test/AppTest.java | 58 --
.../repositories/basic-repository/verify.bsh | 25 -
src/it/projects/repositories/massembly-196/pom.xml | 73 --
.../massembly-196/src/main/assembly/bin.xml | 44 -
.../massembly-196/src/main/java/test/App.java | 33 -
.../projects/repositories/massembly-196/verify.bsh | 37 -
.../repositories/massembly-855/child/pom.xml | 64 --
.../child/src/assembly/repository.xml | 34 -
src/it/projects/repositories/massembly-855/pom.xml | 48 --
.../it/massembly-855/1.0/massembly-855-1.0.jar | Bin 2677 -> 0 bytes
.../it/massembly-855/1.0/massembly-855-1.0.pom | 34 -
.../projects/repositories/massembly-855/verify.bsh | 38 -
.../repo-with-snapshot-parents/child/pom.xml | 73 --
.../1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.jar | Bin 193194 -> 0 bytes
.../1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.pom | 61 --
.../plexus/plexus/1.0.11/plexus-1.0.11.pom | 308 -------
.../child/src/assemble/bin.xml | 38 -
.../org/apache/maven/plugin/assembly/test/App.java | 33 -
.../apache/maven/plugin/assembly/test/AppTest.java | 58 --
.../repo-with-snapshot-parents/pom.xml | 37 -
.../repo-with-snapshot-parents/verify.bsh | 37 -
src/it/projects/reproducible/pom.xml | 2 +-
src/it/projects/reproducible/verify.groovy | 9 +-
src/it/projects/reproducible/zip-content-755.txt | 2 +-
src/it/projects/reproducible/zip-content-775.txt | 2 +-
src/it/projects/reproducible/zip-content-win.txt | 2 +-
.../assembly/AssemblerConfigurationSource.java | 13 +-
.../InvalidAssemblerConfigurationException.java | 18 +-
.../assembly/archive/ArchiveCreationException.java | 18 +-
.../archive/ArchiveExpansionException.java | 18 +-
.../plugins/assembly/archive/AssemblyArchiver.java | 24 +-
.../assembly/archive/DefaultAssemblyArchiver.java | 553 ++++++------
.../archive/ManifestCreationFinalizer.java | 101 +--
.../archive/archiver/AssemblyProxyArchiver.java | 954 ++++++++-------------
.../archive/archiver/PrefixedArchivedFileSet.java | 69 +-
.../assembly/archive/archiver/PrefixedFileSet.java | 88 +-
.../archive/phase/AssemblyArchiverPhase.java | 12 +-
.../phase/AssemblyArchiverPhaseComparator.java | 23 +-
.../archive/phase/DependencySetAssemblyPhase.java | 53 +-
.../archive/phase/FileItemAssemblyPhase.java | 152 ++--
.../archive/phase/FileSetAssemblyPhase.java | 37 +-
.../archive/phase/ModuleSetAssemblyPhase.java | 538 ++++++------
.../plugins/assembly/archive/phase/PhaseOrder.java | 6 +-
.../archive/phase/RepositoryAssemblyPhase.java | 154 ----
.../wrappers/GroupVersionAlignmentWrapper.java | 70 --
.../wrappers/RepoBuilderConfigSourceWrapper.java | 56 --
.../archive/phase/wrappers/RepoInfoWrapper.java | 108 ---
.../assembly/archive/task/AddArtifactTask.java | 288 +++----
.../archive/task/AddDependencySetsTask.java | 403 ++++-----
.../assembly/archive/task/AddDirectoryTask.java | 145 ++--
.../assembly/archive/task/AddFileSetsTask.java | 171 ++--
.../assembly/archive/task/ArchiverTask.java | 11 +-
.../artifact/DefaultDependencyResolver.java | 147 ++--
.../artifact/DependencyResolutionException.java | 13 +-
.../assembly/artifact/DependencyResolver.java | 32 +-
.../artifact/ResolutionManagementInfo.java | 67 +-
.../filter/AbstractLineAggregatingHandler.java | 125 ++-
.../filter/ComponentsXmlArchiverFileFilter.java | 159 ++--
.../filter/ContainerDescriptorHandler.java | 9 +-
.../assembly/filter/MetaInfServicesHandler.java | 29 +-
.../assembly/filter/MetaInfSpringHandler.java | 27 +-
.../filter/SimpleAggregatingDescriptorHandler.java | 153 ++--
.../format/AssemblyFormattingException.java | 18 +-
.../plugins/assembly/format/ReaderFormatter.java | 185 ++--
.../assembly/functions/MavenProjectConsumer.java | 8 +-
.../plugins/assembly/functions/MavenProjects.java | 94 +-
.../assembly/functions/ModuleSetConsumer.java | 12 +-
.../internal/DebugConfigurationListener.java | 59 +-
.../internal/SarPlexusIoResourceCollection.java | 11 +-
.../assembly/internal/SarUnArchiverProvider.java | 11 +-
.../interpolation/AssemblyExpressionEvaluator.java | 41 +-
.../AssemblyInterpolationException.java | 13 +-
.../interpolation/AssemblyInterpolator.java | 144 ++--
.../plugins/assembly/io/AssemblyReadException.java | 18 +-
.../maven/plugins/assembly/io/AssemblyReader.java | 29 +-
.../io/ClasspathResourceLocatorStrategy.java | 32 +-
.../plugins/assembly/io/DefaultAssemblyReader.java | 448 ++++------
.../plugins/assembly/io/DefaultMessageHolder.java | 386 ++++-----
.../maven/plugins/assembly/io/FileLocation.java | 92 +-
.../plugins/assembly/io/FileLocatorStrategy.java | 24 +-
.../apache/maven/plugins/assembly/io/Location.java | 13 +-
.../apache/maven/plugins/assembly/io/Locator.java | 44 +-
.../maven/plugins/assembly/io/LocatorStrategy.java | 9 +-
.../maven/plugins/assembly/io/MessageHolder.java | 59 +-
.../maven/plugins/assembly/io/MessageLevels.java | 55 +-
.../maven/plugins/assembly/io/MessageSink.java | 18 +-
.../io/PrefixedClasspathLocatorStrategy.java | 39 +-
.../assembly/io/RelativeFileLocatorStrategy.java | 29 +-
.../maven/plugins/assembly/io/URLLocation.java | 31 +-
.../maven/plugins/assembly/model/Assemblies.java | 18 +-
.../assembly/mojos/AbstractAssemblyMojo.java | 490 ++++-------
.../plugins/assembly/mojos/SingleAssemblyMojo.java | 42 +-
.../repository/DefaultRepositoryAssembler.java | 282 ------
.../assembly/repository/RepositoryAssembler.java | 34 -
.../repository/RepositoryAssemblyException.java | 44 -
.../repository/RepositoryBuilderConfigSource.java | 35 -
.../repository/model/DefaultRepositoryInfo.java | 93 --
.../assembly/repository/model/RepositoryInfo.java | 40 -
.../plugins/assembly/resolved/AssemblyId.java | 22 +-
.../plugins/assembly/utils/AssemblyFileUtils.java | 80 +-
.../assembly/utils/AssemblyFormatUtils.java | 370 ++++----
.../maven/plugins/assembly/utils/FilterUtils.java | 195 ++---
.../assembly/utils/InterpolationConstants.java | 26 +-
.../maven/plugins/assembly/utils/LineEndings.java | 32 +-
.../plugins/assembly/utils/LineEndingsUtils.java | 130 +--
.../assembly/utils/LinuxLineFeedInputStream.java | 63 +-
.../maven/plugins/assembly/utils/ProjectUtils.java | 115 +--
.../assembly/utils/TypeConversionUtils.java | 99 +--
.../assembly/utils/WindowsLineFeedInputStream.java | 66 +-
src/main/mdo/assembly-component.mdo | 4 +-
src/main/mdo/assembly.mdo | 157 ----
src/site/apt/advanced-descriptor-topics.apt.vm | 2 +-
src/site/apt/examples/index.apt | 2 -
.../single/including-and-excluding-artifacts.apt | 8 +-
src/site/apt/examples/single/index.apt | 2 -
.../apt/examples/single/using-repositories.apt.vm | 131 ---
src/site/site.xml | 1 -
src/site/xdoc/download.xml.vm | 117 +--
.../archive/DefaultAssemblyArchiverTest.java | 614 ++++++-------
.../archive/ManifestCreationFinalizerTest.java | 74 +-
.../archiver/AssemblyProxyArchiverTest.java | 196 ++---
.../phase/AssemblyArchiverPhaseComparatorTest.java | 77 +-
.../phase/DependencySetAssemblyPhaseTest.java | 113 ++-
.../archive/phase/FileItemAssemblyPhaseTest.java | 460 +++++-----
.../archive/phase/FileSetAssemblyPhaseTest.java | 93 +-
.../archive/phase/ModuleSetAssemblyPhaseTest.java | 929 +++++++++-----------
.../archive/phase/RepositoryAssemblyPhaseTest.java | 142 ---
.../assembly/archive/task/AddArtifactTaskTest.java | 290 +++----
.../archive/task/AddDependencySetsTaskTest.java | 600 ++++++-------
.../archive/task/AddDirectoryTaskTest.java | 126 ++-
.../assembly/archive/task/AddFileSetsTaskTest.java | 243 +++---
.../artifact/DefaultDependencyResolverTest.java | 194 ++---
.../artifact/ResolutionManagementInfoTest.java | 128 +--
.../ComponentsXmlArchiverFileFilterTest.java | 578 ++++++-------
.../assembly/format/ReaderFormatterTest.java | 167 ++--
.../AssemblyExpressionEvaluatorTest.java | 141 ++-
.../interpolation/AssemblyInterpolatorTest.java | 237 +++--
.../assembly/io/DefaultAssemblyReaderTest.java | 690 +++++++--------
.../io/PrefixedClasspathLocatorStrategyTest.java | 53 +-
.../assembly/testutils/PojoConfigSource.java | 259 ++----
.../assembly/utils/AssemblyFormatUtilsTest.java | 899 +++++++++----------
.../plugins/assembly/utils/FilterUtilsTest.java | 395 +++++----
.../assembly/utils/LineEndingsUtilsTest.java | 213 ++---
.../utils/LinuxLineFeedInputStreamTest.java | 87 +-
.../plugins/assembly/utils/ProjectUtilsTest.java | 209 ++---
.../assembly/utils/TypeConversionUtilsTest.java | 98 +--
.../utils/WindowsLineFeedInputStreamTest.java | 86 +-
171 files changed, 7215 insertions(+), 12265 deletions(-)
copy src/it/it-project-parent/invoker.properties => .git-blame-ignore-revs (91%)
copy src/it/projects/file-sets/{filtered-module-sources => symbolic-links}/pom.xml (87%)
rename src/{main/java/org/apache/maven/plugins/assembly/repository/model/GroupVersionAlignment.java => it/projects/file-sets/symbolic-links/setup.groovy} (76%)
copy src/it/projects/file-sets/{multimodule-unix-lineEndings/child => symbolic-links}/src/main/assembly-resources/test.txt (100%)
copy src/it/projects/file-sets/{filtered-multimodule/child => symbolic-links}/src/main/assembly/src.xml (97%)
copy src/it/projects/{basic-features/formats-zstd/selector.groovy => file-sets/symbolic-links/verify.groovy} (65%)
delete mode 100644 src/it/projects/repositories/basic-repository/pom.xml
delete mode 100644 src/it/projects/repositories/basic-repository/src/assemble/bin.xml
delete mode 100644 src/it/projects/repositories/basic-repository/src/main/java/org/apache/maven/plugin/assembly/test/App.java
delete mode 100644 src/it/projects/repositories/basic-repository/src/test/java/org/apache/maven/plugin/assembly/test/AppTest.java
delete mode 100644 src/it/projects/repositories/basic-repository/verify.bsh
delete mode 100644 src/it/projects/repositories/massembly-196/pom.xml
delete mode 100644 src/it/projects/repositories/massembly-196/src/main/assembly/bin.xml
delete mode 100644 src/it/projects/repositories/massembly-196/src/main/java/test/App.java
delete mode 100644 src/it/projects/repositories/massembly-196/verify.bsh
delete mode 100644 src/it/projects/repositories/massembly-855/child/pom.xml
delete mode 100644 src/it/projects/repositories/massembly-855/child/src/assembly/repository.xml
delete mode 100644 src/it/projects/repositories/massembly-855/pom.xml
delete mode 100644 src/it/projects/repositories/massembly-855/remote-repository/org/apache/maven/plugins/assembly/it/massembly-855/1.0/massembly-855-1.0.jar
delete mode 100644 src/it/projects/repositories/massembly-855/remote-repository/org/apache/maven/plugins/assembly/it/massembly-855/1.0/massembly-855-1.0.pom
delete mode 100644 src/it/projects/repositories/massembly-855/verify.bsh
delete mode 100644 src/it/projects/repositories/repo-with-snapshot-parents/child/pom.xml
delete mode 100644 src/it/projects/repositories/repo-with-snapshot-parents/child/remote-repository/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.jar
delete mode 100644 src/it/projects/repositories/repo-with-snapshot-parents/child/remote-repository/org/codehaus/plexus/plexus-utils/1.4.3-SNAPSHOT/plexus-utils-1.4.3-SNAPSHOT.pom
delete mode 100644 src/it/projects/repositories/repo-with-snapshot-parents/child/remote-repository/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom
delete mode 100644 src/it/projects/repositories/repo-with-snapshot-parents/child/src/assemble/bin.xml
delete mode 100644 src/it/projects/repositories/repo-with-snapshot-parents/child/src/main/java/org/apache/maven/plugin/assembly/test/App.java
delete mode 100644 src/it/projects/repositories/repo-with-snapshot-parents/child/src/test/java/org/apache/maven/plugin/assembly/test/AppTest.java
delete mode 100644 src/it/projects/repositories/repo-with-snapshot-parents/pom.xml
delete mode 100644 src/it/projects/repositories/repo-with-snapshot-parents/verify.bsh
delete mode 100644 src/main/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java
delete mode 100644 src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java
delete mode 100644 src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoBuilderConfigSourceWrapper.java
delete mode 100644 src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java
delete mode 100644 src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
delete mode 100644 src/main/java/org/apache/maven/plugins/assembly/repository/RepositoryAssembler.java
delete mode 100644 src/main/java/org/apache/maven/plugins/assembly/repository/RepositoryAssemblyException.java
delete mode 100644 src/main/java/org/apache/maven/plugins/assembly/repository/RepositoryBuilderConfigSource.java
delete mode 100644 src/main/java/org/apache/maven/plugins/assembly/repository/model/DefaultRepositoryInfo.java
delete mode 100644 src/main/java/org/apache/maven/plugins/assembly/repository/model/RepositoryInfo.java
delete mode 100644 src/site/apt/examples/single/using-repositories.apt.vm
delete mode 100644 src/test/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhaseTest.java