From 2355cbdc6eaca6f51aa46ae0505c3c853aae86ca Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin.grzejszczak@gmail.com>
Date: Mon, 25 May 2020 12:18:20 +0200
Subject: [PATCH] Improved the way the zipped docs are pushed; fixes gh-166

---
 docs/pom.xml                       |  3 +
 docs/src/main/asciidoc/README.adoc | 11 ++--
 pom.xml                            | 92 +++++++++++-------------------
 3 files changed, 41 insertions(+), 65 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index edc076ef..50f5da67 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -272,6 +272,9 @@
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
 					</plugin>
+					<plugin>
+						<artifactId>maven-deploy-plugin</artifactId>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>
diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc
index 24ae217c..bb53f391 100644
--- a/docs/src/main/asciidoc/README.adoc
+++ b/docs/src/main/asciidoc/README.adoc
@@ -98,22 +98,21 @@ approach of generating documentation just add these plugins to your `docs` modul
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId> <6>
 					</plugin>
-                                        <plugin>
-                                                <groupId>org.codehaus.mojo</groupId>
-                                                <artifactId>build-helper-maven-plugin</artifactId> <7>
-                                        </plugin>
+					<plugin>
+						<artifactId>maven-deploy-plugin</artifactId> <7>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>
 	</profiles>
 ----
-<2> This plugin downloads sets up all the git information of the project
+<1> This plugin downloads sets up all the git information of the project
 <2> This plugin downloads the resources of the `spring-cloud-build-docs` module
 <3> This plugin unpacks the resources of the `spring-cloud-build-docs` module
 <4> This plugin generates an `adoc` file with all the configuration properties from the classpath
 <5> This plugin is required to parse the Asciidoctor documentation
 <6> This plugin is required to copy resources into proper final destinations and to generate main README.adoc and to assert that no files use unresolved links
-<7> This plugin ensures that the generated zip docs are attached as an artifact and will get published
+<7> This plugin ensures that the generated zip docs will get published
 
 IMPORTANT: The order of plugin declaration is important!
 
diff --git a/pom.xml b/pom.xml
index 77907059..238b10d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,6 +109,9 @@
 		<generated-docs-pdf-output.dir>${project.build.directory}/generated-docs/reference/pdf</generated-docs-pdf-output.dir>
 		<javadoc.failOnError>false</javadoc.failOnError>
 		<javadoc.failOnWarnings>false</javadoc.failOnWarnings>
+		<maven-deploy-plugin.version>2.7</maven-deploy-plugin.version>
+		<maven-deploy-plugin.deployZipRepositoryId>repo.spring.io</maven-deploy-plugin.deployZipRepositoryId>
+		<maven-deploy-plugin.deployZipUrl>https://repo.spring.io/libs-snapshot-local</maven-deploy-plugin.deployZipUrl>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -754,6 +757,9 @@
 					<url>https://repo.spring.io/libs-milestone-local</url>
 				</repository>
 			</distributionManagement>
+			<properties>
+				<maven-deploy-plugin.deployZipUrl>https://repo.spring.io/libs-milestone-local</maven-deploy-plugin.deployZipUrl>
+			</properties>
 		</profile>
 		<profile>
 			<id>bintray</id>
@@ -787,6 +793,9 @@
 					</plugin>
 				</plugins>
 			</build>
+			<properties>
+				<maven-deploy-plugin.deployZipUrl>https://repo.spring.io/libs-release-local</maven-deploy-plugin.deployZipUrl>
+			</properties>
 		</profile>
 		<profile>
 			<id>guides</id>
@@ -1111,8 +1120,8 @@
 									<version-type>${version-type}@</version-type>
 									<!-- Once we go to docs.spring.io should be changed to -->
 									<!-- https://docs.spring.io/${docs.main}/${project.version} -->
-									<docs-url>${docs-url}@</docs-url>
-									<raw-docs-url>${raw-docs-url}@</raw-docs-url>
+									<docs-url>https://docs.spring.io/${docs.main}/${project.version}@</docs-url>
+									<raw-docs-url>${github-raw}@</raw-docs-url>
 									<project-version>${project.version}@</project-version>
 									<project-name>${docs.main}@</project-name>
 								</attributes>
@@ -1335,68 +1344,11 @@
 														   input="${git.branch}" regexp="origin/(.*)"
 														   replace="\1"/>
 											<var name="github-tag" value="${git.branch}"/>
-											<condition property="docs-url"
-													   value="https://cloud.spring.io/${docs.main}">
-												<and>
-													<equals arg1="${version-type}" arg2="SNAPSHOT"/>
-													<or>
-														<equals arg1="${git.branch}" arg2="master"/>
-														<equals arg1="${git.branch}" arg2="origin/master"/>
-													</or>
-												</and>
-											</condition>
-											<condition property="docs-url"
-													   value="https://cloud.spring.io/${docs.main}/${git.branch}">
-												<and>
-													<equals arg1="${version-type}" arg2="SNAPSHOT"/>
-													<not>
-														<or>
-															<equals arg1="${git.branch}" arg2="master"/>
-															<equals arg1="${git.branch}" arg2="origin/master"/>
-														</or>
-													</not>
-												</and>
-											</condition>
-											<condition property="docs-url"
-													   value="https://cloud.spring.io/spring-cloud-static/${docs.main}/${project.version}">
-												<and>
-													<not>
-														<equals arg1="${version-type}" arg2="SNAPSHOT"/>
-													</not>
-												</and>
-											</condition>
-											<propertyregex property="raw-docs-url" override="true"
-														   input="${docs-url}" regexp="https://cloud.spring.io/(.*)"
-														   replace="https://raw.githubusercontent.com/\1"/>
 										</target>
 									</configuration>
 								</execution>
 							</executions>
 						</plugin>
-						<plugin>
-							<groupId>org.codehaus.mojo</groupId>
-							<artifactId>build-helper-maven-plugin</artifactId>
-							<version>${build-helper-maven-plugin.version}</version>
-							<executions>
-								<execution>
-									<id>attach-zip</id>
-									<phase>package</phase>
-									<goals>
-										<goal>attach-artifact</goal>
-									</goals>
-									<configuration>
-										<artifacts>
-											<artifact>
-												<file>
-													${project.build.directory}/${project.artifactId}-${project.version}.zip
-												</file>
-												<type>zip;zip.type=docs;zip.deployed=false;</type>
-											</artifact>
-										</artifacts>
-									</configuration>
-								</execution>
-							</executions>
-						</plugin>
 						<plugin>
 							<groupId>org.jfrog.buildinfo</groupId>
 							<artifactId>artifactory-maven-plugin</artifactId>
@@ -1423,6 +1375,28 @@
 								</execution>
 							</executions>
 						</plugin>
+						<plugin>
+							<artifactId>maven-deploy-plugin</artifactId>
+							<version>${maven-deploy-plugin.version}</version>
+							<executions>
+								<execution>
+									<id>upload-docs-zip</id>
+									<phase>deploy</phase>
+									<goals>
+										<goal>deploy-file</goal>
+									</goals>
+									<configuration>
+										<groupId>${project.groupId}</groupId>
+										<artifactId>${project.artifactId}</artifactId>
+										<version>${project.version}</version>
+										<repositoryId>${maven-deploy-plugin.deployZipRepositoryId}</repositoryId>
+										<url>${maven-deploy-plugin.deployZipUrl}</url>
+										<file>${project.build.directory}/${project.artifactId}-${project.version}.zip</file>
+										<packaging>zip;zip.type=docs;zip.deployed=false;</packaging>
+									</configuration>
+								</execution>
+							</executions>
+						</plugin>
 					</plugins>
 				</pluginManagement>
 			</build>