You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2021/08/28 02:19:44 UTC
[asterixdb] 06/06: Merge branch 'gerrit/cheshire-cat'
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit fc91effc093f94157f3e852eea6eaa3785bdba94
Merge: 072ee50 2521ade
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Fri Aug 27 18:02:34 2021 -0400
Merge branch 'gerrit/cheshire-cat'
Change-Id: I7f1ef24df98829eea268b8597b031de89e1b010c
.../asterix-app/src/main/resources/entrypoint.py | 6 +-
.../src/test/resources/TweetSent/roundtrip.py | 3 +
.../big_object_pyudf/big_object_pyudf.1.ddl.sqlpp | 82 ++++++++++++++++++++++
.../big_object_pyudf.2.update.sqlpp | 24 +++++++
.../big_object_pyudf/big_object_pyudf.3.lib.sqlpp | 19 +++++
.../big_object_pyudf/big_object_pyudf.4.ddl.sqlpp | 22 ++++++
.../big_object_pyudf.5.query.sqlpp | 32 +++++++++
.../external-library/big_object_pyudf/join.1.adm | 1 +
.../resources/runtimets/testsuite_it_python.xml | 7 +-
asterixdb/pom.xml | 2 +-
10 files changed, 193 insertions(+), 5 deletions(-)
diff --cc asterixdb/pom.xml
index 7e4883f,49cdf32..7fc4e26
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -1087,9 -1087,24 +1087,9 @@@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-serde</artifactId>
- <version>0.13.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.20</version>
+ <version>1.21</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>