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 2022/05/02 09:30:10 UTC

[maven-assembly-plugin] branch dependabot/maven/org.codehaus.plexus-plexus-utils-3.4.1 updated (e072f588 -> 3913427e)

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-utils-3.4.1
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git


    omit e072f588 Bump plexus-utils from 3.3.0 to 3.4.1
     add 00607650 use default shared action
     add 963423b1 ignore dependabot branches
     add 60c81edf use shared gh action - v1 (#47)
     add ffb63eb5 Use GitHub shared actions v2
     add 57a84318 [MASSEMBLY-954] Update plugin to Maven 3.2.5 (#54)
     add 3913427e Bump plexus-utils from 3.3.0 to 3.4.1

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   (e072f588)
            \
             N -- N -- N   refs/heads/dependabot/maven/org.codehaus.plexus-plexus-utils-3.4.1 (3913427e)

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:
 .../workflows/maven-verify.yml                     |  15 +-
 .github/workflows/maven.yml                        |  46 ----
 pom.xml                                            | 246 +++++++++++----------
 .../assembly/AssemblerConfigurationSource.java     |   6 -
 .../plugins/assembly/archive/AssemblyArchiver.java |   2 -
 .../assembly/archive/DefaultAssemblyArchiver.java  |  89 +++-----
 .../archive/archiver/AssemblyProxyArchiver.java    |  44 ++--
 .../archive/phase/AssemblyArchiverPhase.java       |   2 -
 .../archive/phase/DependencySetAssemblyPhase.java  |  54 ++---
 .../archive/phase/FileItemAssemblyPhase.java       |  17 +-
 .../archive/phase/FileSetAssemblyPhase.java        |  16 +-
 .../archive/phase/ModuleSetAssemblyPhase.java      | 103 ++++-----
 .../archive/phase/RepositoryAssemblyPhase.java     |  38 ++--
 .../assembly/archive/task/AddArtifactTask.java     |  28 +--
 .../archive/task/AddDependencySetsTask.java        |  49 ++--
 .../assembly/archive/task/AddFileSetsTask.java     |  37 +---
 .../artifact/DefaultDependencyResolver.java        |  35 ++-
 .../filter/AbstractLineAggregatingHandler.java     |   3 +-
 .../filter/ComponentsXmlArchiverFileFilter.java    |   7 +-
 .../assembly/filter/MetaInfServicesHandler.java    |   5 +-
 .../assembly/filter/MetaInfSpringHandler.java      |   5 +-
 .../filter/SimpleAggregatingDescriptorHandler.java |  35 +--
 .../plugins/assembly/format/ReaderFormatter.java   |  10 +-
 .../plugins/assembly/functions/MavenProjects.java  |   4 +-
 .../PlexusLoggingHelper.java}                      |  22 +-
 .../SarPlexusIoResourceCollection.java}            |  36 ++-
 .../SarUnArchiverProvider.java}                    |  23 +-
 .../interpolation/AssemblyInterpolator.java        |   5 +-
 .../plugins/assembly/io/DefaultAssemblyReader.java |  57 ++---
 .../assembly/mojos/AbstractAssemblyMojo.java       |  13 +-
 .../plugins/assembly/mojos/SingleAssemblyMojo.java |   3 +-
 .../repository/DefaultRepositoryAssembler.java     |  50 +++--
 .../plugins/assembly/utils/AssemblyFileUtils.java  |   9 +-
 .../assembly/utils/AssemblyFormatUtils.java        |  24 +-
 .../maven/plugins/assembly/utils/FilterUtils.java  |   9 +-
 .../plugins/assembly/utils/LineEndingsUtils.java   |  13 +-
 .../maven/plugins/assembly/utils/ProjectUtils.java |  18 +-
 .../assembly/utils/TypeConversionUtils.java        |   4 +-
 src/main/resources/META-INF/plexus/components.xml  |  37 ----
 .../archive/DefaultAssemblyArchiverTest.java       |  66 ++----
 .../archiver/AssemblyProxyArchiverTest.java        |  21 +-
 .../phase/DependencySetAssemblyPhaseTest.java      |   3 +-
 .../archive/phase/FileItemAssemblyPhaseTest.java   |  71 ++----
 .../archive/phase/FileSetAssemblyPhaseTest.java    |   5 -
 .../archive/phase/ModuleSetAssemblyPhaseTest.java  |  14 +-
 .../archive/phase/RepositoryAssemblyPhaseTest.java |   9 +-
 .../assembly/archive/task/AddArtifactTaskTest.java |  14 +-
 .../archive/task/AddDependencySetsTaskTest.java    |  32 +--
 .../assembly/archive/task/AddFileSetsTaskTest.java |   6 -
 .../artifact/DefaultDependencyResolverTest.java    |  39 ++--
 .../artifact/ResolutionManagementInfoTest.java     |  13 +-
 .../ComponentsXmlArchiverFileFilterTest.java       |  34 ++-
 .../assembly/format/ReaderFormatterTest.java       |   5 +-
 .../assembly/io/DefaultAssemblyReaderTest.java     |   5 +-
 .../io/PrefixedClasspathLocatorStrategyTest.java   |  10 +-
 .../assembly/testutils/PojoConfigSource.java       |  10 +-
 .../plugins/assembly/utils/FilterUtilsTest.java    |  30 +--
 .../utils/LinuxLineFeedInputStreamTest.java        |  13 +-
 .../plugins/assembly/utils/ProjectUtilsTest.java   |  28 ++-
 .../assembly/utils/TypeConversionUtilsTest.java    |  66 +++---
 .../utils/WindowsLineFeedInputStreamTest.java      |  13 +-
 .../resources/simplelogger.properties}             |   2 +-
 62 files changed, 707 insertions(+), 1021 deletions(-)
 copy src/it/projects/container-descriptors/custom-handler-withMixedEntries/invoker.properties => .github/workflows/maven-verify.yml (78%)
 delete mode 100644 .github/workflows/maven.yml
 copy src/main/java/org/apache/maven/plugins/assembly/{io/AssemblyReadException.java => internal/PlexusLoggingHelper.java} (64%)
 copy src/main/java/org/apache/maven/plugins/assembly/{resolved/AssemblyId.java => internal/SarPlexusIoResourceCollection.java} (59%)
 rename src/main/java/org/apache/maven/plugins/assembly/{archive/archiver/SarUnArchiver.java => internal/SarUnArchiverProvider.java} (67%)
 delete mode 100644 src/main/resources/META-INF/plexus/components.xml
 copy src/{it/it-project-parent/invoker.properties => test/resources/simplelogger.properties} (94%)