You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2018/09/18 07:49:33 UTC
[struts] branch struts-2-5-x updated: WW-4951 Upgrades to the
latest struts master to support SHA256/512
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch struts-2-5-x
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/struts-2-5-x by this push:
new 1e33df9 WW-4951 Upgrades to the latest struts master to support SHA256/512
1e33df9 is described below
commit 1e33df947a3ea59e0d90b29bc9830f79e4e0ed04
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Tue Sep 18 09:49:27 2018 +0200
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 8898a52..9707867 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 845dab8..d96c3ea 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 0c2cbeb..17c5ce8 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>