Chris Hillery has submitted this change and it was merged. Change subject: ASTERIXDB-1120: Fix sub-project builds. ......................................................................
ASTERIXDB-1120: Fix sub-project builds. The maven-assembly-plugin configuration for creating source tarballs was interfering with building in a subdirectory. Since we only need tarballs at release time, move this plugin to a new 'asterix-release' profile. Change-Id: I457c1700459741158a245f20a9ab2adfc79731d2 Reviewed-on: https://asterix-gerrit.ics.uci.edu/431 Tested-by: Jenkins <[email protected]> Reviewed-by: Ian Maxon <[email protected]> Tested-by: Chris Hillery <[email protected]> --- M pom.xml 1 file changed, 32 insertions(+), 26 deletions(-) Approvals: Chris Hillery: Verified Ian Maxon: Looks good to me, approved Jenkins: Verified diff --git a/pom.xml b/pom.xml index 8d11476..06fd841 100644 --- a/pom.xml +++ b/pom.xml @@ -146,31 +146,6 @@ </includes> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <!-- We override the configuration plugin to override the descriptor to use for building - the source release zip. Specifically, we would like to control the inclusions/exclusions. - For example, we exclude the KEYS file from the zip --> - <executions> - <execution> - <!-- Use this id to match the id mentioned in the assembly plugin configuration in - the apache parent POM under the apache-release profile --> - <id>source-release-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <!-- combine.self should be override to replace the configuration in the parent POM --> - <configuration combine.self="override"> - <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> - <descriptors> - <descriptor>src/main/assembly/source.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> @@ -237,7 +212,38 @@ <test.heap.size>3072</test.heap.size> </properties> </profile> - + <profile> + <id>asterix-release</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <!-- We override the configuration plugin to override the descriptor to use for building + the source release zip. Specifically, we would like to control the inclusions/exclusions. + For example, we exclude the KEYS file from the zip --> + <executions> + <execution> + <!-- Use this id to match the id mentioned in the assembly plugin configuration in + the apache parent POM under the apache-release profile --> + <id>source-release-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <!-- combine.self should be override to replace the configuration in the parent POM --> + <configuration combine.self="override"> + <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> + <descriptors> + <descriptor>src/main/assembly/source.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> <modules> -- To view, visit https://asterix-gerrit.ics.uci.edu/431 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I457c1700459741158a245f20a9ab2adfc79731d2 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Chris Hillery <[email protected]> Gerrit-Reviewer: Chris Hillery <[email protected]> Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]>
