From 6edbdeb2a96ead7652a5f77bc45dcf59f67bfd07 Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Thu, 11 May 2023 12:31:04 -0500
Subject: [PATCH] Upgrade to maven-assembly-plugin 3.5.0.

Using the upgrade, make several cleanups to the reference docs including ONLY setting the relevant property ON the actual docs artifacts. Also adjust permission settings.

Resolves #1354.
---
 docs.xml              | 12 +++++++++++-
 pom.xml               | 15 +--------------
 spring-ws-bom/pom.xml | 14 --------------
 3 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/docs.xml b/docs.xml
index 6ee6b9e2..276a880f 100644
--- a/docs.xml
+++ b/docs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 https://maven.apache.org/xsd/assembly-1.1.2.xsd">
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.1 https://maven.apache.org/xsd/assembly-2.1.1.xsd">
 	<id>docs</id>
 	<formats>
 		<format>dir</format>
@@ -18,6 +18,8 @@
                 <include>readme.txt</include>
             </includes>
             <outputDirectory />
+			<fileMode>0664</fileMode>
+			<directoryMode>0775</directoryMode>
         </fileSet>
 		<fileSet>
 			<!--
@@ -26,6 +28,8 @@
 			-->
 			<directory>target/site/reference/html</directory>
 			<outputDirectory>reference/html</outputDirectory>
+			<fileMode>0664</fileMode>
+			<directoryMode>0775</directoryMode>
 		</fileSet>
 		<fileSet>
 			<!--
@@ -37,6 +41,8 @@
 				<include>index.pdf</include>
 			</includes>
 			<outputDirectory>reference/pdf</outputDirectory>
+			<fileMode>0664</fileMode>
+			<directoryMode>0775</directoryMode>
 		</fileSet>
 		<fileSet>
 		<!--
@@ -48,6 +54,8 @@
 				<include>index.epub</include>
 			</includes>
 			<outputDirectory>reference/epub</outputDirectory>
+			<fileMode>0664</fileMode>
+			<directoryMode>0775</directoryMode>
 		</fileSet>
 		<fileSet>
 			<!--
@@ -56,6 +64,8 @@
 			-->
 			<directory>target/site/apidocs</directory>
 			<outputDirectory>api</outputDirectory>
+			<fileMode>0664</fileMode>
+			<directoryMode>0775</directoryMode>
 		</fileSet>
 	</fileSets>
 </assembly>
diff --git a/pom.xml b/pom.xml
index ffdf0f8e..fe923485 100644
--- a/pom.xml
+++ b/pom.xml
@@ -442,13 +442,6 @@
                                         <buildName>spring-ws</buildName>
                                         <buildUrl>{{BUILD_URL}}</buildUrl>
                                     </buildInfo>
-                                    <deployProperties>
-                                        <zip.name>spring-ws</zip.name>
-                                        <zip.displayname>spring-ws</zip.displayname>
-                                        <zip.deployed>false</zip.deployed>
-                                        <zip.type>docs</zip.type>
-                                        <archives>*:*:*:*@zip</archives>
-                                    </deployProperties>
                                     <publisher>
                                         <contextUrl>https://repo.spring.io</contextUrl>
                                         <username>{{ARTIFACTORY_USR}}</username>
@@ -485,13 +478,6 @@
                                         <buildName>spring-ws</buildName>
                                         <buildUrl>{{BUILD_URL}}</buildUrl>
                                     </buildInfo>
-                                    <deployProperties>
-                                        <zip.name>spring-ws</zip.name>
-                                        <zip.displayname>spring-ws</zip.displayname>
-                                        <zip.deployed>false</zip.deployed>
-                                        <zip.type>docs</zip.type>
-                                        <archives>*:*:*:*@zip</archives>
-                                    </deployProperties>
                                     <publisher>
                                         <contextUrl>https://repo.spring.io</contextUrl>
                                         <username>{{ARTIFACTORY_USR}}</username>
@@ -726,6 +712,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
+                        <version>3.5.0</version>
                         <executions>
                             <execution>
                                 <id>docs</id>
diff --git a/spring-ws-bom/pom.xml b/spring-ws-bom/pom.xml
index f804aeb3..a0f6067f 100644
--- a/spring-ws-bom/pom.xml
+++ b/spring-ws-bom/pom.xml
@@ -147,13 +147,6 @@
                                         <buildName>spring-ws</buildName>
                                         <buildUrl>{{BUILD_URL}}</buildUrl>
                                     </buildInfo>
-                                    <deployProperties>
-                                        <zip.name>spring-ws</zip.name>
-                                        <zip.displayname>spring-ws</zip.displayname>
-                                        <zip.deployed>false</zip.deployed>
-                                        <zip.type>docs</zip.type>
-                                        <archives>*:*:*:*@zip</archives>
-                                    </deployProperties>
                                     <publisher>
                                         <contextUrl>https://repo.spring.io</contextUrl>
                                         <username>{{ARTIFACTORY_USR}}</username>
@@ -190,13 +183,6 @@
                                         <buildName>spring-ws</buildName>
                                         <buildUrl>{{BUILD_URL}}</buildUrl>
                                     </buildInfo>
-                                    <deployProperties>
-                                        <zip.name>spring-ws</zip.name>
-                                        <zip.displayname>spring-ws</zip.displayname>
-                                        <zip.deployed>false</zip.deployed>
-                                        <zip.type>docs</zip.type>
-                                        <archives>*:*:*:*@zip</archives>
-                                    </deployProperties>
                                     <publisher>
                                         <contextUrl>https://repo.spring.io</contextUrl>
                                         <username>{{ARTIFACTORY_USR}}</username>