From 3e29573a2e5ddf7b948ebe622a01d0fbc20a0b5b Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Tue, 18 Sep 2018 09:49:27 +0200
Subject: [PATCH] WW-4951 Upgrades to the latest struts master to support
 SHA256/512

---
 assembly/pom.xml                          |  2 +-
 assembly/src/main/resources/docs-urls.txt | 12 ++++++------
 pom.xml                                   | 13 +++++++------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index 9db215a0c..4a72c940e 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -111,7 +111,7 @@
                         <id>make-assembly</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>attached</goal>
+                            <goal>single</goal>
                         </goals>
                     </execution>
                 </executions>
diff --git a/assembly/src/main/resources/docs-urls.txt b/assembly/src/main/resources/docs-urls.txt
index 845dab8cf..d96c3ea23 100644
--- a/assembly/src/main/resources/docs-urls.txt
+++ b/assembly/src/main/resources/docs-urls.txt
@@ -1,6 +1,6 @@
-http://struts.apache.org/getting-started/
-http://struts.apache.org/security/
-http://struts.apache.org/core-developers/
-http://struts.apache.org/tag-developers/
-http://struts.apache.org/maven-archetypes/
-http://struts.apache.org/plugins/
+https://struts.apache.org/getting-started/
+https://struts.apache.org/security/
+https://struts.apache.org/core-developers/
+https://struts.apache.org/tag-developers/
+https://struts.apache.org/maven-archetypes/
+https://struts.apache.org/plugins/
diff --git a/pom.xml b/pom.xml
index 9af53c5cf..dbae089b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts-master</artifactId>
-        <version>11</version>
+        <version>12</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -279,11 +279,12 @@
                         <useIdeaDefaultExcludes>true</useIdeaDefaultExcludes>
                         <useDefaultExcludes>true</useDefaultExcludes>
                         <addDefaultLicenseMatchers>false</addDefaultLicenseMatchers>
-                        <licenseMatchers>
-                            <classNames>
-                                <className>org.apache.rat.analysis.license.ApacheSoftwareLicense20</className>
-                            </classNames>
-                        </licenseMatchers>
+                        <licenses>
+                            <licens implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20"/>
+                        </licenses>
+                        <licenseFamilies>
+                            <licenseFamily implementation="org.apache.rat.license.Apache20LicenseFamily"/>
+                        </licenseFamilies>
                         <includes>
                             <include>pom.xml</include>
                             <include>src/**</include>