Merge pull request #767 from kazuki43zoo/apply-changes-on-master-at-20221206

Apply changes to 2.1.x on master at 2022-12-06

Author: kazuki43zoo

pom.xml

@@ -327,14 +327,36 @@
           </systemProperties>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <!-- prepare site content by filtering ${project.*} values-->
+          <execution>
+            <id>filter-site</id>
+            <phase>pre-site</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/site-src</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>src/site</directory>
+                  <filtering>true</filtering>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
         <configuration>
           <locales>en,es,zh_CN,ja,ko</locales>
-          <!-- Build using files that replace a placeholder using project properties -->
           <siteDirectory>${project.build.directory}/site-src</siteDirectory>
-        </configuration>
+       </configuration>
       </plugin>
     </plugins>
 
@@ -350,12 +372,6 @@
       <resource>
         <directory>${project.basedir}/src/main/resources</directory>
       </resource>
-      <!-- Copy for replacing a placeholder using project properties -->
-      <resource>
-        <directory>${project.basedir}/src/site</directory>
-        <targetPath>${project.build.directory}/site-src</targetPath>
-        <filtering>true</filtering>
-      </resource>
     </resources>
     <testResources>
       <testResource>