You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2023/03/25 10:02:10 UTC
[maven-assembly-plugin] branch bump-junit created (now cf75d8a2)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch bump-junit
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
at cf75d8a2 Bump junit to 2.x in integration tests
This branch includes the following new commits:
new cf75d8a2 Bump junit to 2.x in integration tests
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.
[maven-assembly-plugin] 01/01: Bump junit to 2.x in integration tests
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch bump-junit
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
commit cf75d8a273941bce154d34496c93e0d3ad6990ed
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Mar 25 10:45:25 2023 +0100
Bump junit to 2.x in integration tests
---
src/it/projects/bugs/massembly-306/pom.xml | 12 ++++++------
src/it/projects/bugs/massembly-583/child2/pom.xml | 6 +++---
src/it/projects/bugs/massembly-891/pom.xml | 2 +-
src/it/projects/bugs/massembly-891/verify.groovy | 2 +-
.../examples/single/including-and-excluding-artifacts.apt | 8 ++++----
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/it/projects/bugs/massembly-306/pom.xml b/src/it/projects/bugs/massembly-306/pom.xml
index e78427ac..f5589812 100644
--- a/src/it/projects/bugs/massembly-306/pom.xml
+++ b/src/it/projects/bugs/massembly-306/pom.xml
@@ -34,18 +34,18 @@ under the License.
<dependencies>
<dependency>
<!-- Keep the jar-with-dependencies from being file-less... -->
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-apir</artifactId>
+ <version>5.9.2</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
<!-- Both the range AND the scope are critical here,
since this artifact will be EXCLUDED from the depSet. -->
- <version>[1.2.16]</version>
+ <version>[2.20.0]</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/src/it/projects/bugs/massembly-583/child2/pom.xml b/src/it/projects/bugs/massembly-583/child2/pom.xml
index ed243f8b..a8f32951 100644
--- a/src/it/projects/bugs/massembly-583/child2/pom.xml
+++ b/src/it/projects/bugs/massembly-583/child2/pom.xml
@@ -34,9 +34,9 @@ under the License.
</dependency>
<!-- comment-out this dependency in the second run to verify the behaviour -->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>2.20.0</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/src/it/projects/bugs/massembly-891/pom.xml b/src/it/projects/bugs/massembly-891/pom.xml
index 09e5e7cd..ff26dc9b 100644
--- a/src/it/projects/bugs/massembly-891/pom.xml
+++ b/src/it/projects/bugs/massembly-891/pom.xml
@@ -58,7 +58,7 @@ under the License.
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>2.9.1</version>
+ <version>2.20.0</version>
</dependency>
</dependencies>
</project>
diff --git a/src/it/projects/bugs/massembly-891/verify.groovy b/src/it/projects/bugs/massembly-891/verify.groovy
index 0e0cb33c..d03c8078 100644
--- a/src/it/projects/bugs/massembly-891/verify.groovy
+++ b/src/it/projects/bugs/massembly-891/verify.groovy
@@ -20,7 +20,7 @@
import java.util.jar.*
-def log4jApi = new JarFile(new File(localRepositoryPath, 'org/apache/logging/log4j/log4j-api/2.9.1/log4j-api-2.9.1.jar'))
+def log4jApi = new JarFile(new File(localRepositoryPath, 'org/apache/logging/log4j/log4j-api/2.20.0/log4j-api-2.20.0.jar'))
def jarWithDeps = new JarFile(new File( basedir, 'target/massembly891-0.0.1-SNAPSHOT-jar-with-dependencies.jar'))
cls = 'org/apache/logging/log4j/util/StackLocator.class'
diff --git a/src/site/apt/examples/single/including-and-excluding-artifacts.apt b/src/site/apt/examples/single/including-and-excluding-artifacts.apt
index 33f9fddc..1164c851 100644
--- a/src/site/apt/examples/single/including-and-excluding-artifacts.apt
+++ b/src/site/apt/examples/single/including-and-excluding-artifacts.apt
@@ -35,7 +35,7 @@ Including and Excluding Artifacts
be an identical match for it to be included or excluded. At present there is
no support for regular expressions.
- This example excludes the log4j and commons-lang jar files from the assembly.
+ This example excludes the log4j-1.2-api and commons-lang3 jar files from the assembly.
This would be useful when you are building a super distribution assembly which
contained sub distributions (i.e. other already assembled zips or tars) where
in your pom you are depenedent upon those distributions. But because the
@@ -57,7 +57,7 @@ Including and Excluding Artifacts
+-----
And then in your assembly you exclude all the jar dependencies pulled in
- from the binary assembly. In this example the commons-lang and log4j jars
+ from the binary assembly. In this example the commons-lang3 and log4j-1.2-api jars
are included unnecessarily (as they are in the bin.zip file already)
+-----
@@ -65,8 +65,8 @@ Including and Excluding Artifacts
<dependencySet>
....
<excludes>
- <exclude>commons-lang:commons-lang</exclude>
- <exclude>log4j:log4j</exclude>
+ <exclude>org.apache.commons:commons-lang3</exclude>
+ <exclude>org.apache.logging.log4j:log4j-1.2-api</exclude>
</excludes>
</dependencySet>
....