From 666638e6c629fd7fb96b7e5de46f95460f6cd9ba Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Fri, 2 Aug 2019 14:13:49 +0200
Subject: [PATCH] #840 - Deploy only one schema.zip file.

Use the assembly plugin guarded by properties determined by ant.
---
 parent/pom.xml | 56 ++++++++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index af8025d2..8660f74c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -550,7 +550,7 @@
 						</plugin>
 
 						<!--
-							Creates two zip files for download as well as API and reference documentation distribution.
+							Creates the documentation zip file.
 						-->
 						<plugin>
 							<groupId>org.apache.maven.plugins</groupId>
@@ -674,7 +674,6 @@
 						</executions>
 					</plugin>
 
-
 					<!--
 						Copies all namespaces schemas to target/schemas flatten the directory structure.
 						Depended on by the site.xml assembly descriptor.
@@ -691,7 +690,7 @@
 								<phase>prepare-package</phase>
 								<configuration>
 									<target>
-										<copy todir="${project.build.directory}/schemas">
+										<copy todir="${project.root}/target/schemas">
 											<fileset dir="${basedir}"
 													 erroronmissingdir="false">
 												<include
@@ -711,9 +710,11 @@
 								<phase>prepare-package</phase>
 								<configuration>
 									<target>
-										<available
-												file="${project.build.directory}/schemas"
-												property="schema.present"/>
+										<condition property="assembly.skipAssembly">
+											<not>
+												<available file="${project.root}/target/schemas"/>
+											</not>
+										</condition>
 									</target>
 									<exportAntProperties>true</exportAntProperties>
 								</configuration>
@@ -721,28 +722,33 @@
 									<goal>run</goal>
 								</goals>
 							</execution>
-							<execution>
-								<id>zip-schema-files</id>
-								<phase>prepare-package</phase>
-								<configuration>
-									<target if="schema.present">
-										<zip destfile="${project.build.directory}/${dist.id}-${project.version}-schema.zip"
-											 basedir="${project.build.directory}/schemas"
-											 whenempty="skip"/>
-										<attachartifact
-												file="${project.build.directory}/${dist.id}-${project.version}-schema.zip"
-												classifier="schema" type="zip"/>
-									</target>
-								</configuration>
-								<goals>
-									<goal>run</goal>
-								</goals>
-							</execution>
-
 						</executions>
-
 					</plugin>
 
+						<!--
+							Creates the schema zip file.
+						-->
+						<plugin>
+							<groupId>org.apache.maven.plugins</groupId>
+							<artifactId>maven-assembly-plugin</artifactId>
+							<executions>
+								<execution>
+									<id>docs</id>
+									<goals>
+										<goal>single</goal>
+									</goals>
+									<phase>package</phase>
+									<configuration>
+										<descriptors>
+											<descriptor>${shared.resources}/assemblies/schema.xml</descriptor>
+										</descriptors>
+										<finalName>${dist.id}</finalName>
+										<appendAssemblyId>true</appendAssemblyId>
+									</configuration>
+								</execution>
+							</executions>
+						</plugin>
+
 					<plugin>
 						<groupId>org.jfrog.buildinfo</groupId>
 						<artifactId>artifactory-maven-plugin</artifactId>