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 2021/12/04 11:07:03 UTC
Change in asterixdb[stabilization-02ea049d7a]: Merge branch 'gerrit/stabilization-5949a1cb71'
From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14343 )
Change subject: Merge branch 'gerrit/stabilization-5949a1cb71'
......................................................................
Merge branch 'gerrit/stabilization-5949a1cb71'
Change-Id: I25a448cca69e3a90e2ce83a0b64dd253c9ad92f5
---
M asterixdb/asterix-app/pom.xml
M asterixdb/asterix-server/pom.xml
M hyracks-fullstack/pom.xml
4 files changed, 14 insertions(+), 43 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/43/14343/1
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index dbd4e97..4b1fecf 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -713,7 +713,18 @@
</exclusion>
</exclusions>
</dependency>
-<<<<<<< HEAD (570140 [ASTERIXDB-2949][RUN][FUN] SUBSTR function produces malforme)
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-buffer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
+ </dependency>
<!-- AWS -->
<dependency>
<groupId>software.amazon.awssdk</groupId>
@@ -742,19 +753,6 @@
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-http-core_2.12</artifactId>
<scope>test</scope>
-=======
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
->>>>>>> BRANCH (e8637d [NO ISSUE][MISC] Update dependencies)
</dependency>
</dependencies>
</project>
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index 430c16b..2044fe2 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -258,11 +258,8 @@
<aliasUrl>http://www.apache.org/licenses/LICENSE-2.0</aliasUrl>
<aliasUrl>https://www.apache.org/licenses/LICENSE-2.0.txt</aliasUrl>
<aliasUrl>http://www.apache.org/licenses/LICENSE-2.0.html</aliasUrl>
-<<<<<<< HEAD (570140 [ASTERIXDB-2949][RUN][FUN] SUBSTR function produces malforme)
- <aliasUrl>https://aws.amazon.com/apache2.0</aliasUrl>
-=======
<aliasUrl>https://www.apache.org/licenses/LICENSE-2.0.html</aliasUrl>
->>>>>>> BRANCH (e8637d [NO ISSUE][MISC] Update dependencies)
+ <aliasUrl>https://aws.amazon.com/apache2.0</aliasUrl>
</aliasUrls>
<metric>1</metric>
</license>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index b352dbb..7ec00ad 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -299,12 +299,8 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
-<<<<<<< HEAD (570140 [ASTERIXDB-2949][RUN][FUN] SUBSTR function produces malforme)
- <version>3.6.3</version>
-=======
<version>3.8.3</version>
->>>>>>> BRANCH (e8637d [NO ISSUE][MISC] Update dependencies)
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
@@ -326,26 +322,6 @@
<version>${log4j.version}</version>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>3.10.0</version>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito2</artifactId>
- <version>2.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>2.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-core</artifactId>
- <version>2.0.9</version>
- </dependency>
- <dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>${snappy.version}</version>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14343
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-02ea049d7a
Gerrit-Change-Id: I25a448cca69e3a90e2ce83a0b64dd253c9ad92f5
Gerrit-Change-Number: 14343
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange
Change in asterixdb[stabilization-02ea049d7a]: Merge branch 'gerrit/stabilization-5949a1cb71'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Jenkins <je...@fulliautomatix.ics.uci.edu>:
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14343 )
Change subject: Merge branch 'gerrit/stabilization-5949a1cb71'
......................................................................
Patch Set 2: Integration-Tests+1
Integration Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/12790/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14343
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-02ea049d7a
Gerrit-Change-Id: I25a448cca69e3a90e2ce83a0b64dd253c9ad92f5
Gerrit-Change-Number: 14343
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Comment-Date: Sat, 04 Dec 2021 14:52:40 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in asterixdb[stabilization-02ea049d7a]: Merge branch 'gerrit/stabilization-5949a1cb71'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Michael Blow <mb...@apache.org>:
Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14343 )
Change subject: Merge branch 'gerrit/stabilization-5949a1cb71'
......................................................................
Merge branch 'gerrit/stabilization-5949a1cb71'
Change-Id: I25a448cca69e3a90e2ce83a0b64dd253c9ad92f5
---
M asterixdb/asterix-app/pom.xml
M asterixdb/asterix-server/pom.xml
M hyracks-fullstack/pom.xml
4 files changed, 14 insertions(+), 43 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/43/14343/1
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index dbd4e97..4b1fecf 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -713,7 +713,18 @@
</exclusion>
</exclusions>
</dependency>
-<<<<<<< HEAD (570140 [ASTERIXDB-2949][RUN][FUN] SUBSTR function produces malforme)
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-buffer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
+ </dependency>
<!-- AWS -->
<dependency>
<groupId>software.amazon.awssdk</groupId>
@@ -742,19 +753,6 @@
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-http-core_2.12</artifactId>
<scope>test</scope>
-=======
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
->>>>>>> BRANCH (e8637d [NO ISSUE][MISC] Update dependencies)
</dependency>
</dependencies>
</project>
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index 430c16b..2044fe2 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -258,11 +258,8 @@
<aliasUrl>http://www.apache.org/licenses/LICENSE-2.0</aliasUrl>
<aliasUrl>https://www.apache.org/licenses/LICENSE-2.0.txt</aliasUrl>
<aliasUrl>http://www.apache.org/licenses/LICENSE-2.0.html</aliasUrl>
-<<<<<<< HEAD (570140 [ASTERIXDB-2949][RUN][FUN] SUBSTR function produces malforme)
- <aliasUrl>https://aws.amazon.com/apache2.0</aliasUrl>
-=======
<aliasUrl>https://www.apache.org/licenses/LICENSE-2.0.html</aliasUrl>
->>>>>>> BRANCH (e8637d [NO ISSUE][MISC] Update dependencies)
+ <aliasUrl>https://aws.amazon.com/apache2.0</aliasUrl>
</aliasUrls>
<metric>1</metric>
</license>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index b352dbb..7ec00ad 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -299,12 +299,8 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
-<<<<<<< HEAD (570140 [ASTERIXDB-2949][RUN][FUN] SUBSTR function produces malforme)
- <version>3.6.3</version>
-=======
<version>3.8.3</version>
->>>>>>> BRANCH (e8637d [NO ISSUE][MISC] Update dependencies)
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
@@ -326,26 +322,6 @@
<version>${log4j.version}</version>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>3.10.0</version>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito2</artifactId>
- <version>2.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>2.0.9</version>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-core</artifactId>
- <version>2.0.9</version>
- </dependency>
- <dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>${snappy.version}</version>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14343
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-02ea049d7a
Gerrit-Change-Id: I25a448cca69e3a90e2ce83a0b64dd253c9ad92f5
Gerrit-Change-Number: 14343
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-MessageType: newchange
Change in asterixdb[stabilization-02ea049d7a]: Merge branch 'gerrit/stabilization-5949a1cb71'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Michael Blow <mb...@apache.org>:
Michael Blow has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14343 )
Change subject: Merge branch 'gerrit/stabilization-5949a1cb71'
......................................................................
Patch Set 2: Verified+1 Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14343
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-02ea049d7a
Gerrit-Change-Id: I25a448cca69e3a90e2ce83a0b64dd253c9ad92f5
Gerrit-Change-Number: 14343
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-Comment-Date: Sat, 04 Dec 2021 16:02:48 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in asterixdb[stabilization-02ea049d7a]: Merge branch 'gerrit/stabilization-5949a1cb71'
Posted by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu>.
From Jenkins <je...@fulliautomatix.ics.uci.edu>:
Jenkins has posted comments on this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14343 )
Change subject: Merge branch 'gerrit/stabilization-5949a1cb71'
......................................................................
Patch Set 2: Integration-Tests-1
Integration Tests Failed
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/12789/ : UNSTABLE
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14343
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: stabilization-02ea049d7a
Gerrit-Change-Id: I25a448cca69e3a90e2ce83a0b64dd253c9ad92f5
Gerrit-Change-Number: 14343
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Comment-Date: Sat, 04 Dec 2021 12:44:31 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment