Skip to content

Commit 6edbdeb

Browse files
committed
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.
1 parent 1adc7af commit 6edbdeb

File tree

3 files changed

+12
-29
lines changed

3 files changed

+12
-29
lines changed

docs.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<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">
33
<id>docs</id>
44
<formats>
55
<format>dir</format>
@@ -18,6 +18,8 @@
1818
<include>readme.txt</include>
1919
</includes>
2020
<outputDirectory />
21+
<fileMode>0664</fileMode>
22+
<directoryMode>0775</directoryMode>
2123
</fileSet>
2224
<fileSet>
2325
<!--
@@ -26,6 +28,8 @@
2628
-->
2729
<directory>target/site/reference/html</directory>
2830
<outputDirectory>reference/html</outputDirectory>
31+
<fileMode>0664</fileMode>
32+
<directoryMode>0775</directoryMode>
2933
</fileSet>
3034
<fileSet>
3135
<!--
@@ -37,6 +41,8 @@
3741
<include>index.pdf</include>
3842
</includes>
3943
<outputDirectory>reference/pdf</outputDirectory>
44+
<fileMode>0664</fileMode>
45+
<directoryMode>0775</directoryMode>
4046
</fileSet>
4147
<fileSet>
4248
<!--
@@ -48,6 +54,8 @@
4854
<include>index.epub</include>
4955
</includes>
5056
<outputDirectory>reference/epub</outputDirectory>
57+
<fileMode>0664</fileMode>
58+
<directoryMode>0775</directoryMode>
5159
</fileSet>
5260
<fileSet>
5361
<!--
@@ -56,6 +64,8 @@
5664
-->
5765
<directory>target/site/apidocs</directory>
5866
<outputDirectory>api</outputDirectory>
67+
<fileMode>0664</fileMode>
68+
<directoryMode>0775</directoryMode>
5969
</fileSet>
6070
</fileSets>
6171
</assembly>

pom.xml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -442,13 +442,6 @@
442442
<buildName>spring-ws</buildName>
443443
<buildUrl>{{BUILD_URL}}</buildUrl>
444444
</buildInfo>
445-
<deployProperties>
446-
<zip.name>spring-ws</zip.name>
447-
<zip.displayname>spring-ws</zip.displayname>
448-
<zip.deployed>false</zip.deployed>
449-
<zip.type>docs</zip.type>
450-
<archives>*:*:*:*@zip</archives>
451-
</deployProperties>
452445
<publisher>
453446
<contextUrl>https://repo.spring.io</contextUrl>
454447
<username>{{ARTIFACTORY_USR}}</username>
@@ -485,13 +478,6 @@
485478
<buildName>spring-ws</buildName>
486479
<buildUrl>{{BUILD_URL}}</buildUrl>
487480
</buildInfo>
488-
<deployProperties>
489-
<zip.name>spring-ws</zip.name>
490-
<zip.displayname>spring-ws</zip.displayname>
491-
<zip.deployed>false</zip.deployed>
492-
<zip.type>docs</zip.type>
493-
<archives>*:*:*:*@zip</archives>
494-
</deployProperties>
495481
<publisher>
496482
<contextUrl>https://repo.spring.io</contextUrl>
497483
<username>{{ARTIFACTORY_USR}}</username>
@@ -726,6 +712,7 @@
726712
<plugin>
727713
<groupId>org.apache.maven.plugins</groupId>
728714
<artifactId>maven-assembly-plugin</artifactId>
715+
<version>3.5.0</version>
729716
<executions>
730717
<execution>
731718
<id>docs</id>

spring-ws-bom/pom.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,6 @@
147147
<buildName>spring-ws</buildName>
148148
<buildUrl>{{BUILD_URL}}</buildUrl>
149149
</buildInfo>
150-
<deployProperties>
151-
<zip.name>spring-ws</zip.name>
152-
<zip.displayname>spring-ws</zip.displayname>
153-
<zip.deployed>false</zip.deployed>
154-
<zip.type>docs</zip.type>
155-
<archives>*:*:*:*@zip</archives>
156-
</deployProperties>
157150
<publisher>
158151
<contextUrl>https://repo.spring.io</contextUrl>
159152
<username>{{ARTIFACTORY_USR}}</username>
@@ -190,13 +183,6 @@
190183
<buildName>spring-ws</buildName>
191184
<buildUrl>{{BUILD_URL}}</buildUrl>
192185
</buildInfo>
193-
<deployProperties>
194-
<zip.name>spring-ws</zip.name>
195-
<zip.displayname>spring-ws</zip.displayname>
196-
<zip.deployed>false</zip.deployed>
197-
<zip.type>docs</zip.type>
198-
<archives>*:*:*:*@zip</archives>
199-
</deployProperties>
200186
<publisher>
201187
<contextUrl>https://repo.spring.io</contextUrl>
202188
<username>{{ARTIFACTORY_USR}}</username>

0 commit comments

Comments
 (0)