Skip to content

Commit 9dbfc5b

Browse files
vyvy
authored
Add auto-generated plugin reference to the 3.x site (#2407)
1 parent 3fb9ba8 commit 9dbfc5b

File tree

49 files changed

+620
-391
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+620
-391
lines changed

‎log4j-1.2-api/.log4j-plugin-processing-activator‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This file is here to activate the `plugin-processing` Maven profile.

‎log4j-1.2-api/pom.xml‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,21 @@
1616
~ limitations under the License.
1717
-->
1818
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
19+
1920
<modelVersion>4.0.0</modelVersion>
21+
2022
<parent>
2123
<groupId>org.apache.logging.log4j</groupId>
2224
<artifactId>log4j</artifactId>
2325
<version>${revision}</version>
2426
<relativePath>../log4j-parent</relativePath>
2527
</parent>
28+
2629
<artifactId>log4j-1.2-api</artifactId>
2730
<packaging>jar</packaging>
2831
<name>Apache Log4j 1.x Compatibility API</name>
2932
<description>The Apache Log4j 1.x Compatibility API</description>
33+
3034
<properties>
3135
<log4jParentDir>${basedir}/..</log4jParentDir>
3236

@@ -45,6 +49,7 @@
4549
<Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
4650
<!-- we have an `bnd.bnd` file to override the parent's defaults -->
4751
</properties>
52+
4853
<dependencies>
4954
<dependency>
5055
<groupId>javax.jms</groupId>
@@ -127,21 +132,6 @@
127132
<build>
128133
<plugins>
129134

130-
<!-- Enable Log4j plugin processing -->
131-
<plugin>
132-
<groupId>org.apache.maven.plugins</groupId>
133-
<artifactId>maven-compiler-plugin</artifactId>
134-
<configuration>
135-
<annotationProcessorPaths combine.children="append">
136-
<path>
137-
<groupId>org.apache.logging.log4j</groupId>
138-
<artifactId>log4j-plugin-processor</artifactId>
139-
<version>${project.version}</version>
140-
</path>
141-
</annotationProcessorPaths>
142-
</configuration>
143-
</plugin>
144-
145135
<!-- Illegal access is disabled by default in Java 16 due to JEP-396.
146136
We are relaxing it for tests. -->
147137
<plugin>

‎log4j-async-logger/.log4j-plugin-processing-activator‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This file is here to activate the `plugin-processing` Maven profile.

‎log4j-async-logger/pom.xml‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
~ limitations under the License.
1717
-->
1818
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
19+
1920
<modelVersion>4.0.0</modelVersion>
21+
2022
<parent>
2123
<groupId>org.apache.logging.log4j</groupId>
2224
<artifactId>log4j</artifactId>
@@ -66,21 +68,4 @@
6668

6769
</dependencies>
6870

69-
<build>
70-
<plugins>
71-
<plugin>
72-
<groupId>org.apache.maven.plugins</groupId>
73-
<artifactId>maven-compiler-plugin</artifactId>
74-
<configuration>
75-
<annotationProcessorPaths combine.children="append">
76-
<path>
77-
<groupId>org.apache.logging.log4j</groupId>
78-
<artifactId>log4j-plugin-processor</artifactId>
79-
<version>${project.version}</version>
80-
</path>
81-
</annotationProcessorPaths>
82-
</configuration>
83-
</plugin>
84-
</plugins>
85-
</build>
8671
</project>

‎log4j-config-properties/.log4j-plugin-processing-activator‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This file is here to activate the `plugin-processing` Maven profile.

‎log4j-config-properties/pom.xml‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
~ limitations under the License.
1717
-->
1818
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
19+
1920
<modelVersion>4.0.0</modelVersion>
21+
2022
<parent>
2123
<groupId>org.apache.logging.log4j</groupId>
2224
<artifactId>log4j</artifactId>
@@ -48,21 +50,4 @@
4850

4951
</dependencies>
5052

51-
<build>
52-
<plugins>
53-
<plugin>
54-
<groupId>org.apache.maven.plugins</groupId>
55-
<artifactId>maven-compiler-plugin</artifactId>
56-
<configuration>
57-
<annotationProcessorPaths combine.children="append">
58-
<path>
59-
<groupId>org.apache.logging.log4j</groupId>
60-
<artifactId>log4j-plugin-processor</artifactId>
61-
<version>${project.version}</version>
62-
</path>
63-
</annotationProcessorPaths>
64-
</configuration>
65-
</plugin>
66-
</plugins>
67-
</build>
6853
</project>

‎log4j-config-yaml/.log4j-plugin-processing-activator‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This file is here to activate the `plugin-processing` Maven profile.

‎log4j-config-yaml/pom.xml‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
~ limitations under the License.
1717
-->
1818
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
19+
1920
<modelVersion>4.0.0</modelVersion>
21+
2022
<parent>
2123
<groupId>org.apache.logging.log4j</groupId>
2224
<artifactId>log4j</artifactId>
@@ -48,21 +50,4 @@
4850

4951
</dependencies>
5052

51-
<build>
52-
<plugins>
53-
<plugin>
54-
<groupId>org.apache.maven.plugins</groupId>
55-
<artifactId>maven-compiler-plugin</artifactId>
56-
<configuration>
57-
<annotationProcessorPaths combine.children="append">
58-
<path>
59-
<groupId>org.apache.logging.log4j</groupId>
60-
<artifactId>log4j-plugin-processor</artifactId>
61-
<version>${project.version}</version>
62-
</path>
63-
</annotationProcessorPaths>
64-
</configuration>
65-
</plugin>
66-
</plugins>
67-
</build>
6853
</project>

‎log4j-core-test/.log4j-plugin-processing-activator‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This file is here to activate the `plugin-processing` Maven profile.

‎log4j-core-test/pom.xml‎

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
~ limitations under the License.
1717
-->
1818
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
19+
1920
<modelVersion>4.0.0</modelVersion>
21+
2022
<parent>
2123
<groupId>org.apache.logging.log4j</groupId>
2224
<artifactId>log4j</artifactId>
@@ -28,6 +30,7 @@
2830
<packaging>jar</packaging>
2931
<name>Apache Log4j Core Tests</name>
3032
<description>The Apache Log4j Implementation Tests</description>
33+
3134
<properties>
3235
<!-- Ignore less important (high rank) bugs for test artifacts -->
3336
<spotbugs.maxRank>9</spotbugs.maxRank>
@@ -58,6 +61,7 @@
5861
spring.test;substitute="spring-test"
5962
</bnd-extra-module-options>
6063
</properties>
64+
6165
<dependencies>
6266
<!-- Used for OSGi bundle support -->
6367
<dependency>
@@ -288,35 +292,10 @@
288292
<scope>test</scope>
289293
</dependency>
290294
</dependencies>
295+
291296
<build>
292297
<plugins>
293298

294-
<!-- Enable Log4j plugin processing -->
295-
<plugin>
296-
<groupId>org.apache.maven.plugins</groupId>
297-
<artifactId>maven-compiler-plugin</artifactId>
298-
<configuration>
299-
<annotationProcessorPaths combine.children="append">
300-
<path>
301-
<groupId>org.apache.logging.log4j</groupId>
302-
<artifactId>log4j-plugin-processor</artifactId>
303-
<version>${project.version}</version>
304-
</path>
305-
</annotationProcessorPaths>
306-
</configuration>
307-
<executions>
308-
<execution>
309-
<id>default-testCompile</id>
310-
<configuration>
311-
<compilerArgs combine.children="append">
312-
<!-- Disable automatic package discovery, which overwrites `log4j-core` plugins. -->
313-
<arg>-ApluginPackage=org.apache.logging.log4j.core.test2</arg>
314-
</compilerArgs>
315-
</configuration>
316-
</execution>
317-
</executions>
318-
</plugin>
319-
320299
<plugin>
321300
<groupId>org.apache.maven.plugins</groupId>
322301
<artifactId>maven-failsafe-plugin</artifactId>
@@ -344,6 +323,7 @@
344323

345324
</plugins>
346325
</build>
326+
347327
<profiles>
348328
<profile>
349329
<id>fast-test</id>
@@ -359,4 +339,5 @@
359339
</build>
360340
</profile>
361341
</profiles>
342+
362343
</project>

0 commit comments

Comments
 (0)