>From Ian Maxon <[email protected]>: Ian Maxon has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17427 )
Change subject: Merge branch 'release-0.9.8' ...................................................................... Merge branch 'release-0.9.8' Change-Id: I511044b28d6a0f2f2d2639ea1432281f4b2a5c21 --- D asterixdb/asterix-docker/pom.xml M asterixdb/pom.xml 3 files changed, 15 insertions(+), 78 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/27/17427/1 diff --git a/asterixdb/asterix-docker/pom.xml b/asterixdb/asterix-docker/pom.xml deleted file mode 100644 index 64b42f3..0000000 --- a/asterixdb/asterix-docker/pom.xml +++ /dev/null @@ -1,71 +0,0 @@ -<<<<<<< HEAD (1df332 [ASTERIXDB-3134][STO][COMP] Enable Columnar Filter - Part 1) -======= -<!-- - ! 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. - !--> - -<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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>apache-asterixdb</artifactId> - <groupId>org.apache.asterix</groupId> - <version>0.9.9-SNAPSHOT</version> - </parent> - <artifactId>asterix-docker</artifactId> - - <properties> - <root.dir>${basedir}/..</root.dir> - </properties> - - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - <distribution>repo</distribution> - <comments>A business-friendly OSS license</comments> - </license> - </licenses> - - <profiles> - <profile> - <id>docker</id> - <build> - <plugins> - <plugin> - <groupId>com.spotify</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.2.11</version> - <configuration> - <imageName>asterixdb/demo</imageName> - <dockerDirectory>docker</dockerDirectory> - <resources> - <resource> - <targetPath>/</targetPath> - <directory>../asterix-server/target/</directory> - <include>asterix-server-${project.version}-binary-assembly.zip</include> - </resource> - </resources> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> ->>>>>>> BRANCH (36eb39 Advance versions to 0.9.9-SNAPSHOT and 0.3.9-SNAPSHOT) diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 08558d8..1c9db43 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -82,15 +82,9 @@ <skip-npm-touch.stage>none</skip-npm-touch.stage> <!-- Versions under dependencymanagement or used in many projects via properties --> -<<<<<<< HEAD (1df332 [ASTERIXDB-3134][STO][COMP] Enable Columnar Filter - Part 1) - <algebricks.version>0.3.8-SNAPSHOT</algebricks.version> - <hyracks.version>0.3.8-SNAPSHOT</hyracks.version> - <hadoop.version>3.3.4</hadoop.version> -======= <algebricks.version>0.3.9-SNAPSHOT</algebricks.version> <hyracks.version>0.3.9-SNAPSHOT</hyracks.version> - <hadoop.version>3.3.2</hadoop.version> ->>>>>>> BRANCH (36eb39 Advance versions to 0.9.9-SNAPSHOT and 0.3.9-SNAPSHOT) + <hadoop.version>3.3.4</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> <log4j.version>2.19.0</log4j.version> <awsjavasdk.version>2.17.218</awsjavasdk.version> -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17427 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I511044b28d6a0f2f2d2639ea1432281f4b2a5c21 Gerrit-Change-Number: 17427 Gerrit-PatchSet: 1 Gerrit-Owner: Ian Maxon <[email protected]> Gerrit-MessageType: newchange
