You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2022/12/19 10:21:34 UTC

[logging-log4j2] 28/33: LOG4J2-3628 More `log4j-tools` fixes.

This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch mvn-site-simplified
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit 75db36d24d3b3ae03282aa35a99eb65c1bf3b125
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Sun Dec 11 21:34:56 2022 +0100

    LOG4J2-3628 More `log4j-tools` fixes.
---
 pom.xml | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index fdd9253c08..6c8b5fd7b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1539,11 +1539,11 @@
           <mainClass>org.apache.logging.log4j.changelog.exporter.AsciiDocExporter</mainClass>
           <systemProperties>
             <systemProperty>
-              <key>log4j.changelog.projectRootDirectory</key>
-              <value>${project.basedir}</value>
+              <key>log4j.changelog.directory</key>
+              <value>${project.basedir}/src/changelog</value>
             </systemProperty>
             <systemProperty>
-              <key>log4j.changelog.asciiDocExporter.outputDirectory</key>
+              <key>log4j.changelog.exporter.outputDirectory</key>
               <value>${project.build.directory}/generated-sources/site/asciidoc/changelog</value>
             </systemProperty>
           </systemProperties>
@@ -1810,6 +1810,56 @@
         </plugins>
       </build>
     </profile>
+    <!-- populate `src/changelog/<releaseVersion>` from `src/changelog/.<releaseVersionMajor>.x.x` -->
+    <profile>
+      <id>changelog-releaser</id>
+      <build>
+        <defaultGoal>validate</defaultGoal>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>changelog-releaser</id>
+                <!-- Choosing the earlier possible phase, since `ChangelogReleaser` execution doesn't depend on anything: -->
+                <phase>validate</phase>
+                <goals>
+                  <goal>java</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <includeProjectDependencies>false</includeProjectDependencies>
+              <includePluginDependencies>true</includePluginDependencies>
+              <executableDependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-changelog</artifactId>
+              </executableDependency>
+              <mainClass>org.apache.logging.log4j.changelog.releaser.ChangelogReleaser</mainClass>
+              <systemProperties>
+                <systemProperty>
+                  <key>log4j.changelog.directory</key>
+                  <value>${project.basedir}/src/changelog</value>
+                </systemProperty>
+                <systemProperty>
+                  <key>log4j.changelog.releaseVersion</key>
+                  <value>${project.version}</value>
+                </systemProperty>
+              </systemProperties>
+            </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-changelog</artifactId>
+                <version>0.1.0-SNAPSHOT</version>
+                <type>jar</type>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>apache-release</id>
       <build>