Ian Maxon has submitted this change and it was merged. Change subject: Depend on stable Hyracks version ......................................................................
Depend on stable Hyracks version Here I am depending on the next Hyracks version, by fetching from the Apache staging repository. I'm also propagating changes made on the Hyracks side that are needed for release, such as adding the incubator DISCLAIMER file, as well as removing the un-needed dependency on the maven release plugin. Change-Id: I402cef4206fa0610eaff899cf005875323fb18d2 Reviewed-on: https://asterix-gerrit.ics.uci.edu/377 Reviewed-by: Ian Maxon <[email protected]> Tested-by: Jenkins <[email protected]> --- A DISCLAIMER M pom.xml A src/main/assembly/source.xml 3 files changed, 89 insertions(+), 11 deletions(-) Approvals: Ian Maxon: Looks good to me, approved Jenkins: Verified diff --git a/DISCLAIMER b/DISCLAIMER new file mode 100644 index 0000000..3b9db89 --- /dev/null +++ b/DISCLAIMER @@ -0,0 +1,10 @@ +Apache AsterixDB is an effort undergoing incubation at the Apache Software +Foundation (ASF), sponsored by the Apache Incubator PMC. + +Incubation is required of all newly accepted projects until a further review +indicates that the infrastructure, communications, and decision making process +have stabilized in a manner consistent with other successful ASF projects. + +While incubation status is not necessarily a reflection of the completeness +or stability of the code, it does indicate that the project has yet to be +fully endorsed by the ASF. diff --git a/pom.xml b/pom.xml index f756fce..22113e8 100644 --- a/pom.xml +++ b/pom.xml @@ -52,8 +52,8 @@ <global.test.includes>**/*TestSuite.java,**/*Test.java,${execution.tests}</global.test.includes> <global.test.excludes>${optimizer.tests},${metadata.tests},${invalid.tests},${repeated.tests}</global.test.excludes> <!-- Versions under dependencymanagement or used in many projects via properties --> - <algebricks.version>0.2.16-SNAPSHOT</algebricks.version> - <hyracks.version>0.2.16-SNAPSHOT</hyracks.version> + <algebricks.version>0.2.16-incubating</algebricks.version> + <hyracks.version>0.2.16-incubating</hyracks.version> <hadoop.version>2.2.0</hadoop.version> <junit.version>4.11</junit.version> <commons.io.version>2.4</commons.io.version> @@ -63,14 +63,6 @@ <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.5.2</version> - <configuration> - <goals>package source:jar javadoc:jar deploy:deploy</goals> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> @@ -150,7 +142,31 @@ </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> @@ -289,6 +305,15 @@ <id>algebricks-snapshots</id> <url>http://obelix.ics.uci.edu/nexus/content/repositories/algebricks-snapshots/</url> </repository> + <repository> + <snapshots> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <id>apache-staging</id> + <url>https://repository.apache.org/content/repositories/orgapacheasterix-1005/</url> + </repository> </repositories> <dependencyManagement> <dependencies> diff --git a/src/main/assembly/source.xml b/src/main/assembly/source.xml new file mode 100644 index 0000000..210c49a --- /dev/null +++ b/src/main/assembly/source.xml @@ -0,0 +1,43 @@ +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> + <id>source-release</id> + <formats> + <format>zip</format> + </formats> + <fileSets> + <fileSet> + <directory>${project.basedir}</directory> + <outputDirectory>/</outputDirectory> + <useDefaultExcludes>true</useDefaultExcludes> + <includes> + <include>**/DISCLAIMER</include> + <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> + </includes> + <excludes> + <exclude>**/${project.build.directory}/**</exclude> + </excludes> + </fileSet> + </fileSets> +</assembly> -- To view, visit https://asterix-gerrit.ics.uci.edu/377 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I402cef4206fa0610eaff899cf005875323fb18d2 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon <[email protected]> Gerrit-Reviewer: Chris Hillery <[email protected]> Gerrit-Reviewer: Heri Ramampiaro <[email protected]> Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]>
