>From Ian Maxon <[email protected]>:
Ian Maxon has submitted this change. (
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
---
M hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/pom.xml
D asterixdb/asterix-docker/pom.xml
M asterixdb/pom.xml
M asterixdb/asterix-podman/pom.xml
M asterixdb/asterix-column/pom.xml
6 files changed, 19 insertions(+), 82 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git a/asterixdb/asterix-column/pom.xml b/asterixdb/asterix-column/pom.xml
index 2ee75c8..ef87c91 100644
--- a/asterixdb/asterix-column/pom.xml
+++ b/asterixdb/asterix-column/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.9-SNAPSHOT</version>
</parent>
<artifactId>asterix-column</artifactId>
diff --git a/asterixdb/asterix-docker/pom.xml b/asterixdb/asterix-docker/pom.xml
deleted file mode 100644
index f1464cd..0000000
--- a/asterixdb/asterix-docker/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<<<<<<< HEAD (37e3f5 [ASTERIXDB-3137][STO] Introduce LSM write operations
for col)
-=======
-<!--
- ! 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 (4f3e48 Advance versions to 0.9.9-SNAPSHOT and 0.3.9-SNAPSHOT)
diff --git a/asterixdb/asterix-podman/pom.xml b/asterixdb/asterix-podman/pom.xml
index 3d32518..23928aa 100644
--- a/asterixdb/asterix-podman/pom.xml
+++ b/asterixdb/asterix-podman/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>apache-asterixdb</artifactId>
<groupId>org.apache.asterix</groupId>
- <version>0.9.8-SNAPSHOT</version>
+ <version>0.9.9-SNAPSHOT</version>
</parent>
<artifactId>asterix-podman</artifactId>
<dependencies>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index f0172ba..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 (37e3f5 [ASTERIXDB-3137][STO] Introduce LSM write operations
for col)
- <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 (4f3e48 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>
diff --git
a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/pom.xml
b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/pom.xml
index 24682a8..cadc714 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree-column/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks</artifactId>
- <version>0.3.8-SNAPSHOT</version>
+ <version>0.3.9-SNAPSHOT</version>
</parent>
<licenses>
<license>
@@ -92,4 +92,4 @@
<artifactId>log4j-api</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
--
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: 3
Gerrit-Owner: Ian Maxon <[email protected]>
Gerrit-Reviewer: Ian Maxon <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-MessageType: merged
