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. (Use same name as asterix project in preparation for merging of the projects.) Change-Id: Ia42ccd27a9882ac8a27ce1d17c9d71c9ad5505b6 Reviewed-on: https://asterix-gerrit.ics.uci.edu/432 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(+), 25 deletions(-) Approvals: Chris Hillery: Verified Ian Maxon: Looks good to me, approved Jenkins: Verified diff --git a/pom.xml b/pom.xml index c0f097f..8e4aeec 100644 --- a/pom.xml +++ b/pom.xml @@ -192,31 +192,6 @@ </excludes> </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> @@ -235,6 +210,38 @@ <hanging.pregelix.tests /> </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> <repositories> -- To view, visit https://asterix-gerrit.ics.uci.edu/432 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia42ccd27a9882ac8a27ce1d17c9d71c9ad5505b6 Gerrit-PatchSet: 2 Gerrit-Project: hyracks 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]>
