>From Michael Blow <[email protected]>: Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17266 )
Change subject: [NO ISSUE][MISC] Update dependencies ...................................................................... [NO ISSUE][MISC] Update dependencies - org.apache.commons:commons-text .................... 1.9 -> 1.10.0 - com.fasterxml.jackson.core:jackson-annotations .. 2.13.2 -> 2.13.4 - com.fasterxml.jackson.core:jackson-core ......... 2.13.2 -> 2.13.4 - com.fasterxml.jackson.core:jackson-databind . 2.13.2.2 -> 2.13.4.2 - io.netty:netty-buffer ............... 4.1.73.Final -> 4.1.84.Final - io.netty:netty-codec ................ 4.1.73.Final -> 4.1.84.Final - io.netty:netty-codec-http ........... 4.1.73.Final -> 4.1.84.Final - io.netty:netty-common ............... 4.1.73.Final -> 4.1.84.Final - io.netty:netty-handler .............. 4.1.73.Final -> 4.1.84.Final - io.netty:netty-resolver ............. 4.1.73.Final -> 4.1.84.Final - io.netty:netty-transport ............ 4.1.73.Final -> 4.1.84.Final - io.netty:netty-tcnative-boringssl-static ......................... ..................................... 2.0.47.Final -> 2.0.54.Final - io.netty:netty-tcnative-classes ..... 2.0.47.Final -> 2.0.54.Final Change-Id: I44de40ec6a36a4c470191630ebb05bcb0d516261 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17266 Tested-by: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Michael Blow <[email protected]> --- M asterixdb/src/main/appended-resources/supplemental-models.xml R asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.84.Final_NOTICE.txt M hyracks-fullstack/pom.xml 3 files changed, 71 insertions(+), 31 deletions(-) Approvals: Michael Blow: Looks good to me, approved Jenkins: Verified; Verified diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml index 43a8d4c..3fdcf8a 100644 --- a/asterixdb/src/main/appended-resources/supplemental-models.xml +++ b/asterixdb/src/main/appended-resources/supplemental-models.xml @@ -160,9 +160,9 @@ <artifactId>netty-transport</artifactId> <properties> <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> - <license.ignoreMissingEmbeddedLicense>4.1.73.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride> + <license.ignoreMissingEmbeddedLicense>4.1.84.Final</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> @@ -172,9 +172,9 @@ <artifactId>netty-codec</artifactId> <properties> <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> - <license.ignoreMissingEmbeddedLicense>4.1.73.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride> + <license.ignoreMissingEmbeddedLicense>4.1.84.Final</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> @@ -184,9 +184,9 @@ <artifactId>netty-handler</artifactId> <properties> <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> - <license.ignoreMissingEmbeddedLicense>4.1.73.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride> + <license.ignoreMissingEmbeddedLicense>4.1.84.Final</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> @@ -196,9 +196,9 @@ <artifactId>netty-buffer</artifactId> <properties> <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> - <license.ignoreMissingEmbeddedLicense>4.1.73.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride> + <license.ignoreMissingEmbeddedLicense>4.1.84.Final</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> @@ -208,9 +208,9 @@ <artifactId>netty-common</artifactId> <properties> <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> - <license.ignoreMissingEmbeddedLicense>4.1.73.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride> + <license.ignoreMissingEmbeddedLicense>4.1.84.Final</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> @@ -220,9 +220,9 @@ <artifactId>netty-codec-http</artifactId> <properties> <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> - <license.ignoreMissingEmbeddedLicense>4.1.73.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride> + <license.ignoreMissingEmbeddedLicense>4.1.84.Final</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> @@ -232,9 +232,21 @@ <artifactId>netty-resolver</artifactId> <properties> <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> - <license.ignoreMissingEmbeddedLicense>4.1.73.Final</license.ignoreMissingEmbeddedLicense> - <license.ignoreMissingEmbeddedNotice>4.1.73.Final</license.ignoreMissingEmbeddedNotice> - <license.ignoreNoticeOverride>4.1.73.Final</license.ignoreNoticeOverride> + <license.ignoreMissingEmbeddedLicense>4.1.84.Final</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride> + </properties> + </project> + </supplement> + <supplement> + <project> + <groupId>io.netty</groupId> + <artifactId>netty-transport-native-unix-common</artifactId> + <properties> + <!-- netty is ALv2, and does not contain any embedded LICENSE or NOTICE file --> + <license.ignoreMissingEmbeddedLicense>4.1.84.Final</license.ignoreMissingEmbeddedLicense> + <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice> + <license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride> </properties> </project> </supplement> @@ -303,7 +315,7 @@ <artifactId>jackson-annotations</artifactId> <properties> <!-- jackson-annotations does not provide an embedded NOTICE file --> - <license.ignoreMissingEmbeddedNotice>2.12.3,2.13.1,2.13.2</license.ignoreMissingEmbeddedNotice> + <license.ignoreMissingEmbeddedNotice>2.12.3,2.13.1,2.13.2,2.13.4</license.ignoreMissingEmbeddedNotice> </properties> </project> </supplement> diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.73.Final_NOTICE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.84.Final_NOTICE.txt similarity index 100% rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.73.Final_NOTICE.txt rename to asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.84.Final_NOTICE.txt diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index c7e8720..6f656b5 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -71,7 +71,7 @@ <jacoco.version>0.7.6.201602180812</jacoco.version> <log4j.version>2.17.1</log4j.version> <snappy.version>1.1.8.4</snappy.version> - <jackson.version>2.13.2</jackson.version> + <jackson.version>2.13.4</jackson.version> <implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title> <implementation.url>https://asterixdb.apache.org/</implementation.url> @@ -83,32 +83,32 @@ <dependency> <groupId>io.netty</groupId> <artifactId>netty-buffer</artifactId> - <version>4.1.73.Final</version> + <version>4.1.84.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-common</artifactId> - <version>4.1.73.Final</version> + <version>4.1.84.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-codec-http</artifactId> - <version>4.1.73.Final</version> + <version>4.1.84.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-transport</artifactId> - <version>4.1.73.Final</version> + <version>4.1.84.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-codec</artifactId> - <version>4.1.73.Final</version> + <version>4.1.84.Final</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-handler</artifactId> - <version>4.1.73.Final</version> + <version>4.1.84.Final</version> </dependency> <dependency> <groupId>junit</groupId> @@ -174,12 +174,12 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-text</artifactId> - <version>1.9</version> + <version>1.10.0</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.13.2.2</version> + <version>2.13.4.2</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17266 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: stabilization-f69489 Gerrit-Change-Id: I44de40ec6a36a4c470191630ebb05bcb0d516261 Gerrit-Change-Number: 17266 Gerrit-PatchSet: 6 Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Murtadha Al Hubail <[email protected]> Gerrit-MessageType: merged
