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/21 02:46:57 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/+/14886 )
Change subject: Merge branch 'gerrit/stabilization-5949a1cb71'
......................................................................
Merge branch 'gerrit/stabilization-5949a1cb71'
Change-Id: I6d9ed728c40d740cdecde440cadce441ce515798
---
M asterixdb/asterix-spidersilk/pom.xml
M asterixdb/pom.xml
M asterixdb/src/main/appended-resources/supplemental-models.xml
M hyracks-fullstack/pom.xml
5 files changed, 2 insertions(+), 104 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/86/14886/1
diff --git a/asterixdb/asterix-spidersilk/pom.xml b/asterixdb/asterix-spidersilk/pom.xml
index 43c6694..c58ee4f 100644
--- a/asterixdb/asterix-spidersilk/pom.xml
+++ b/asterixdb/asterix-spidersilk/pom.xml
@@ -35,92 +35,4 @@
<comments>A business-friendly OSS license</comments>
</license>
</licenses>
-<<<<<<< HEAD (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
-=======
-
- <properties>
- <root.dir>${basedir}/..</root.dir>
- </properties>
-
- <repositories>
- <repository>
- <id>snapshots-repo</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- <releases><enabled>false</enabled></releases>
- <snapshots><enabled>true</enabled></snapshots>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>me.arminb.spidersilk</groupId>
- <artifactId>spidersilk</artifactId>
- <version>0.4.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.33</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.2.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-app</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-app</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-server</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- </dependencies>
-
- <!-- While these dependencies are declared and being used, the maven dependency plugin detects them as declared and
- not used. To make this right, it is needed to force these dependencies as used -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <usedDependencies>
- <usedDependency>ch.qos.logback:logback-classic</usedDependency>
- <usedDependency>org.apache.asterix:asterix-app</usedDependency>
- <usedDependency>org.apache.asterix:asterix-server</usedDependency>
- </usedDependencies>
- </configuration>
- </plugin>
- </plugins>
- </build>
->>>>>>> BRANCH (55e198 [NO ISSUE][MISC] Update dependencies)
</project>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index f0639aa..f5bfc60 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -82,12 +82,8 @@
<hyracks.version>0.3.5-SNAPSHOT</hyracks.version>
<hadoop.version>2.8.5</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
-<<<<<<< HEAD (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
- <log4j.version>2.14.1</log4j.version>
- <awsjavasdk.version>2.10.83</awsjavasdk.version>
-=======
<log4j.version>2.17.1</log4j.version>
->>>>>>> BRANCH (55e198 [NO ISSUE][MISC] Update dependencies)
+ <awsjavasdk.version>2.10.83</awsjavasdk.version>
<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml
index 0ea1d2b..4799310 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -364,11 +364,6 @@
<properties>
<!-- snappy-java is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
<!-- license override not needed, ALv2 is specified in its pom.xml -->
-<<<<<<< HEAD (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
- <!-- see https://github.com/xerial/snappy-java/blob/1.1.7.1/LICENSE -->
- <license.ignoreMissingEmbeddedLicense>1.1.7.1,1.1.8.4</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.1.7.1,1.1.8.4</license.ignoreMissingEmbeddedNotice>
-=======
<!-- see https://raw.githubusercontent.com/xerial/snappy-java/1.1.8.4/LICENSE -->
<license.ignoreMissingEmbeddedLicense>1.1.8.4</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.1.8.4</license.ignoreMissingEmbeddedNotice>
@@ -386,7 +381,6 @@
<license.ignoreMissingEmbeddedNotice>2.0.46.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>2.0.46.Final</license.ignoreLicenseOverride>
<license.ignoreNoticeOverride>2.0.46.Final</license.ignoreNoticeOverride>
->>>>>>> BRANCH (55e198 [NO ISSUE][MISC] Update dependencies)
</properties>
</project>
</supplement>
@@ -617,4 +611,5 @@
</project>
</supplement>
+
</supplementalDataModels>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index f0cf983..86fe2d3 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -299,13 +299,8 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
-<<<<<<< HEAD (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
- <version>3.8.3</version>
- </dependency>
-=======
<version>3.8.4</version>
</dependency>
->>>>>>> BRANCH (55e198 [NO ISSUE][MISC] Update dependencies)
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14886
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: I6d9ed728c40d740cdecde440cadce441ce515798
Gerrit-Change-Number: 14886
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/+/14886 )
Change subject: Merge branch 'gerrit/stabilization-5949a1cb71'
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14886
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: I6d9ed728c40d740cdecde440cadce441ce515798
Gerrit-Change-Number: 14886
Gerrit-PatchSet: 1
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: Sun, 23 Jan 2022 13:39:27 +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/+/14886 )
Change subject: Merge branch 'gerrit/stabilization-5949a1cb71'
......................................................................
Merge branch 'gerrit/stabilization-5949a1cb71'
Change-Id: I6d9ed728c40d740cdecde440cadce441ce515798
---
M asterixdb/asterix-spidersilk/pom.xml
M asterixdb/pom.xml
M asterixdb/src/main/appended-resources/supplemental-models.xml
M hyracks-fullstack/pom.xml
5 files changed, 2 insertions(+), 104 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/86/14886/1
diff --git a/asterixdb/asterix-spidersilk/pom.xml b/asterixdb/asterix-spidersilk/pom.xml
index 43c6694..c58ee4f 100644
--- a/asterixdb/asterix-spidersilk/pom.xml
+++ b/asterixdb/asterix-spidersilk/pom.xml
@@ -35,92 +35,4 @@
<comments>A business-friendly OSS license</comments>
</license>
</licenses>
-<<<<<<< HEAD (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
-=======
-
- <properties>
- <root.dir>${basedir}/..</root.dir>
- </properties>
-
- <repositories>
- <repository>
- <id>snapshots-repo</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- <releases><enabled>false</enabled></releases>
- <snapshots><enabled>true</enabled></snapshots>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>me.arminb.spidersilk</groupId>
- <artifactId>spidersilk</artifactId>
- <version>0.4.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.33</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.2.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-app</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-test-framework</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-app</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.asterix</groupId>
- <artifactId>asterix-server</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- </dependencies>
-
- <!-- While these dependencies are declared and being used, the maven dependency plugin detects them as declared and
- not used. To make this right, it is needed to force these dependencies as used -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <usedDependencies>
- <usedDependency>ch.qos.logback:logback-classic</usedDependency>
- <usedDependency>org.apache.asterix:asterix-app</usedDependency>
- <usedDependency>org.apache.asterix:asterix-server</usedDependency>
- </usedDependencies>
- </configuration>
- </plugin>
- </plugins>
- </build>
->>>>>>> BRANCH (55e198 [NO ISSUE][MISC] Update dependencies)
</project>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index f0639aa..f5bfc60 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -82,12 +82,8 @@
<hyracks.version>0.3.5-SNAPSHOT</hyracks.version>
<hadoop.version>2.8.5</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
-<<<<<<< HEAD (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
- <log4j.version>2.14.1</log4j.version>
- <awsjavasdk.version>2.10.83</awsjavasdk.version>
-=======
<log4j.version>2.17.1</log4j.version>
->>>>>>> BRANCH (55e198 [NO ISSUE][MISC] Update dependencies)
+ <awsjavasdk.version>2.10.83</awsjavasdk.version>
<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml
index 0ea1d2b..4799310 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -364,11 +364,6 @@
<properties>
<!-- snappy-java is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
<!-- license override not needed, ALv2 is specified in its pom.xml -->
-<<<<<<< HEAD (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
- <!-- see https://github.com/xerial/snappy-java/blob/1.1.7.1/LICENSE -->
- <license.ignoreMissingEmbeddedLicense>1.1.7.1,1.1.8.4</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.1.7.1,1.1.8.4</license.ignoreMissingEmbeddedNotice>
-=======
<!-- see https://raw.githubusercontent.com/xerial/snappy-java/1.1.8.4/LICENSE -->
<license.ignoreMissingEmbeddedLicense>1.1.8.4</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.1.8.4</license.ignoreMissingEmbeddedNotice>
@@ -386,7 +381,6 @@
<license.ignoreMissingEmbeddedNotice>2.0.46.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>2.0.46.Final</license.ignoreLicenseOverride>
<license.ignoreNoticeOverride>2.0.46.Final</license.ignoreNoticeOverride>
->>>>>>> BRANCH (55e198 [NO ISSUE][MISC] Update dependencies)
</properties>
</project>
</supplement>
@@ -617,4 +611,5 @@
</project>
</supplement>
+
</supplementalDataModels>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index f0cf983..86fe2d3 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -299,13 +299,8 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
-<<<<<<< HEAD (8363dc Merge branch 'gerrit/stabilization-5949a1cb71')
- <version>3.8.3</version>
- </dependency>
-=======
<version>3.8.4</version>
</dependency>
->>>>>>> BRANCH (55e198 [NO ISSUE][MISC] Update dependencies)
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14886
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: I6d9ed728c40d740cdecde440cadce441ce515798
Gerrit-Change-Number: 14886
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/+/14886 )
Change subject: Merge branch 'gerrit/stabilization-5949a1cb71'
......................................................................
Patch Set 1: Integration-Tests+1
Integration Tests Successful
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/12896/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14886
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: I6d9ed728c40d740cdecde440cadce441ce515798
Gerrit-Change-Number: 14886
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Comment-Date: Fri, 21 Jan 2022 04:04:28 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment