This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a change to branch massembly-1008
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
omit 23442c0e [MASSEMBLY-1008] Wrong use of dependency scopes
add 25bc4101 [MASSEMBLY-1009] Bump commons-io from 2.13.0 to 2.15.0
add c02d7f3a [MASSEMBLY-1010] Use IOUtils from commons-io instead of plexus
add c81aa654 [MASSEMBLY-1011] Bump maven-archiver from 3.6.0 to 3.6.1
add 88adf42c [MASSEMBLY-996] Bump com.github.luben:zstd-jni from 1.5.5-10
to 1.5.5-11 (#170)
add 98ae2138 [MASSEMBLY-1012] Bump org.apache.commons:commons-compress
from 1.23.0 to 1.25.0 (#171)
add a71b0ad1 [MASSEMBLY-1009] Bump commons-io:commons-io from 2.15.0 to
2.15.1 (#172)
add 3fc7b8e8 [MASSEMBLY-1013] Code cleanups
add cd888125 [MASSEMBLY-1013] Remove custom SAR UnArchiver
add 4acd22f4 Bump camel-core from 2.24.1 to 3.2.0 in
/src/it/projects/bugs/massembly-920 (#137)
add 1c53fc95 [MASSEMBLY-992] Inline Assembly Descriptors (#174)
add 0de3fcc1 [MASSEMBLY-1008] Wrong use of dependency scopes
add 16def83e Revert change in AddDependencySetsTaskTest and pom.xml
add 34e9938a [MASSEMBLY-1008] Fix transitive dependencies resolving with
required scope
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 (23442c0e)
\
N -- N -- N refs/heads/massembly-1008 (34e9938a)
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:
pom.xml | 18 +--
.../TODO.txt | 0
.../invoker.properties | 0
.../{ExecutionRoot => inline-descriptor}/pom.xml | 129 +++++++++++----------
.../inline-descriptor/verify.groovy} | 15 ++-
src/it/projects/bugs/massembly-730/pom.xml | 2 +-
src/it/projects/bugs/massembly-920/pom.xml | 2 +-
src/it/projects/bugs/massembly-920/verify.groovy | 8 +-
.../dependency-sets/massembly-1008/pom.xml | 3 +
.../assembly/AssemblerConfigurationSource.java | 19 ++-
.../plugins/assembly/archive/AssemblyArchiver.java | 4 -
.../assembly/archive/DefaultAssemblyArchiver.java | 29 +----
.../archive/archiver/AssemblyProxyArchiver.java | 4 +-
.../assembly/archive/archiver/PrefixedFileSet.java | 3 +-
.../archive/phase/FileItemAssemblyPhase.java | 6 +-
.../artifact/DefaultDependencyResolver.java | 125 ++++++++++++++++++--
.../filter/AbstractLineAggregatingHandler.java | 12 +-
.../filter/ComponentsXmlArchiverFileFilter.java | 13 ++-
.../filter/SimpleAggregatingDescriptorHandler.java | 12 +-
.../plugins/assembly/format/ReaderFormatter.java | 3 +-
.../internal/SarPlexusIoResourceCollection.java | 38 ------
.../assembly/internal/SarUnArchiverProvider.java | 38 ------
.../io/ClasspathResourceLocatorStrategy.java | 9 +-
.../plugins/assembly/io/DefaultAssemblyReader.java | 18 ++-
.../plugins/assembly/io/DefaultMessageHolder.java | 8 +-
.../apache/maven/plugins/assembly/io/Locator.java | 2 +-
.../maven/plugins/assembly/io/MessageLevels.java | 2 +-
.../assembly/mojos/AbstractAssemblyMojo.java | 30 +++--
.../assembly/utils/AssemblyFormatUtils.java | 3 +-
.../maven/plugins/assembly/utils/FilterUtils.java | 2 +-
.../plugins/assembly/utils/LineEndingsUtils.java | 11 +-
src/main/mdo/assembly-component.mdo | 2 +-
src/main/mdo/assembly.mdo | 2 +-
src/site/apt/examples/index.apt | 2 +
.../apt/examples/using-inline-descriptors.apt.vm | 86 ++++++++++++++
src/site/site.xml | 1 +
.../archive/DefaultAssemblyArchiverTest.java | 47 +++-----
.../archive/ManifestCreationFinalizerTest.java | 16 +--
.../archiver/AssemblyProxyArchiverTest.java | 9 +-
.../phase/AssemblyArchiverPhaseComparatorTest.java | 13 +--
.../archive/phase/FileItemAssemblyPhaseTest.java | 39 +++++--
.../archive/phase/ModuleSetAssemblyPhaseTest.java | 6 +-
.../archive/task/AddDependencySetsTaskTest.java | 10 +-
.../assembly/archive/task/AddFileSetsTaskTest.java | 18 +--
.../artifact/DefaultDependencyResolverTest.java | 85 ++++++++++----
.../ComponentsXmlArchiverFileFilterTest.java | 3 +-
.../assembly/format/ReaderFormatterTest.java | 8 +-
.../assembly/io/DefaultAssemblyReaderTest.java | 45 ++++---
.../assembly/testutils/PojoConfigSource.java | 34 ++++++
.../assembly/utils/LineEndingsUtilsTest.java | 36 ++----
.../utils/LinuxLineFeedInputStreamTest.java | 12 +-
.../utils/WindowsLineFeedInputStreamTest.java | 12 +-
52 files changed, 604 insertions(+), 450 deletions(-)
copy src/it/projects/basic-features/{file-copyIntoTopDir =>
inline-descriptor}/TODO.txt (100%)
copy src/it/projects/basic-features/{file-copyIntoTopDir =>
inline-descriptor}/invoker.properties (100%)
copy src/it/projects/basic-features/{ExecutionRoot =>
inline-descriptor}/pom.xml (66%)
copy src/it/projects/{file-sets/symbolic-links/setup.groovy =>
basic-features/inline-descriptor/verify.groovy} (68%)
delete mode 100644
src/main/java/org/apache/maven/plugins/assembly/internal/SarPlexusIoResourceCollection.java
delete mode 100644
src/main/java/org/apache/maven/plugins/assembly/internal/SarUnArchiverProvider.java
create mode 100644 src/site/apt/examples/using-inline-descriptors.apt.vm
