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

michaelo pushed a commit to branch MNGSITE-503_security.txt
in repository https://gitbox.apache.org/repos/asf/maven-site.git


The following commit(s) were added to refs/heads/MNGSITE-503_security.txt by 
this push:
     new d80151d0 Filtering done right
d80151d0 is described below

commit d80151d0cc1b774a3fde41f9818938d3d9b4afd0
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sat Dec 10 19:49:38 2022 +0100

    Filtering done right
---
 .../filtered-resources/.well-known/security.txt    |  2 +-
 pom.xml                                            | 25 ----------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/content/filtered-resources/.well-known/security.txt 
b/content/filtered-resources/.well-known/security.txt
index 5b7114f4..995d86f0 100644
--- a/content/filtered-resources/.well-known/security.txt
+++ b/content/filtered-resources/.well-known/security.txt
@@ -1,6 +1,6 @@
 Contact: mailto:secur...@apache.org
 Contact: mailto:priv...@maven.apache.org
-Expires: ${maven.security.expires}
+Expires: ${maven.build.timestamp}
 Preferred-Languages: en
 Policy: https://www.apache.org/security/
 Policy: https://maven.apache.org/security.html
diff --git a/pom.xml b/pom.xml
index a7d46e96..87426395 100644
--- a/pom.xml
+++ b/pom.xml
@@ -232,31 +232,6 @@
 -->
         </executions>
       </plugin>
-      <!--
-        used for timestamp of .well-known/security.txt file
-        Plugin-definition must be before resources-plugin to be
-        in the pre-site phase before 'copy-filtered-resources'.
-      -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>3.3.0</version>
-        <executions>
-          <execution>
-            <id>create-security.txt-timestamp</id>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>timestamp-property</goal>
-            </goals>
-            <configuration>
-              <name>maven.security.expires</name>
-              <pattern>yyyy-MM-dd'T'HH:mm:ssXXX</pattern>
-              <offset>+1</offset>
-              <unit>year</unit>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>

Reply via email to