You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu> on 2022/01/20 17:47:21 UTC
Change in asterixdb[master]: Merge release 0.9.7 into master
From Ian Maxon <im...@uci.edu>:
Ian Maxon has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14883 )
Change subject: Merge release 0.9.7 into master
......................................................................
Merge release 0.9.7 into master
Change-Id:If97ac8dad8df435c9a0c15ef4d7a7ef12bb3acde
---
D asterixdb/asterix-hivecompat/pom.xml
M asterixdb/pom.xml
3 files changed, 1 insertion(+), 90 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/83/14883/1
diff --git a/asterixdb/asterix-hivecompat/pom.xml b/asterixdb/asterix-hivecompat/pom.xml
deleted file mode 100644
index db044fe..0000000
--- a/asterixdb/asterix-hivecompat/pom.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<<<<<<< HEAD (10b702 Merge branch 'gerrit/neo')
-=======
-<!--
- ! 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.8-SNAPSHOT</version>
- </parent>
- <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>
- <artifactId>asterix-hivecompat</artifactId>
- <properties>
- <root.dir>${basedir}/..</root.dir>
- <source-format.skip>true</source-format.skip>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <excludes>**/hivecompat/**/*</excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-serde</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hive.shims</groupId>
- <artifactId>hive-shims-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- </dependency>
- </dependencies>
-</project>
->>>>>>> BRANCH (d59149 Advance version to AsterixDB 0.9.8-SNAPSHOT and Hyracks 0.3.)
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index f2a17d7..83fdaa7 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 (10b702 Merge branch 'gerrit/neo')
- <algebricks.version>0.3.7-SNAPSHOT</algebricks.version>
- <hyracks.version>0.3.7-SNAPSHOT</hyracks.version>
- <hadoop.version>3.3.1</hadoop.version>
-=======
<algebricks.version>0.3.8-SNAPSHOT</algebricks.version>
<hyracks.version>0.3.8-SNAPSHOT</hyracks.version>
- <hadoop.version>2.8.5</hadoop.version>
->>>>>>> BRANCH (d59149 Advance version to AsterixDB 0.9.8-SNAPSHOT and Hyracks 0.3.)
+ <hadoop.version>3.3.1</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.17.1</log4j.version>
<awsjavasdk.version>2.17.79</awsjavasdk.version>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14883
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: If97ac8dad8df435c9a0c15ef4d7a7ef12bb3acde
Gerrit-Change-Number: 14883
Gerrit-PatchSet: 1
Gerrit-Owner: Ian Maxon <im...@uci.edu>
Gerrit-MessageType: newchange
Change in asterixdb[master]: Merge release 0.9.7 into master
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Ian Maxon <im...@uci.edu>:
Hello Jenkins, Michael Blow, Anon. E. Moose #1000171,
I'd like you to reexamine a change. Please visit
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14883
to look at the new patch set (#2).
Change subject: Merge release 0.9.7 into master
......................................................................
Merge release 0.9.7 into master
Change-Id:If97ac8dad8df435c9a0c15ef4d7a7ef12bb3acde
---
D asterixdb/asterix-hivecompat/pom.xml
M asterixdb/pom.xml
3 files changed, 1 insertion(+), 90 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/83/14883/2
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14883
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: If97ac8dad8df435c9a0c15ef4d7a7ef12bb3acde
Gerrit-Change-Number: 14883
Gerrit-PatchSet: 2
Gerrit-Owner: Ian Maxon <im...@uci.edu>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Ian Maxon <im...@uci.edu>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newpatchset
Change in asterixdb[master]: Merge release 0.9.7 into master
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Ian Maxon <im...@uci.edu>:
Ian Maxon has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14883 )
Change subject: Merge release 0.9.7 into master
......................................................................
Merge release 0.9.7 into master
Change-Id:If97ac8dad8df435c9a0c15ef4d7a7ef12bb3acde
---
D asterixdb/asterix-hivecompat/pom.xml
M asterixdb/pom.xml
3 files changed, 1 insertion(+), 90 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/83/14883/1
diff --git a/asterixdb/asterix-hivecompat/pom.xml b/asterixdb/asterix-hivecompat/pom.xml
deleted file mode 100644
index db044fe..0000000
--- a/asterixdb/asterix-hivecompat/pom.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<<<<<<< HEAD (10b702 Merge branch 'gerrit/neo')
-=======
-<!--
- ! 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.8-SNAPSHOT</version>
- </parent>
- <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>
- <artifactId>asterix-hivecompat</artifactId>
- <properties>
- <root.dir>${basedir}/..</root.dir>
- <source-format.skip>true</source-format.skip>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <excludes>**/hivecompat/**/*</excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-serde</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hive.shims</groupId>
- <artifactId>hive-shims-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- </dependency>
- </dependencies>
-</project>
->>>>>>> BRANCH (d59149 Advance version to AsterixDB 0.9.8-SNAPSHOT and Hyracks 0.3.)
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index f2a17d7..83fdaa7 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 (10b702 Merge branch 'gerrit/neo')
- <algebricks.version>0.3.7-SNAPSHOT</algebricks.version>
- <hyracks.version>0.3.7-SNAPSHOT</hyracks.version>
- <hadoop.version>3.3.1</hadoop.version>
-=======
<algebricks.version>0.3.8-SNAPSHOT</algebricks.version>
<hyracks.version>0.3.8-SNAPSHOT</hyracks.version>
- <hadoop.version>2.8.5</hadoop.version>
->>>>>>> BRANCH (d59149 Advance version to AsterixDB 0.9.8-SNAPSHOT and Hyracks 0.3.)
+ <hadoop.version>3.3.1</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.17.1</log4j.version>
<awsjavasdk.version>2.17.79</awsjavasdk.version>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14883
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: If97ac8dad8df435c9a0c15ef4d7a7ef12bb3acde
Gerrit-Change-Number: 14883
Gerrit-PatchSet: 1
Gerrit-Owner: Ian Maxon <im...@uci.edu>
Gerrit-MessageType: newchange