Michael Blow has submitted this change and it was merged. Change subject: Fix AsterixDB Source Assembly, Rename Hyracks Source Assembly ......................................................................
Fix AsterixDB Source Assembly, Rename Hyracks Source Assembly - Update source assembly descriptor to include missing files, filter out extranous files. - /apache-asterixdb-hyracks/apache-hyracks/ Change-Id: I6a1597b4d6322b43617fd5a348ab3116ff2d14f8 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1449 Reviewed-by: Ian Maxon <ima...@apache.org> Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> BAD: Jenkins <jenk...@fulliautomatix.ics.uci.edu> --- M asterixdb/src/main/assembly/source.xml M hyracks-fullstack/algebricks/pom.xml M hyracks-fullstack/hyracks-fullstack-license/pom.xml M hyracks-fullstack/hyracks/pom.xml M hyracks-fullstack/pom.xml 5 files changed, 9 insertions(+), 36 deletions(-) Approvals: Ian Maxon: Looks good to me, approved Jenkins: Verified; No violations found; No violations found diff --git a/asterixdb/src/main/assembly/source.xml b/asterixdb/src/main/assembly/source.xml index b29da54..97cf01f 100644 --- a/asterixdb/src/main/assembly/source.xml +++ b/asterixdb/src/main/assembly/source.xml @@ -28,38 +28,13 @@ <directory>${project.basedir}</directory> <outputDirectory>/</outputDirectory> <useDefaultExcludes>true</useDefaultExcludes> - <includes> - <include>**/LICENSE</include> - <include>**/NOTICE</include> - <include>**/README</include> - <include>**/src/**</include> - <include>**/results/**</include> - <include>**/pom.xml</include> - <include>**/build*.xml</include> - <include>**/findbugs*.xml</include> - <include>**/*site.xml</include> - <include>**/*.adm</include> - <include>**/*.json</include> - <include>**/*.aql</include> - <include>**/*.ddl</include> - <include>**/*.seq</include> - <include>**/*.rc</include> - <include>**/*.big</include> - <include>**/*textFileS</include> - <include>**/*large_text</include> - <include>**/*.csv*</include> - <include>**/*.tbl</include> - <include>**/*.txt</include> - <include>**/part-*</include> - <include>**/*.cleaned</include> - <include>**/*.md</include> - <include>**/*.hcli</include> - <include>**/*.properties</include> - <include>**/*.scm</include> - <include>**/*.sh</include> - </includes> <excludes> <exclude>**/${project.build.directory}/**</exclude> + <exclude>**/git.properties</exclude> + <exclude>release.properties</exclude> + <exclude>asterix-app/src/test/resources/externallib/**</exclude> + <exclude>asterix-installer/src/test/resources/clusterts/asterix-installer-*-binary-assembly/**</exclude> + <exclude>DEPENDENCIES</exclude> </excludes> </fileSet> <fileSet> diff --git a/hyracks-fullstack/algebricks/pom.xml b/hyracks-fullstack/algebricks/pom.xml index ba31be5..403ed15 100644 --- a/hyracks-fullstack/algebricks/pom.xml +++ b/hyracks-fullstack/algebricks/pom.xml @@ -19,14 +19,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.hyracks</groupId> <artifactId>algebricks</artifactId> <packaging>pom</packaging> <name>algebricks</name> <parent> <groupId>org.apache.hyracks</groupId> - <artifactId>apache-asterixdb-hyracks</artifactId> + <artifactId>apache-hyracks</artifactId> <version>0.2.18-SNAPSHOT</version> </parent> diff --git a/hyracks-fullstack/hyracks-fullstack-license/pom.xml b/hyracks-fullstack/hyracks-fullstack-license/pom.xml index a25c0d6..7105a5f 100644 --- a/hyracks-fullstack/hyracks-fullstack-license/pom.xml +++ b/hyracks-fullstack/hyracks-fullstack-license/pom.xml @@ -22,7 +22,7 @@ <name>hyracks-fullstack-license</name> <parent> <groupId>org.apache.hyracks</groupId> - <artifactId>apache-asterixdb-hyracks</artifactId> + <artifactId>apache-hyracks</artifactId> <version>0.2.18-SNAPSHOT</version> </parent> diff --git a/hyracks-fullstack/hyracks/pom.xml b/hyracks-fullstack/hyracks/pom.xml index cb2d661..b45cf8c 100644 --- a/hyracks-fullstack/hyracks/pom.xml +++ b/hyracks-fullstack/hyracks/pom.xml @@ -19,14 +19,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.hyracks</groupId> <artifactId>hyracks</artifactId> <packaging>pom</packaging> <name>hyracks</name> <parent> <groupId>org.apache.hyracks</groupId> - <artifactId>apache-asterixdb-hyracks</artifactId> + <artifactId>apache-hyracks</artifactId> <version>0.2.18-SNAPSHOT</version> </parent> diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 1213ba0..f01fa5f 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -20,7 +20,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.hyracks</groupId> - <artifactId>apache-asterixdb-hyracks</artifactId> + <artifactId>apache-hyracks</artifactId> <version>0.2.18-SNAPSHOT</version> <packaging>pom</packaging> <name>hyracks-ecosystem-full-stack</name> -- To view, visit https://asterix-gerrit.ics.uci.edu/1449 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6a1597b4d6322b43617fd5a348ab3116ff2d14f8 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: release-0.8.9 Gerrit-Owner: Michael Blow <mb...@apache.org> Gerrit-Reviewer: Ian Maxon <ima...@apache.org> Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Gerrit-Reviewer: Michael Blow <mb...@apache.org> Gerrit-Reviewer: Till Westmann <ti...@apache.org>
