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 2023/09/19 09:27:45 UTC

[logging-parent] 03/07: Rename `doc/maven-properties.adoc` to `src/site/asciidoc/maven-properties.adoc`

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

vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-parent.git

commit f23e677eb7aa23f434aa5c2671ea27c9fc11450e
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Sep 18 15:50:48 2023 +0200

    Rename `doc/maven-properties.adoc` to `src/site/asciidoc/maven-properties.adoc`
---
 pom.xml                                            | 23 +++++++++++-----------
 .../.10.x.x/add-maven-properties-adoc-profile.xml  |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index ac2ef49..2482e52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,7 +158,7 @@
                 <goal>export</goal>
               </goals>
               <configuration>
-                <outputDirectory>${project.build.directory}/release-notes</outputDirectory>
+                <outputDirectory>${project.build.directory}/generated-sources/site/asciidoc/release-notes</outputDirectory>
                 <indexTemplates>
                   <template>
                     <source>.index.adoc.ftl</source>
@@ -494,7 +494,6 @@
             <phase>verify</phase>
           </execution>
         </executions>
-
       </plugin>
 
     </plugins>
@@ -825,27 +824,27 @@
 
     </profile>
 
-    <!-- populate `doc/maven-properties.adoc` from `doc/maven-properties.tmpl.adoc` -->
+    <!-- populate `src/site/asciidoc/maven-properties.adoc` from `src/site/asciidoc/maven-properties.tmpl.adoc` -->
     <profile>
 
       <id>maven-properties-adoc</id>
 
       <activation>
         <file>
-          <exists>doc/maven-properties.tmpl.adoc</exists>
+          <exists>src/site/asciidoc/maven-properties.tmpl.adoc</exists>
         </file>
       </activation>
 
       <build>
         <plugins>
 
-          <!-- copy `doc/maven-properties.tmpl.adoc` to `target/doc` -->
+          <!-- copy `src/site/asciidoc/maven-properties.tmpl.adoc` to `target/maven-properties-adoc` -->
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>
               <execution>
-                <id>copy-doc-maven-properties-tmpl</id>
+                <id>copy-maven-properties-adoc</id>
                 <goals>
                   <goal>run</goal>
                 </goals>
@@ -853,8 +852,8 @@
                 <inherited>false</inherited>
                 <configuration>
                   <target>
-                    <copy overwrite="true" tofile="${project.build.directory}/doc/maven-properties.adoc" verbose="true">
-                      <fileset file="doc/maven-properties.tmpl.adoc" />
+                    <copy overwrite="true" tofile="${project.build.directory}/maven-properties-adoc/maven-properties.adoc" verbose="true">
+                      <fileset file="src/site/asciidoc/maven-properties.tmpl.adoc" />
                     </copy>
                   </target>
                 </configuration>
@@ -862,23 +861,23 @@
             </executions>
           </plugin>
 
-          <!-- process `target/doc` and output to `doc` -->
+          <!-- process `target/maven-properties-adoc` and output to `src/site/asciidoc` -->
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-resources-plugin</artifactId>
             <executions>
               <execution>
-                <id>filter-doc-maven-properties-tmpl</id>
+                <id>filter-maven-properties-adoc</id>
                 <goals>
                   <goal>copy-resources</goal>
                 </goals>
                 <phase>process-sources</phase>
                 <inherited>false</inherited>
                 <configuration>
-                  <outputDirectory>doc</outputDirectory>
+                  <outputDirectory>src/site/asciidoc</outputDirectory>
                   <resources>
                     <resource>
-                      <directory>${project.build.directory}/doc</directory>
+                      <directory>${project.build.directory}/maven-properties-adoc</directory>
                       <filtering>true</filtering>
                     </resource>
                   </resources>
diff --git a/src/changelog/.10.x.x/add-maven-properties-adoc-profile.xml b/src/changelog/.10.x.x/add-maven-properties-adoc-profile.xml
index 2e5b775..8ad2478 100644
--- a/src/changelog/.10.x.x/add-maven-properties-adoc-profile.xml
+++ b/src/changelog/.10.x.x/add-maven-properties-adoc-profile.xml
@@ -4,5 +4,5 @@
        xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
        type="added">
   <author id="github:vy"/>
-  <description format="asciidoc">Added `maven-properties-adoc` profile that populates `doc/maven-properties.adoc` from `doc/maven-properties.tmpl.adoc`, if present</description>
+  <description format="asciidoc">Added `maven-properties-adoc` profile that populates `src/site/asciidoc/maven-properties.adoc` from `src/site/asciidoc/maven-properties.tmpl.adoc`, if present</description>
 </entry>