>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19176 )
Change subject: Merge branch 'gerrit/7.1.x' into 'gerrit/neo'
......................................................................
Merge branch 'gerrit/7.1.x' into 'gerrit/neo'
Ext-ref: MB-64482
Change-Id: Id4a88a4302cefe4df693e7cce8f29995402d60f7
---
M
asterixdb/src/main/licenses/content/raw.githubusercontent.com_Azure_azure-sdk-for-java_refs_tags_azure-identity_1.13.3_NOTICE.txt
M
asterixdb/src/main/licenses/content/raw.githubusercontent.com_AzureAD_microsoft-authentication-library-for-java_refs_tags_v1.17.1_LICENSE.txt
M asterixdb/pom.xml
D
asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.101.Final_NOTICE.txt
M asterixdb/src/main/appended-resources/supplemental-models.xml
M hyracks-fullstack/pom.xml
7 files changed, 26 insertions(+), 401 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/76/19176/1
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index bfa8b7b..204debe 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 (a604a5 [NO ISSUE][TEST] Remove invalid JVM args from tests)
<algebricks.version>0.3.8.2-SNAPSHOT</algebricks.version>
<hyracks.version>0.3.8.2-SNAPSHOT</hyracks.version>
- <hadoop.version>3.3.6</hadoop.version>
-=======
- <algebricks.version>0.3.8-SNAPSHOT</algebricks.version>
- <hyracks.version>0.3.8-SNAPSHOT</hyracks.version>
<hadoop.version>3.4.1</hadoop.version>
->>>>>>> BRANCH (c831a8 [NO ISSUE][HYR][*DB] Update dependencies to address
CVEs)
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.19.0</log4j.version>
<awsjavasdk.version>2.29.27</awsjavasdk.version>
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml
b/asterixdb/src/main/appended-resources/supplemental-models.xml
index 78f08dc..61c9ac4 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -162,15 +162,9 @@
<artifactId>netty-transport</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-<<<<<<< HEAD (a604a5 [NO ISSUE][TEST] Remove invalid JVM args from tests)
-
<license.ignoreMissingEmbeddedLicense>4.1.101.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.101.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.101.Final</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>4.1.115.Final</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>4.1.115.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>4.1.115.Final</license.ignoreNoticeOverride>
->>>>>>> BRANCH (c831a8 [NO ISSUE][HYR][*DB] Update dependencies to address
CVEs)
</properties>
</project>
</supplement>
@@ -180,11 +174,6 @@
<artifactId>netty-transport-classes-epoll</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-<<<<<<< HEAD (a604a5 [NO ISSUE][TEST] Remove invalid JVM args from tests)
-
<license.ignoreMissingEmbeddedLicense>4.1.101.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.101.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.101.Final</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>4.1.115.Final</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>4.1.115.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>4.1.115.Final</license.ignoreNoticeOverride>
@@ -200,7 +189,6 @@
<license.ignoreMissingEmbeddedLicense>4.1.115.Final</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>4.1.115.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>4.1.115.Final</license.ignoreNoticeOverride>
->>>>>>> BRANCH (c831a8 [NO ISSUE][HYR][*DB] Update dependencies to address
CVEs)
</properties>
</project>
</supplement>
@@ -210,15 +198,9 @@
<artifactId>netty-transport-native-unix-common</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-<<<<<<< HEAD (a604a5 [NO ISSUE][TEST] Remove invalid JVM args from tests)
-
<license.ignoreMissingEmbeddedLicense>4.1.101.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.101.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.101.Final</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>4.1.115.Final</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>4.1.115.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>4.1.115.Final</license.ignoreNoticeOverride>
->>>>>>> BRANCH (c831a8 [NO ISSUE][HYR][*DB] Update dependencies to address
CVEs)
</properties>
</project>
</supplement>
@@ -228,15 +210,9 @@
<artifactId>netty-codec</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-<<<<<<< HEAD (a604a5 [NO ISSUE][TEST] Remove invalid JVM args from tests)
-
<license.ignoreMissingEmbeddedLicense>4.1.101.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.101.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.101.Final</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>4.1.115.Final</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>4.1.115.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>4.1.115.Final</license.ignoreNoticeOverride>
->>>>>>> BRANCH (c831a8 [NO ISSUE][HYR][*DB] Update dependencies to address
CVEs)
</properties>
</project>
</supplement>
@@ -246,15 +222,9 @@
<artifactId>netty-codec-dns</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-<<<<<<< HEAD (a604a5 [NO ISSUE][TEST] Remove invalid JVM args from tests)
-
<license.ignoreMissingEmbeddedLicense>4.1.101.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.101.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.101.Final</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>4.1.115.Final</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>4.1.115.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>4.1.115.Final</license.ignoreNoticeOverride>
->>>>>>> BRANCH (c831a8 [NO ISSUE][HYR][*DB] Update dependencies to address
CVEs)
</properties>
</project>
</supplement>
@@ -264,15 +234,9 @@
<artifactId>netty-codec-http2</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-<<<<<<< HEAD (a604a5 [NO ISSUE][TEST] Remove invalid JVM args from tests)
-
<license.ignoreMissingEmbeddedLicense>4.1.101.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.101.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.101.Final</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>4.1.115.Final</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>4.1.115.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>4.1.115.Final</license.ignoreNoticeOverride>
->>>>>>> BRANCH (c831a8 [NO ISSUE][HYR][*DB] Update dependencies to address
CVEs)
</properties>
</project>
</supplement>
@@ -282,15 +246,9 @@
<artifactId>netty-codec-socks</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-<<<<<<< HEAD (a604a5 [NO ISSUE][TEST] Remove invalid JVM args from tests)
-
<license.ignoreMissingEmbeddedLicense>4.1.101.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.101.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.101.Final</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>4.1.115.Final</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>4.1.115.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>4.1.115.Final</license.ignoreNoticeOverride>
->>>>>>> BRANCH (c831a8 [NO ISSUE][HYR][*DB] Update dependencies to address
CVEs)
</properties>
</project>
</supplement>
@@ -300,15 +258,9 @@
<artifactId>netty-handler</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-<<<<<<< HEAD (a604a5 [NO ISSUE][TEST] Remove invalid JVM args from tests)
-
<license.ignoreMissingEmbeddedLicense>4.1.101.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.101.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.101.Final</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>4.1.115.Final</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>4.1.115.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>4.1.115.Final</license.ignoreNoticeOverride>
->>>>>>> BRANCH (c831a8 [NO ISSUE][HYR][*DB] Update dependencies to address
CVEs)
</properties>
</project>
</supplement>
@@ -318,15 +270,9 @@
<artifactId>netty-handler-proxy</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-<<<<<<< HEAD (a604a5 [NO ISSUE][TEST] Remove invalid JVM args from tests)
-
<license.ignoreMissingEmbeddedLicense>4.1.101.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.101.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.101.Final</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>4.1.115.Final</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>4.1.115.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>4.1.115.Final</license.ignoreNoticeOverride>
->>>>>>> BRANCH (c831a8 [NO ISSUE][HYR][*DB] Update dependencies to address
CVEs)
</properties>
</project>
</supplement>
@@ -336,15 +282,9 @@
<artifactId>netty-buffer</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-<<<<<<< HEAD (a604a5 [NO ISSUE][TEST] Remove invalid JVM args from tests)
-
<license.ignoreMissingEmbeddedLicense>4.1.101.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.101.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.101.Final</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>4.1.115.Final</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>4.1.115.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>4.1.115.Final</license.ignoreNoticeOverride>
->>>>>>> BRANCH (c831a8 [NO ISSUE][HYR][*DB] Update dependencies to address
CVEs)
</properties>
</project>
</supplement>
@@ -354,15 +294,9 @@
<artifactId>netty-common</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-<<<<<<< HEAD (a604a5 [NO ISSUE][TEST] Remove invalid JVM args from tests)
-
<license.ignoreMissingEmbeddedLicense>4.1.101.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.101.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.101.Final</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>4.1.115.Final</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>4.1.115.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>4.1.115.Final</license.ignoreNoticeOverride>
->>>>>>> BRANCH (c831a8 [NO ISSUE][HYR][*DB] Update dependencies to address
CVEs)
</properties>
</project>
</supplement>
@@ -372,15 +306,9 @@
<artifactId>netty-codec-http</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-<<<<<<< HEAD (a604a5 [NO ISSUE][TEST] Remove invalid JVM args from tests)
-
<license.ignoreMissingEmbeddedLicense>4.1.101.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.101.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.101.Final</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>4.1.115.Final</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>4.1.115.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>4.1.115.Final</license.ignoreNoticeOverride>
->>>>>>> BRANCH (c831a8 [NO ISSUE][HYR][*DB] Update dependencies to address
CVEs)
</properties>
</project>
</supplement>
@@ -390,15 +318,9 @@
<artifactId>netty-resolver</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-<<<<<<< HEAD (a604a5 [NO ISSUE][TEST] Remove invalid JVM args from tests)
-
<license.ignoreMissingEmbeddedLicense>4.1.101.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.101.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.101.Final</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>4.1.115.Final</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>4.1.115.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>4.1.115.Final</license.ignoreNoticeOverride>
->>>>>>> BRANCH (c831a8 [NO ISSUE][HYR][*DB] Update dependencies to address
CVEs)
</properties>
</project>
</supplement>
@@ -408,15 +330,9 @@
<artifactId>netty-resolver-dns</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-<<<<<<< HEAD (a604a5 [NO ISSUE][TEST] Remove invalid JVM args from tests)
-
<license.ignoreMissingEmbeddedLicense>4.1.101.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.101.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.101.Final</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>4.1.115.Final</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>4.1.115.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>4.1.115.Final</license.ignoreNoticeOverride>
->>>>>>> BRANCH (c831a8 [NO ISSUE][HYR][*DB] Update dependencies to address
CVEs)
</properties>
</project>
</supplement>
@@ -426,15 +342,9 @@
<artifactId>netty-transport-native-unix-common</artifactId>
<properties>
<!-- netty is ALv2, and does not contain any embedded LICENSE or
NOTICE file -->
-<<<<<<< HEAD (a604a5 [NO ISSUE][TEST] Remove invalid JVM args from tests)
-
<license.ignoreMissingEmbeddedLicense>4.1.101.Final</license.ignoreMissingEmbeddedLicense>
-
<license.ignoreMissingEmbeddedNotice>4.1.101.Final</license.ignoreMissingEmbeddedNotice>
-
<license.ignoreNoticeOverride>4.1.101.Final</license.ignoreNoticeOverride>
-=======
<license.ignoreMissingEmbeddedLicense>4.1.115.Final</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>4.1.115.Final</license.ignoreMissingEmbeddedNotice>
<license.ignoreNoticeOverride>4.1.115.Final</license.ignoreNoticeOverride>
->>>>>>> BRANCH (c831a8 [NO ISSUE][HYR][*DB] Update dependencies to address
CVEs)
</properties>
</project>
</supplement>
@@ -757,6 +667,7 @@
<license.ignoreMissingEmbeddedLicense>12.25.1</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>12.25.1</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>12.25.1</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>12.25.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -784,6 +695,7 @@
<license.ignoreMissingEmbeddedLicense>12.24.1</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>12.24.1</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>12.24.1</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>12.24.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -796,6 +708,7 @@
<license.ignoreMissingEmbeddedLicense>12.10.1</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>12.10.1</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>12.10.1</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>12.10.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -808,6 +721,7 @@
<license.ignoreMissingEmbeddedLicense>1.45.1</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.45.1</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>1.45.1</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>1.45.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -820,6 +734,7 @@
<license.ignoreMissingEmbeddedLicense>1.13.11</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.13.11</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>1.13.11</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>1.13.11</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -832,10 +747,7 @@
<license.ignoreMissingEmbeddedLicense>1.3.0</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>1.3.0</license.ignoreMissingEmbeddedNotice>
<license.ignoreLicenseOverride>1.3.0</license.ignoreLicenseOverride>
-<<<<<<< HEAD (a604a5 [NO ISSUE][TEST] Remove invalid JVM args from tests)
-=======
<license.ignoreNoticeOverride>1.3.0</license.ignoreNoticeOverride>
->>>>>>> BRANCH (c831a8 [NO ISSUE][HYR][*DB] Update dependencies to address
CVEs)
</properties>
</project>
</supplement>
diff --git
a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_AzureAD_microsoft-authentication-library-for-java_refs_tags_v1.17.1_LICENSE.txt
b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_AzureAD_microsoft-authentication-library-for-java_refs_tags_v1.17.1_LICENSE.txt
index 13873c2..d1ca00f 100644
---
a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_AzureAD_microsoft-authentication-library-for-java_refs_tags_v1.17.1_LICENSE.txt
+++
b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_AzureAD_microsoft-authentication-library-for-java_refs_tags_v1.17.1_LICENSE.txt
@@ -1,4 +1,3 @@
-<<<<<<< HEAD (a604a5 [NO ISSUE][TEST] Remove invalid JVM args from tests)
MIT License
Copyright (c) Microsoft Corporation. All rights reserved.
@@ -19,27 +18,4 @@
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE
- SOFTWARE
-=======
-MIT License
-
-Copyright (c) Microsoft Corporation. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE
->>>>>>> BRANCH (c831a8 [NO ISSUE][HYR][*DB] Update dependencies to address
CVEs)
+ SOFTWARE
\ No newline at end of file
diff --git
a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_Azure_azure-sdk-for-java_refs_tags_azure-identity_1.13.3_NOTICE.txt
b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_Azure_azure-sdk-for-java_refs_tags_azure-identity_1.13.3_NOTICE.txt
index cfd122d..28e74db 100644
---
a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_Azure_azure-sdk-for-java_refs_tags_azure-identity_1.13.3_NOTICE.txt
+++
b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_Azure_azure-sdk-for-java_refs_tags_azure-identity_1.13.3_NOTICE.txt
@@ -626,8 +626,4 @@
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
-<<<<<<< HEAD (a604a5 [NO ISSUE][TEST] Remove invalid JVM args from tests)
- limitations under the License.
-=======
- limitations under the License.
->>>>>>> BRANCH (c831a8 [NO ISSUE][HYR][*DB] Update dependencies to address
CVEs)
+ limitations under the License.
\ No newline at end of file
diff --git
a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.101.Final_NOTICE.txt
b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.101.Final_NOTICE.txt
deleted file mode 100644
index ad62b68..0000000
---
a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.101.Final_NOTICE.txt
+++ /dev/null
@@ -1,264 +0,0 @@
-
- The Netty Project
- =================
-
-Please visit the Netty web site for more information:
-
- * https://netty.io/
-
-Copyright 2014 The Netty Project
-
-The Netty Project 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:
-
- https://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.
-
-Also, please refer to each LICENSE.<component>.txt file, which is located in
-the 'license' directory of the distribution file, for the license terms of the
-components that this product depends on.
-
--------------------------------------------------------------------------------
-This product contains the extensions to Java Collections Framework which has
-been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:
-
- * LICENSE:
- * license/LICENSE.jsr166y.txt (Public Domain)
- * HOMEPAGE:
- * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/
- *
http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/
-
-This product contains a modified version of Robert Harder's Public Domain
-Base64 Encoder and Decoder, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.base64.txt (Public Domain)
- * HOMEPAGE:
- * http://iharder.sourceforge.net/current/java/base64/
-
-This product contains a modified portion of 'Webbit', an event based
-WebSocket and HTTP server, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.webbit.txt (BSD License)
- * HOMEPAGE:
- * https://github.com/joewalnes/webbit
-
-This product contains a modified portion of 'SLF4J', a simple logging
-facade for Java, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.slf4j.txt (MIT License)
- * HOMEPAGE:
- * https://www.slf4j.org/
-
-This product contains a modified portion of 'Apache Harmony', an open source
-Java SE, which can be obtained at:
-
- * NOTICE:
- * license/NOTICE.harmony.txt
- * LICENSE:
- * license/LICENSE.harmony.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://archive.apache.org/dist/harmony/
-
-This product contains a modified portion of 'jbzip2', a Java bzip2 compression
-and decompression library written by Matthew J. Francis. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.jbzip2.txt (MIT License)
- * HOMEPAGE:
- * https://code.google.com/p/jbzip2/
-
-This product contains a modified portion of 'libdivsufsort', a C API library
to construct
-the suffix array and the Burrows-Wheeler transformed string for any input
string of
-a constant-size alphabet written by Yuta Mori. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.libdivsufsort.txt (MIT License)
- * HOMEPAGE:
- * https://github.com/y-256/libdivsufsort
-
-This product contains a modified portion of Nitsan Wakart's 'JCTools', Java
Concurrency Tools for the JVM,
- which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.jctools.txt (ASL2 License)
- * HOMEPAGE:
- * https://github.com/JCTools/JCTools
-
-This product optionally depends on 'JZlib', a re-implementation of zlib in
-pure Java, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.jzlib.txt (BSD style License)
- * HOMEPAGE:
- * http://www.jcraft.com/jzlib/
-
-This product optionally depends on 'Compress-LZF', a Java library for encoding
and
-decoding data in LZF format, written by Tatu Saloranta. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.compress-lzf.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/ning/compress
-
-This product optionally depends on 'lz4', a LZ4 Java compression
-and decompression library written by Adrien Grand. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.lz4.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/jpountz/lz4-java
-
-This product optionally depends on 'lzma-java', a LZMA Java compression
-and decompression library, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.lzma-java.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/jponge/lzma-java
-
-This product optionally depends on 'zstd-jni', a zstd-jni Java compression
-and decompression library, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.zstd-jni.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/luben/zstd-jni
-
-This product contains a modified portion of 'jfastlz', a Java port of FastLZ
compression
-and decompression library written by William Kinney. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.jfastlz.txt (MIT License)
- * HOMEPAGE:
- * https://code.google.com/p/jfastlz/
-
-This product contains a modified portion of and optionally depends on
'Protocol Buffers', Google's data
-interchange format, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.protobuf.txt (New BSD License)
- * HOMEPAGE:
- * https://github.com/google/protobuf
-
-This product optionally depends on 'Bouncy Castle Crypto APIs' to generate
-a temporary self-signed X.509 certificate when the JVM does not provide the
-equivalent functionality. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.bouncycastle.txt (MIT License)
- * HOMEPAGE:
- * https://www.bouncycastle.org/
-
-This product optionally depends on 'Snappy', a compression library produced
-by Google Inc, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.snappy.txt (New BSD License)
- * HOMEPAGE:
- * https://github.com/google/snappy
-
-This product optionally depends on 'JBoss Marshalling', an alternative Java
-serialization API, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.jboss-marshalling.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/jboss-remoting/jboss-marshalling
-
-This product optionally depends on 'Caliper', Google's micro-
-benchmarking framework, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.caliper.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/google/caliper
-
-This product optionally depends on 'Apache Commons Logging', a logging
-framework, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.commons-logging.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://commons.apache.org/logging/
-
-This product optionally depends on 'Apache Log4J', a logging framework, which
-can be obtained at:
-
- * LICENSE:
- * license/LICENSE.log4j.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://logging.apache.org/log4j/
-
-This product optionally depends on 'Aalto XML', an ultra-high performance
-non-blocking XML processor, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.aalto-xml.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://wiki.fasterxml.com/AaltoHome
-
-This product contains a modified version of 'HPACK', a Java implementation of
-the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.hpack.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/twitter/hpack
-
-This product contains a modified version of 'HPACK', a Java implementation of
-the HTTP/2 HPACK algorithm written by Cory Benfield. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.hyper-hpack.txt (MIT License)
- * HOMEPAGE:
- * https://github.com/python-hyper/hpack/
-
-This product contains a modified version of 'HPACK', a Java implementation of
-the HTTP/2 HPACK algorithm written by Tatsuhiro Tsujikawa. It can be obtained
at:
-
- * LICENSE:
- * license/LICENSE.nghttp2-hpack.txt (MIT License)
- * HOMEPAGE:
- * https://github.com/nghttp2/nghttp2/
-
-This product contains a modified portion of 'Apache Commons Lang', a Java
library
-provides utilities for the java.lang API, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.commons-lang.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://commons.apache.org/proper/commons-lang/
-
-
-This product contains the Maven wrapper scripts from 'Maven Wrapper', that
provides an easy way to ensure a user has everything necessary to run the Maven
build.
-
- * LICENSE:
- * license/LICENSE.mvn-wrapper.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/takari/maven-wrapper
-
-This product contains the dnsinfo.h header file, that provides a way to
retrieve the system DNS configuration on MacOS.
-This private header is also used by Apple's open source
- mDNSResponder (https://opensource.apple.com/tarballs/mDNSResponder/).
-
- * LICENSE:
- * license/LICENSE.dnsinfo.txt (Apple Public Source License 2.0)
- * HOMEPAGE:
- *
https://www.opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h
-
-This product optionally depends on 'Brotli4j', Brotli compression and
-decompression for Java., which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.brotli4j.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/hyperxpro/Brotli4j
\ No newline at end of file
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index b8232c0..45e97c4 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -76,11 +76,7 @@
<snappy.version>1.1.10.5</snappy.version>
<jackson.version>2.14.3</jackson.version>
<jackson-databind.version>${jackson.version}</jackson-databind.version>
-<<<<<<< HEAD (a604a5 [NO ISSUE][TEST] Remove invalid JVM args from tests)
- <netty.version>4.1.101.Final</netty.version>
-=======
<netty.version>4.1.115.Final</netty.version>
->>>>>>> BRANCH (c831a8 [NO ISSUE][HYR][*DB] Update dependencies to address
CVEs)
<implementation.title>Apache Hyracks and Algebricks -
${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
@@ -141,11 +137,12 @@
</dependency>
<dependency>
<groupId>io.netty</groupId>
-<<<<<<< HEAD (a604a5 [NO ISSUE][TEST] Remove invalid JVM args from tests)
- <artifactId>netty-resolver</artifactId>
-=======
<artifactId>netty-transport-native-epoll</artifactId>
->>>>>>> BRANCH (c831a8 [NO ISSUE][HYR][*DB] Update dependencies to address
CVEs)
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19176
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: Id4a88a4302cefe4df693e7cce8f29995402d60f7
Gerrit-Change-Number: 19176
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
