Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to maven-assembly-plugin 3.5.0.

Browse Source 
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.
This commit is contained in:
Greg L. Turnquist
2023-05-11 12:31:04 -05:00
parent 1adc7af334
commit 6edbdeb2a9
3 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docs.xml
View File

@@ -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>

15
pom.xml
View File

@@ -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>

14
spring-ws-bom/pom.xml
View File

@@ -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>