This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch bnd in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 4acbc8f632145d3c523f3a126ab0a07a2374bc9f Author: Piotr P. Karwasz <[email protected]> AuthorDate: Wed Sep 27 22:58:21 2023 +0200 Remove usages of `maven-jar-plugin` --- log4j-api-test/pom.xml | 30 ------------------- log4j-api/pom.xml | 29 ------------------- log4j-core-test/pom.xml | 30 ------------------- log4j-core/pom.xml | 30 ------------------- log4j-layout-template-json-test/pom.xml | 51 --------------------------------- log4j-layout-template-json/pom.xml | 29 ------------------- log4j-osgi/pom.xml | 11 ------- log4j-slf4j-impl/pom.xml | 51 --------------------------------- pom.xml | 30 ------------------- 9 files changed, 291 deletions(-) diff --git a/log4j-api-test/pom.xml b/log4j-api-test/pom.xml index f436a9629c..ab9160fc35 100644 --- a/log4j-api-test/pom.xml +++ b/log4j-api-test/pom.xml @@ -107,36 +107,6 @@ <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>default-jar</id> - <goals> - <goal>jar</goal> - </goals> - <configuration combine.self="override"> - <archive> - <manifestFile>${manifestfile}</manifestFile> - <manifestEntries> - <Specification-Title>${project.name}</Specification-Title> - <Specification-Version>${project.version}</Specification-Version> - <Specification-Vendor>${project.organization.name}</Specification-Vendor> - <Implementation-Title>${project.name}</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> - <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id> - <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK> - <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK> - <Multi-Release>true</Multi-Release> - </manifestEntries> - </archive> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml index b0f5f347c7..d6b0619000 100644 --- a/log4j-api/pom.xml +++ b/log4j-api/pom.xml @@ -106,35 +106,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>default-jar</id> - <goals> - <goal>jar</goal> - </goals> - <configuration combine.self="override"> - <archive> - <manifestFile>${manifestfile}</manifestFile> - <manifestEntries> - <Specification-Title>${project.name}</Specification-Title> - <Specification-Version>${project.version}</Specification-Version> - <Specification-Vendor>${project.organization.name}</Specification-Vendor> - <Implementation-Title>${project.name}</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> - <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id> - <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK> - <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK> - <Multi-Release>true</Multi-Release> - </manifestEntries> - </archive> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml index 70f614f5a1..31f6dd5f32 100644 --- a/log4j-core-test/pom.xml +++ b/log4j-core-test/pom.xml @@ -385,36 +385,6 @@ <skipTests>true</skipTests> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>default-jar</id> - <goals> - <goal>jar</goal> - </goals> - <configuration combine.self="override"> - <archive> - <manifestFile>${manifestfile}</manifestFile> - <manifestEntries> - <Specification-Title>${project.name}</Specification-Title> - <Specification-Version>${project.version}</Specification-Version> - <Specification-Vendor>${project.organization.name}</Specification-Vendor> - <Implementation-Title>${project.name}</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> - <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id> - <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK> - <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK> - <Automatic-Module-Name>org.apache.logging.log4j.core</Automatic-Module-Name> - <Multi-Release>true</Multi-Release> - </manifestEntries> - </archive> - </configuration> - </execution> - </executions> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml index b9f5fc08b0..e1632f6e0e 100644 --- a/log4j-core/pom.xml +++ b/log4j-core/pom.xml @@ -242,36 +242,6 @@ <skipTests>true</skipTests> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>default-jar</id> - <goals> - <goal>jar</goal> - </goals> - <configuration combine.self="override"> - <archive> - <manifestFile>${manifestfile}</manifestFile> - <manifestEntries> - <Specification-Title>${project.name}</Specification-Title> - <Specification-Version>${project.version}</Specification-Version> - <Specification-Vendor>${project.organization.name}</Specification-Vendor> - <Implementation-Title>${project.name}</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> - <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id> - <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK> - <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK> - <Automatic-Module-Name>org.apache.logging.log4j.core</Automatic-Module-Name> - <Multi-Release>true</Multi-Release> - </manifestEntries> - </archive> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> diff --git a/log4j-layout-template-json-test/pom.xml b/log4j-layout-template-json-test/pom.xml index 11f9930d7e..8d6267f35d 100644 --- a/log4j-layout-template-json-test/pom.xml +++ b/log4j-layout-template-json-test/pom.xml @@ -120,57 +120,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>default-jar</id> - <goals> - <goal>jar</goal> - </goals> - <configuration combine.self="override"> - <archive> - <manifestFile>${manifestfile}</manifestFile> - <manifestEntries> - <Specification-Title>${project.name}</Specification-Title> - <Specification-Version>${project.version}</Specification-Version> - <Specification-Vendor>${project.organization.name}</Specification-Vendor> - <Implementation-Title>${project.name}</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> - <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id> - <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK> - <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK> - <Multi-Release>true</Multi-Release> - </manifestEntries> - </archive> - </configuration> - </execution> - <execution> - <id>default</id> - <goals> - <goal>test-jar</goal> - </goals> - <configuration> - <archive> - <manifestFile>${manifestfile}</manifestFile> - <manifestEntries> - <Specification-Title>${project.name}</Specification-Title> - <Specification-Version>${project.version}</Specification-Version> - <Specification-Vendor>${project.organization.name}</Specification-Vendor> - <Implementation-Title>${project.name}</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> - <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id> - <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK> - <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK> - </manifestEntries> - </archive> - </configuration> - </execution> - </executions> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> diff --git a/log4j-layout-template-json/pom.xml b/log4j-layout-template-json/pom.xml index 0c221d608e..a9002bb12d 100644 --- a/log4j-layout-template-json/pom.xml +++ b/log4j-layout-template-json/pom.xml @@ -66,35 +66,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>default-jar</id> - <goals> - <goal>jar</goal> - </goals> - <configuration combine.self="override"> - <archive> - <manifestFile>${manifestfile}</manifestFile> - <manifestEntries> - <Specification-Title>${project.name}</Specification-Title> - <Specification-Version>${project.version}</Specification-Version> - <Specification-Vendor>${project.organization.name}</Specification-Vendor> - <Implementation-Title>${project.name}</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> - <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id> - <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK> - <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK> - <Multi-Release>true</Multi-Release> - </manifestEntries> - </archive> - </configuration> - </execution> - </executions> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> diff --git a/log4j-osgi/pom.xml b/log4j-osgi/pom.xml index 5adee36078..920d7da133 100644 --- a/log4j-osgi/pom.xml +++ b/log4j-osgi/pom.xml @@ -143,17 +143,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> diff --git a/log4j-slf4j-impl/pom.xml b/log4j-slf4j-impl/pom.xml index 4124fdfab2..815e4c0e07 100644 --- a/log4j-slf4j-impl/pom.xml +++ b/log4j-slf4j-impl/pom.xml @@ -104,57 +104,6 @@ </dependencies> <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>default-jar</id> - <goals> - <goal>jar</goal> - </goals> - <configuration combine.self="override"> - <archive> - <manifestFile>${manifestfile}</manifestFile> - <manifestEntries> - <Specification-Title>${project.name}</Specification-Title> - <Specification-Version>${project.version}</Specification-Version> - <Specification-Vendor>${project.organization.name}</Specification-Vendor> - <Implementation-Title>${project.name}</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> - <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id> - <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK> - <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK> - <Automatic-Module-Name>${module.name}</Automatic-Module-Name> - </manifestEntries> - </archive> - </configuration> - </execution> - <execution> - <id>default</id> - <goals> - <goal>test-jar</goal> - </goals> - <configuration> - <archive> - <manifestFile>${manifestfile}</manifestFile> - <manifestEntries> - <Specification-Title>${project.name}</Specification-Title> - <Specification-Version>${project.version}</Specification-Version> - <Specification-Vendor>${project.organization.name}</Specification-Vendor> - <Implementation-Title>${project.name}</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> - <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id> - <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK> - <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK> - </manifestEntries> - </archive> - </configuration> - </execution> - </executions> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> diff --git a/pom.xml b/pom.xml index 04834608e3..4ee9256fe7 100644 --- a/pom.xml +++ b/pom.xml @@ -1389,36 +1389,6 @@ <version>${maven-enforcer-plugin.version}</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>default-jar</id> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <archive> - <manifestFile>${manifestfile}</manifestFile> - <manifestEntries> - <Specification-Title>${project.name}</Specification-Title> - <Specification-Version>${project.version}</Specification-Version> - <Specification-Vendor>${project.organization.name}</Specification-Vendor> - <Implementation-Title>${project.name}</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> - <Implementation-Vendor>${project.organization.name}</Implementation-Vendor> - <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id> - <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK> - <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK> - <Automatic-Module-Name>${module.name}</Automatic-Module-Name> - </manifestEntries> - </archive> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-scm-plugin</artifactId>
