>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19775 )
Change subject: Merge branch 'gerrit/7.1.x' into 'gerrit/neo'
......................................................................
Merge branch 'gerrit/7.1.x' into 'gerrit/neo'
Ext-ref: MB-66739
Change-Id: I942b715f9c1feaab0592a6fcffa750451764a374
---
M asterixdb/pom.xml
M hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
M hyracks-fullstack/pom.xml
4 files changed, 25 insertions(+), 31 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 474363c..597c529 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -1073,13 +1073,12 @@
<artifactId>jsr311-api</artifactId>
</exclusion>
<exclusion>
-<<<<<<< HEAD (bc66d5 [ASTERIXDB-3605][COMP] Fix Required Partitioning
properties )
- <groupId>org.apache.avro</groupId>
- <artifactId>avro</artifactId>
-=======
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
->>>>>>> BRANCH (1e12c3 [NO ISSUE][MISC] Eliminate unused native dependencies)
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1151,17 +1150,10 @@
<groupId>org.jline</groupId>
<artifactId>jline</artifactId>
</exclusion>
-<<<<<<< HEAD (bc66d5 [ASTERIXDB-3605][COMP] Fix Required Partitioning
properties )
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </exclusion>
<exclusion>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
</exclusion>
-=======
->>>>>>> BRANCH (1e12c3 [NO ISSUE][MISC] Eliminate unused native dependencies)
</exclusions>
</dependency>
<dependency>
diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
index f4a7743..ff4fd28 100644
--- a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
@@ -148,17 +148,12 @@
<scope>test</scope>
<exclusions>
<exclusion>
-<<<<<<< HEAD (bc66d5 [ASTERIXDB-3605][COMP] Fix Required Partitioning
properties )
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
-=======
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
->>>>>>> BRANCH (1e12c3 [NO ISSUE][MISC] Eliminate unused native dependencies)
</exclusion>
<exclusion>
<groupId>ch.qos.reload4j</groupId>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 39ad70a..13bdc6f 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -215,9 +215,11 @@
</dependency>
<dependency>
<groupId>io.netty</groupId>
-<<<<<<< HEAD (bc66d5 [ASTERIXDB-3605][COMP] Fix Required Partitioning
properties )
<artifactId>netty-resolver</artifactId>
-=======
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<classifier>linux-x86_64</classifier>
<version>${netty.version}</version>
@@ -231,7 +233,6 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
->>>>>>> BRANCH (1e12c3 [NO ISSUE][MISC] Eliminate unused native dependencies)
<version>${netty.version}</version>
</dependency>
<dependency>
@@ -300,21 +301,12 @@
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
-<<<<<<< HEAD (bc66d5 [ASTERIXDB-3605][COMP] Fix Required Partitioning
properties )
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
-=======
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
->>>>>>> BRANCH (1e12c3 [NO ISSUE][MISC] Eliminate unused native dependencies)
</exclusion>
</exclusions>
</dependency>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19775
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: neo
Gerrit-Change-Id: I942b715f9c1feaab0592a6fcffa750451764a374
Gerrit-Change-Number: 19775
Gerrit-PatchSet: 3
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Hussain Towaileb <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-CC: Anon. E. Moose #1000171
Gerrit-MessageType: merged
