You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2023/01/27 14:19:30 UTC
[asterixdb] branch master updated (7436ac1aa8 -> 576493d894)
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
from 7436ac1aa8 [ASTERIXDB-3098][COMP] Add cost/card to explain string plan
new 2aa06c577b [NO ISSUE][HYR][MISC] Include flag to skip processing shadowed deps
new 429cf26230 [NO ISSUE][OTH] Log node and node address on negative heartbeat ack
new 91a7e800cf [NO ISSUE] Update dependencies
new 2c076aa73f Merge branch 'gerrit/stabilization-f69489'
new 85a3f577df Merge branch 'gerrit/stabilization-5949a1cb71'
new 23fc48b4e2 Merge branch 'gerrit/mad-hatter'
new 8fbe5ddd49 Merge branch 'gerrit/cheshire-cat'
new fd8cd3051c [NO ISSUE][LIC] Add ability to exclude specific shadowed artifacts
new 6512463b02 Merge branch 'gerrit/stabilization-667a908755'
new 576493d894 Merge branch 'gerrit/neo'
The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
asterixdb/asterix-app/pom.xml | 1 -
asterixdb/asterix-external-data/pom.xml | 1 -
asterixdb/pom.xml | 4 +-
.../appended-resources/supplemental-models.xml | 88 +++++++++++-----------
....com_netty_netty_netty-4.1.87.Final_NOTICE.txt} | 0
.../hyracks-control/hyracks-nc-service/pom.xml | 1 -
.../hyracks/hyracks-dataflow-std/pom.xml | 1 -
.../hyracks-integration-tests/pom.xml | 1 -
.../hyracks/maven/license/GenerateFileMojo.java | 68 +++++++++++------
.../apache/hyracks/maven/license/LicenseMojo.java | 6 ++
.../apache/hyracks/maven/license/ProjectFlag.java | 39 ++++++++--
.../hyracks/test/support/LicensingTestBase.java | 4 +-
hyracks-fullstack/pom.xml | 35 +++++----
13 files changed, 152 insertions(+), 97 deletions(-)
rename asterixdb/src/main/licenses/content/{raw.githubusercontent.com_netty_netty_netty-4.1.84.Final_NOTICE.txt => raw.githubusercontent.com_netty_netty_netty-4.1.87.Final_NOTICE.txt} (100%)
[asterixdb] 02/10: [NO ISSUE][OTH] Log node and node address on negative heartbeat ack
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 429cf2623099454d03cebad3ea6e8b075fe467c5
Author: Murtadha Hubail <mu...@couchbase.com>
AuthorDate: Wed Jan 4 20:14:08 2023 +0300
[NO ISSUE][OTH] Log node and node address on negative heartbeat ack
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- When sending a negative heartbeat ack to an unregistered node,
log the node id as well as its address.
Change-Id: I001b98ef1faa953d92332d36c2d4985b34ed57dd
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17305
Reviewed-by: Ali Alsuliman <al...@gmail.com>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
(cherry picked from commit 2538c159d3e1c67b1c3cab15e626d2d4fcd7b79d)
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17244
Reviewed-by: Murtadha Hubail <mh...@apache.org>
---
.../java/org/apache/hyracks/control/cc/work/NodeHeartbeatWork.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/NodeHeartbeatWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/NodeHeartbeatWork.java
index b772ef93da..6fa6224f3d 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/NodeHeartbeatWork.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/NodeHeartbeatWork.java
@@ -28,9 +28,12 @@ import org.apache.hyracks.control.cc.cluster.INodeManager;
import org.apache.hyracks.control.common.heartbeat.HeartbeatData;
import org.apache.hyracks.control.common.ipc.NodeControllerRemoteProxy;
import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class NodeHeartbeatWork extends AbstractHeartbeatWork {
+ private static final Logger LOGGER = LogManager.getLogger();
private final InetSocketAddress ncAddress;
public NodeHeartbeatWork(ClusterControllerService ccs, String nodeId, HeartbeatData hbData,
@@ -47,6 +50,8 @@ public class NodeHeartbeatWork extends AbstractHeartbeatWork {
ncState.getNodeController().heartbeatAck(ccs.getCcId(), null);
} else {
// unregistered nc- let him know
+ LOGGER.info("received a heartbeat from unregistered node {}; sending negative ack to node address {}",
+ nodeId, ncAddress);
NodeControllerRemoteProxy nc =
new NodeControllerRemoteProxy(ccs.getCcId(), ccs.getClusterIPC().getReconnectingHandle(ncAddress));
nc.heartbeatAck(ccs.getCcId(), HyracksDataException.create(ErrorCode.NO_SUCH_NODE, nodeId));
[asterixdb] 04/10: Merge branch 'gerrit/stabilization-f69489'
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 2c076aa73f4ae4179b9afeec3b8aab75d5b4dac7
Merge: a0ae04de29 91a7e800cf
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Thu Jan 12 22:08:05 2023 -0500
Merge branch 'gerrit/stabilization-f69489'
Change-Id: I70d92fe4aca5d667d0c77ea602949c961830b2bd
asterixdb/asterix-app/pom.xml | 1 -
asterixdb/asterix-external-data/pom.xml | 1 -
asterixdb/pom.xml | 4 +-
.../appended-resources/supplemental-models.xml | 58 +++++++++++-----------
....com_netty_netty_netty-4.1.87.Final_NOTICE.txt} | 0
.../hyracks-control/hyracks-nc-service/pom.xml | 1 -
.../hyracks/hyracks-dataflow-std/pom.xml | 1 -
.../hyracks-integration-tests/pom.xml | 1 -
hyracks-fullstack/pom.xml | 26 ++++++----
9 files changed, 47 insertions(+), 46 deletions(-)
diff --cc asterixdb/pom.xml
index 8a945928f2,127d77c748..15dc445c92
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -73,15 -71,13 +73,15 @@@
<global.itest.excludes/>
<itest.includes>${global.itest.includes}</itest.includes>
<itest.excludes>${global.itest.excludes}</itest.excludes>
+ <license.stage>compile</license.stage>
+ <resource.stage>process-classes</resource.stage>
<!-- Versions under dependencymanagement or used in many projects via properties -->
- <algebricks.version>0.3.4.2-SNAPSHOT</algebricks.version>
- <hyracks.version>0.3.4.2-SNAPSHOT</hyracks.version>
+ <algebricks.version>0.3.5-SNAPSHOT</algebricks.version>
+ <hyracks.version>0.3.5-SNAPSHOT</hyracks.version>
<hadoop.version>2.8.5</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
- <log4j.version>2.17.1</log4j.version>
+ <log4j.version>2.19.0</log4j.version>
<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
[asterixdb] 03/10: [NO ISSUE] Update dependencies
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 91a7e800cfe46707a6c59a01d6ed92baf54e9672
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Thu Jan 12 18:51:33 2023 -0500
[NO ISSUE] Update dependencies
- com.fasterxml.jackson.core:jackson-annotations .. 2.13.4 -> 2.14.1
- com.fasterxml.jackson.core:jackson-core ......... 2.13.4 -> 2.14.1
- com.fasterxml.jackson.core:jackson-databind ... 2.13.4.2 -> 2.14.1
- com.google.guava:guava .................... 31.0.1-jre -> 31.1-jre
- io.netty:netty-buffer ............... 4.1.84.Final -> 4.1.87.Final
- io.netty:netty-codec ................ 4.1.84.Final -> 4.1.87.Final
- io.netty:netty-codec-http ........... 4.1.84.Final -> 4.1.87.Final
- io.netty:netty-common ............... 4.1.84.Final -> 4.1.87.Final
- io.netty:netty-handler .............. 4.1.84.Final -> 4.1.87.Final
- io.netty:netty-transport ............ 4.1.84.Final -> 4.1.87.Final
- org.apache.commons:commons-compress ................. 1.21 -> 1.22
- org.apache.logging.log4j:log4j-1.2-api .......... 2.17.1 -> 2.19.0
- org.apache.logging.log4j:log4j-api .............. 2.17.1 -> 2.19.0
- org.apache.logging.log4j:log4j-core ............. 2.17.1 -> 2.19.0
- org.apache.logging.log4j:log4j-jcl .............. 2.17.1 -> 2.19.0
- org.apache.logging.log4j:log4j-jul .............. 2.17.1 -> 2.19.0
- org.apache.logging.log4j:log4j-slf4j-impl ....... 2.17.1 -> 2.19.0
- org.apache.logging.log4j:log4j-web .............. 2.17.1 -> 2.19.0
Change-Id: I09d803cf1e756b86f1f6bbd1b05807f908f6d8e1
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17310
Reviewed-by: Michael Blow <mb...@apache.org>
Reviewed-by: Ali Alsuliman <al...@gmail.com>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
---
asterixdb/asterix-app/pom.xml | 1 -
asterixdb/asterix-external-data/pom.xml | 1 -
asterixdb/pom.xml | 4 +-
.../appended-resources/supplemental-models.xml | 58 +++++++++++-----------
....com_netty_netty_netty-4.1.87.Final_NOTICE.txt} | 0
.../hyracks-control/hyracks-nc-service/pom.xml | 1 -
.../hyracks/hyracks-dataflow-std/pom.xml | 1 -
.../hyracks-integration-tests/pom.xml | 1 -
hyracks-fullstack/pom.xml | 26 ++++++----
9 files changed, 47 insertions(+), 46 deletions(-)
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index 8025be9759..2127fd196c 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -453,7 +453,6 @@
<dependency>
<groupId>com.e-movimento.tinytools</groupId>
<artifactId>privilegedaccessor</artifactId>
- <version>1.2.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/asterixdb/asterix-external-data/pom.xml b/asterixdb/asterix-external-data/pom.xml
index 2dad620306..0b629d2a68 100644
--- a/asterixdb/asterix-external-data/pom.xml
+++ b/asterixdb/asterix-external-data/pom.xml
@@ -276,7 +276,6 @@
<dependency>
<groupId>com.e-movimento.tinytools</groupId>
<artifactId>privilegedaccessor</artifactId>
- <version>1.2.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 8884d4ee7b..127d77c748 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -77,7 +77,7 @@
<hyracks.version>0.3.4.2-SNAPSHOT</hyracks.version>
<hadoop.version>2.8.5</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
- <log4j.version>2.17.1</log4j.version>
+ <log4j.version>2.19.0</log4j.version>
<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
@@ -990,7 +990,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.21</version>
+ <version>1.22</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml
index 3fdcf8ae1f..c13cc5a72c 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.84.Final</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>4.1.87.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.84.Final</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>4.1.87.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.84.Final</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>4.1.87.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.84.Final</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>4.1.87.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.84.Final</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>4.1.87.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.84.Final</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>4.1.84.Final</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>4.1.84.Final</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -232,9 +232,9 @@
<artifactId>netty-resolver</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>
+ <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -244,9 +244,9 @@
<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>
+ <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -259,8 +259,8 @@
<!-- see https://github.com/google/guava/blob/v18.0/COPYING -->
<!-- see https://github.com/google/guava/tree/v28.[012]/COPYING -->
<!-- see https://github.com/google/guava/blob/v31.0.1/COPYING -->
- <license.ignoreMissingEmbeddedNotice>18.0,28.0-jre,28.1-jre,28.2-jre,30.1-jre,31.0.1-jre</license.ignoreMissingEmbeddedNotice>
- <license.ignoreMissingEmbeddedLicense>18.0,28.0-jre,28.1-jre,28.2-jre,30.1-jre,31.0.1-jre</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>18.0,28.0-jre,28.1-jre,28.2-jre,30.1-jre,31.0.1-jre,31.1-jre</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>18.0,28.0-jre,28.1-jre,28.2-jre,30.1-jre,31.0.1-jre,31.1-jre</license.ignoreMissingEmbeddedLicense>
</properties>
</project>
</supplement>
@@ -283,8 +283,8 @@
<!-- see https://github.com/google/error-prone/tree/v2.3.[24]/ -->
<!-- see https://github.com/google/error-prone/blob/v2.7.1/COPYING -->
<properties>
- <license.ignoreMissingEmbeddedLicense>2.3.2,2.3.4,2.7.1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.3.2,2.3.4,2.7.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>2.3.2,2.3.4,2.7.1,2.11.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.3.2,2.3.4,2.7.1,2.11.0</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -315,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,2.13.4</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedNotice>2.12.3,2.13.1,2.13.2,2.13.4,2.14.1</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.84.Final_NOTICE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.87.Final_NOTICE.txt
similarity index 100%
rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.84.Final_NOTICE.txt
rename to asterixdb/src/main/licenses/content/raw.githubusercontent.com_netty_netty_netty-4.1.87.Final_NOTICE.txt
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml b/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml
index 112af09113..539ef90839 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/pom.xml
@@ -58,7 +58,6 @@
<dependency>
<groupId>com.e-movimento.tinytools</groupId>
<artifactId>privilegedaccessor</artifactId>
- <version>1.2.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml b/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml
index a3a0171948..286dee9cff 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/pom.xml
@@ -83,7 +83,6 @@
<dependency>
<groupId>com.e-movimento.tinytools</groupId>
<artifactId>privilegedaccessor</artifactId>
- <version>1.2.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml
index def0b6ca5e..e786941786 100644
--- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/pom.xml
@@ -111,7 +111,6 @@
<dependency>
<groupId>com.e-movimento.tinytools</groupId>
<artifactId>privilegedaccessor</artifactId>
- <version>1.2.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 6f656b562c..19dd08d554 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -69,9 +69,10 @@
<!-- Versions under dependencymanagement or used in many projects via properties -->
<hadoop.version>2.8.5</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
- <log4j.version>2.17.1</log4j.version>
+ <log4j.version>2.19.0</log4j.version>
<snappy.version>1.1.8.4</snappy.version>
- <jackson.version>2.13.4</jackson.version>
+ <jackson.version>2.14.1</jackson.version>
+ <jackson-databind.version>${jackson.version}</jackson-databind.version>
<implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
@@ -83,32 +84,32 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
- <version>4.1.84.Final</version>
+ <version>4.1.87.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
- <version>4.1.84.Final</version>
+ <version>4.1.87.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
- <version>4.1.84.Final</version>
+ <version>4.1.87.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
- <version>4.1.84.Final</version>
+ <version>4.1.87.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
- <version>4.1.84.Final</version>
+ <version>4.1.87.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
- <version>4.1.84.Final</version>
+ <version>4.1.87.Final</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -166,6 +167,11 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.e-movimento.tinytools</groupId>
+ <artifactId>privilegedaccessor</artifactId>
+ <version>1.3</version>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -179,7 +185,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.13.4.2</version>
+ <version>${jackson-databind.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -194,7 +200,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>31.0.1-jre</version>
+ <version>31.1-jre</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
[asterixdb] 08/10: [NO ISSUE][LIC] Add ability to exclude specific shadowed artifacts
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit fd8cd3051cf97798e8945c800ef787c507e74375
Author: Michael Blow <mb...@apache.org>
AuthorDate: Tue Jan 17 17:33:40 2023 -0500
[NO ISSUE][LIC] Add ability to exclude specific shadowed artifacts
Change-Id: Iaa63954b8c328862f0e93c9c1f9fc32cc13e822a
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17317
Reviewed-by: Michael Blow <mb...@apache.org>
Reviewed-by: Murtadha Hubail <mh...@apache.org>
Tested-by: Michael Blow <mb...@apache.org>
---
.../hyracks/maven/license/GenerateFileMojo.java | 62 ++++++++++++++--------
.../apache/hyracks/maven/license/LicenseMojo.java | 6 +++
.../apache/hyracks/maven/license/ProjectFlag.java | 39 +++++++++++---
3 files changed, 78 insertions(+), 29 deletions(-)
diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
index 8edc1b212f..297160e479 100644
--- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
+++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
@@ -20,11 +20,13 @@ package org.apache.hyracks.maven.license;
import static org.apache.hyracks.maven.license.GenerateFileMojo.EmbeddedArtifact.LICENSE;
import static org.apache.hyracks.maven.license.GenerateFileMojo.EmbeddedArtifact.NOTICE;
+import static org.apache.hyracks.maven.license.LicenseUtil.toGav;
import static org.apache.hyracks.maven.license.ProjectFlag.ALTERNATE_LICENSE_FILE;
import static org.apache.hyracks.maven.license.ProjectFlag.ALTERNATE_NOTICE_FILE;
import static org.apache.hyracks.maven.license.ProjectFlag.IGNORE_MISSING_EMBEDDED_LICENSE;
import static org.apache.hyracks.maven.license.ProjectFlag.IGNORE_MISSING_EMBEDDED_NOTICE;
import static org.apache.hyracks.maven.license.ProjectFlag.IGNORE_NOTICE_OVERRIDE;
+import static org.apache.hyracks.maven.license.ProjectFlag.IGNORE_SHADOWED_DEPENDENCIES;
import static org.apache.hyracks.maven.license.ProjectFlag.ON_MULTIPLE_EMBEDDED_LICENSE;
import static org.apache.hyracks.maven.license.ProjectFlag.ON_MULTIPLE_EMBEDDED_NOTICE;
@@ -36,6 +38,7 @@ import java.io.StringWriter;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Comparator;
import java.util.Enumeration;
import java.util.HashMap;
@@ -55,8 +58,10 @@ import java.util.function.UnaryOperator;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.regex.Pattern;
+import java.util.stream.Collectors;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hyracks.maven.license.freemarker.IndentDirective;
@@ -527,39 +532,50 @@ public class GenerateFileMojo extends LicenseMojo {
Set<MavenProject> projects = new TreeSet<>(Comparator.comparing(MavenProject::getId));
projects.addAll(dependencyLicenseMap.keySet());
for (MavenProject p : projects) {
- boolean finished = false;
File artifactFile = p.getArtifact().getFile();
if (!artifactFile.exists()) {
throw new MojoExecutionException("Artifact file " + artifactFile + " does not exist!");
} else if (!artifactFile.getName().endsWith(".jar")) {
getLog().info("Skipping unknown artifact file type: " + artifactFile);
- finished = true;
+ continue;
}
- if (!finished) {
- try (JarFile jarFile = new JarFile(artifactFile)) {
- SortedMap<String, JarEntry> matches = gatherMatchingEntries(jarFile,
- entry -> entry.getName().matches("(.*/|^)" + "pom\\.properties"));
- if (!matches.isEmpty()) {
- for (JarEntry entry : matches.values()) {
- Properties props = new Properties();
- props.load(jarFile.getInputStream(entry));
- String groupId = props.getProperty("groupId");
- String artifactId = props.getProperty("artifactId");
- String version = props.getProperty("version");
- String gav = groupId + ":" + artifactId + ":" + version;
- if (!dependencyGavMap.containsKey(gav)) {
- getLog().info("adding " + gav + " (shadowed from " + p.getId() + ")");
- ArtifactHandler handler = new DefaultArtifactHandler("jar");
- String[] gavParts = StringUtils.split(gav, ':');
- Artifact manualDep = new DefaultArtifact(gavParts[0], gavParts[1], gavParts[2],
- Artifact.SCOPE_COMPILE, "jar", null, handler);
- processArtifact(manualDep, dependencyLicenseMap, dependencyGavMap, true);
+ @SuppressWarnings("unchecked")
+ List<String[]> specs = (List<String[]>) getProjectFlags()
+ .getOrDefault(Pair.of(toGav(p), IGNORE_SHADOWED_DEPENDENCIES), Collections.emptyList());
+ getLog().debug(p + " has " + IGNORE_SHADOWED_DEPENDENCIES.propName() + " set to "
+ + specs.stream().map(ArrayUtils::toString).collect(Collectors.joining(",")));
+ try (JarFile jarFile = new JarFile(artifactFile)) {
+ SortedMap<String, JarEntry> matches = gatherMatchingEntries(jarFile,
+ entry -> entry.getName().matches("(.*/|^)" + "pom\\.properties"));
+ if (!matches.isEmpty()) {
+ jarEntryLoop: for (JarEntry entry : matches.values()) {
+ Properties props = new Properties();
+ props.load(jarFile.getInputStream(entry));
+ String groupId = props.getProperty("groupId");
+ String artifactId = props.getProperty("artifactId");
+ String version = props.getProperty("version");
+ String gav = groupId + ":" + artifactId + ":" + version;
+ if (!dependencyGavMap.containsKey(gav)) {
+ for (String[] ignoreSpec : specs) {
+ if ((ignoreSpec[0].equals(groupId) || ignoreSpec[0].equals("*"))
+ && (ignoreSpec[1].equals(artifactId) || ignoreSpec[1].equals("*"))
+ && (ignoreSpec[2].equals(version) || ignoreSpec[2].equals("*"))) {
+ getLog().info("skipping " + gav + " (shadowed from " + p.getId()
+ + "), as it matches " + IGNORE_SHADOWED_DEPENDENCIES.propName());
+ continue jarEntryLoop;
+ }
}
+ getLog().info("adding " + gav + " (shadowed from " + p.getId() + ")");
+ ArtifactHandler handler = new DefaultArtifactHandler("jar");
+ String[] gavParts = StringUtils.split(gav, ':');
+ Artifact manualDep = new DefaultArtifact(gavParts[0], gavParts[1], gavParts[2],
+ Artifact.SCOPE_COMPILE, "jar", null, handler);
+ processArtifact(manualDep, dependencyLicenseMap, dependencyGavMap, true);
}
}
- } catch (IOException e) {
- throw new MojoExecutionException(e);
}
+ } catch (IOException e) {
+ throw new MojoExecutionException(e);
}
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java
index 73cc69559b..3b5fde693d 100644
--- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java
+++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java
@@ -407,6 +407,7 @@ public abstract class LicenseMojo extends AbstractMojo {
protected void gatherProjectDependencies(MavenProject project,
Map<MavenProject, List<Pair<String, String>>> dependencyLicenseMap,
Map<String, MavenProject> dependencyGavMap) throws ProjectBuildingException, MojoExecutionException {
+ getLog().debug("+gatherProjectDependencies " + toGav(project));
final Set<Artifact> dependencyArtifacts = project.getArtifacts();
if (dependencyArtifacts != null) {
for (Artifact depArtifact : dependencyArtifacts) {
@@ -440,6 +441,7 @@ public abstract class LicenseMojo extends AbstractMojo {
Map<String, MavenProject> dependencyGavMap, boolean shadowed) throws ProjectBuildingException {
if (!excludedScopes.contains(depArtifact.getScope())) {
MavenProject dep = resolveDependency(depArtifact);
+ getLog().debug("+processArtifact " + toGav(dep));
if (!depArtifact.isResolved()) {
ArtifactResolutionRequest arr = new ArtifactResolutionRequest();
arr.setLocalRepository(localRepository);
@@ -476,6 +478,10 @@ public abstract class LicenseMojo extends AbstractMojo {
} catch (ProjectBuildingException e) {
throw new ProjectBuildingException(key, "Error creating dependent artifacts", e);
}
+ // override the gav in the built dependency with the gavs in depObj
+ depProj.setGroupId(depObj.getGroupId());
+ depProj.setArtifactId(depObj.getArtifactId());
+ depProj.setVersion(depObj.getVersion());
Model supplement = supplementModels
.get(SupplementalModelHelper.generateSupplementMapKey(depObj.getGroupId(), depObj.getArtifactId()));
diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/ProjectFlag.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/ProjectFlag.java
index d61dde17d3..eb460419e0 100644
--- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/ProjectFlag.java
+++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/ProjectFlag.java
@@ -20,9 +20,12 @@ package org.apache.hyracks.maven.license;
import static org.apache.hyracks.maven.license.LicenseUtil.toGav;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
import java.util.Properties;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hyracks.util.StringUtil;
@@ -36,13 +39,15 @@ enum ProjectFlag {
ON_MULTIPLE_EMBEDDED_LICENSE,
ON_MULTIPLE_EMBEDDED_NOTICE,
ALTERNATE_LICENSE_FILE,
- ALTERNATE_NOTICE_FILE;
+ ALTERNATE_NOTICE_FILE,
+ IGNORE_SHADOWED_DEPENDENCIES;
String propName() {
return "license." + StringUtil.toCamelCase(name());
}
void visit(MavenProject depObj, Properties properties, LicenseMojo licenseMojo) {
+ licenseMojo.getLog().debug("+" + propName() + ".visit: " + toGav(depObj));
String value = properties.getProperty(propName());
if (value == null) {
return;
@@ -59,12 +64,34 @@ enum ProjectFlag {
+ " for " + toGav(depObj));
}
break;
+ case IGNORE_SHADOWED_DEPENDENCIES:
+ // <license.ignoreShadowedDependencies>*:com.couchbase.client:core-io:*</license.ignoreShadowedDependencies>
+ List<String[]> specsList = new ArrayList<>();
+ for (String spec : StringUtils.split(value, ",")) {
+ boolean found = false;
+ String[] specSplit = StringUtils.split(spec, ":");
+ if (specSplit.length != 4) {
+ throw new IllegalArgumentException(spec);
+ }
+ if (specSplit[0].equals(depObj.getVersion()) || specSplit[0].equals("*")) {
+ specsList.add(ArrayUtils.subarray(specSplit, 1, specSplit.length));
+ found = true;
+ }
+ if (!found) {
+ licenseMojo.getLog().info(propName() + " defined on versions that *do not* match: "
+ + specSplit[0] + " for " + toGav(depObj));
+ }
+ }
+ if (!specsList.isEmpty()) {
+ licenseMojo.getProjectFlags().put(Pair.of(toGav(depObj), this), specsList);
+ }
+ break;
case ALTERNATE_LICENSE_FILE:
case ALTERNATE_NOTICE_FILE:
case ON_MULTIPLE_EMBEDDED_NOTICE:
case ON_MULTIPLE_EMBEDDED_LICENSE:
- boolean found = false;
for (String spec : StringUtils.split(value, ",")) {
+ boolean found = false;
String[] specSplit = StringUtils.split(spec, ":");
if (specSplit.length != 2) {
throw new IllegalArgumentException(spec);
@@ -73,10 +100,10 @@ enum ProjectFlag {
licenseMojo.getProjectFlags().put(Pair.of(toGav(depObj), this), specSplit[1]);
found = true;
}
- }
- if (!found) {
- licenseMojo.getLog().info(propName() + " defined on versions that *do not* match: " + value
- + " for " + toGav(depObj));
+ if (!found) {
+ licenseMojo.getLog().info(propName() + " defined on versions that *do not* match: " + value
+ + " for " + toGav(depObj));
+ }
}
break;
default:
[asterixdb] 06/10: Merge branch 'gerrit/mad-hatter'
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 23fc48b4e2bd97ccde155119c51f9913c3108779
Merge: 023e28c15d 85a3f577df
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Mon Jan 16 21:25:12 2023 -0500
Merge branch 'gerrit/mad-hatter'
Change-Id: I47d4bbea8cccc2bbf3cd1ad7fedccf7d54d3b498
asterixdb/asterix-app/pom.xml | 1 -
asterixdb/asterix-external-data/pom.xml | 1 -
asterixdb/pom.xml | 4 +-
.../appended-resources/supplemental-models.xml | 88 +++++++++++-----------
....com_netty_netty_netty-4.1.87.Final_NOTICE.txt} | 0
.../hyracks-control/hyracks-nc-service/pom.xml | 1 -
.../hyracks/hyracks-dataflow-std/pom.xml | 1 -
.../hyracks-integration-tests/pom.xml | 1 -
.../hyracks/test/support/LicensingTestBase.java | 4 +-
hyracks-fullstack/pom.xml | 35 +++++----
10 files changed, 68 insertions(+), 68 deletions(-)
diff --cc asterixdb/pom.xml
index f4bca0dabb,2975dc9c89..5d6a5fe962
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -76,20 -76,14 +76,20 @@@
<itest.excludes>${global.itest.excludes}</itest.excludes>
<license.stage>compile</license.stage>
<resource.stage>process-classes</resource.stage>
+ <prepare-env.stage>none</prepare-env.stage>
+ <shim.stage>none</shim.stage>
+ <pytestlib.stage>none</pytestlib.stage>
+ <skip-npm-touch.stage>none</skip-npm-touch.stage>
<!-- Versions under dependencymanagement or used in many projects via properties -->
- <algebricks.version>0.3.5-SNAPSHOT</algebricks.version>
- <hyracks.version>0.3.5-SNAPSHOT</hyracks.version>
+ <algebricks.version>0.3.6-SNAPSHOT</algebricks.version>
+ <hyracks.version>0.3.6-SNAPSHOT</hyracks.version>
<hadoop.version>2.8.5</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
- <log4j.version>2.17.1</log4j.version>
+ <log4j.version>2.19.0</log4j.version>
<awsjavasdk.version>2.17.218</awsjavasdk.version>
+ <azurejavasdk.version>12.12.0</azurejavasdk.version>
+ <parquet.version>1.8.2</parquet.version>
<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
diff --cc asterixdb/src/main/appended-resources/supplemental-models.xml
index 8458724bdc,5e871f2bb0..24eca6a3fc
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@@ -202,30 -202,6 +202,30 @@@
</properties>
</project>
</supplement>
+ <supplement>
+ <project>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-dns</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>
++ <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http2</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>
++ <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
<supplement>
<project>
<groupId>io.netty</groupId>
@@@ -286,18 -262,6 +286,18 @@@
</properties>
</project>
</supplement>
+ <supplement>
+ <project>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver-dns</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>
++ <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
<supplement>
<project>
<groupId>io.netty</groupId>
diff --cc hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java
index 9e52785009,9e52785009..283c12c35a
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java
@@@ -22,7 -22,7 +22,6 @@@ import java.io.File
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
--import java.util.Arrays;
import java.util.List;
import org.apache.commons.io.FileUtils;
@@@ -47,8 -47,8 +46,7 @@@ public abstract class LicensingTestBas
}
installerDir = FileUtil.joinPath(targetDir, list[0], topLevel[0]);
Assert.assertNotNull("installerDir", list);
-- Assert.assertFalse("Ambiguous install dir (" + pattern + "): " + Arrays.toString(topLevel),
-- list.length > 1);
++ Assert.assertFalse("Ambiguous install dir (" + pattern + "): " + list, list.length > 1);
Assert.assertEquals("Can't find install dir (" + pattern + ")", 1, topLevel.length);
}
}
diff --cc hyracks-fullstack/pom.xml
index 1ca6b2a050,5e07d9be9d..b91cbd1afb
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@@ -72,9 -72,10 +72,11 @@@
<!-- Versions under dependencymanagement or used in many projects via properties -->
<hadoop.version>2.8.5</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
- <log4j.version>2.17.1</log4j.version>
+ <log4j.version>2.19.0</log4j.version>
<snappy.version>1.1.8.4</snappy.version>
- <jackson.version>2.13.4</jackson.version>
+ <jackson.version>2.14.1</jackson.version>
+ <jackson-databind.version>${jackson.version}</jackson-databind.version>
++ <netty.version>4.1.87.Final</netty.version>
<implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
@@@ -86,52 -87,37 +88,52 @@@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
- <version>4.1.84.Final</version>
- <version>4.1.87.Final</version>
++ <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
- <version>4.1.84.Final</version>
- <version>4.1.87.Final</version>
++ <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
- <version>4.1.84.Final</version>
- <version>4.1.87.Final</version>
++ <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
- <version>4.1.84.Final</version>
- <version>4.1.87.Final</version>
++ <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
- <version>4.1.84.Final</version>
- <version>4.1.87.Final</version>
++ <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
- <version>4.1.84.Final</version>
- <version>4.1.87.Final</version>
++ <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-classes-epoll</artifactId>
- <version>4.1.84.Final</version>
- <version>4.1.87.Final</version>
++ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver-dns</artifactId>
- <version>4.1.84.Final</version>
++ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http2</artifactId>
- <version>4.1.84.Final</version>
++ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-unix-common</artifactId>
- <version>4.1.84.Final</version>
++ <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@@ -208,13 -180,12 +210,18 @@@
<version>${hadoop.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <dependency>
+ <groupId>com.e-movimento.tinytools</groupId>
+ <artifactId>privilegedaccessor</artifactId>
+ <version>1.3</version>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
[asterixdb] 05/10: Merge branch 'gerrit/stabilization-5949a1cb71'
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 85a3f577dfa61bc14a75c0b5fc1b6cbb349f1253
Merge: d7e54cf144 2c076aa73f
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Thu Jan 12 23:22:31 2023 -0500
Merge branch 'gerrit/stabilization-5949a1cb71'
Change-Id: I8f1e00fb22ec140766e2f9dd6dfaf6b2bfbffa0e
asterixdb/asterix-app/pom.xml | 1 -
asterixdb/asterix-external-data/pom.xml | 1 -
asterixdb/pom.xml | 4 +-
.../appended-resources/supplemental-models.xml | 70 +++++++++++-----------
....com_netty_netty_netty-4.1.87.Final_NOTICE.txt} | 0
.../hyracks-control/hyracks-nc-service/pom.xml | 1 -
.../hyracks/hyracks-dataflow-std/pom.xml | 1 -
.../hyracks-integration-tests/pom.xml | 1 -
hyracks-fullstack/pom.xml | 28 +++++----
9 files changed, 54 insertions(+), 53 deletions(-)
diff --cc asterixdb/pom.xml
index 2bec4b7013,15dc445c92..2975dc9c89
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -82,8 -81,7 +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>
- <log4j.version>2.17.1</log4j.version>
+ <log4j.version>2.19.0</log4j.version>
+ <awsjavasdk.version>2.17.218</awsjavasdk.version>
<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
diff --cc asterixdb/src/main/appended-resources/supplemental-models.xml
index d0703ffd78,605bac1a6e..5e871f2bb0
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@@ -166,30 -166,6 +166,30 @@@
</properties>
</project>
</supplement>
+ <supplement>
+ <project>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-classes-epoll</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>
++ <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreNoticeOverride>4.1.87.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>
++ <license.ignoreMissingEmbeddedLicense>4.1.87.Final</license.ignoreMissingEmbeddedLicense>
++ <license.ignoreMissingEmbeddedNotice>4.1.87.Final</license.ignoreMissingEmbeddedNotice>
++ <license.ignoreNoticeOverride>4.1.87.Final</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
<supplement>
<project>
<groupId>io.netty</groupId>
diff --cc hyracks-fullstack/pom.xml
index 7a7c0b0bec,1b4d1f01cd..5e07d9be9d
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@@ -111,13 -111,8 +112,13 @@@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
- <version>4.1.84.Final</version>
+ <version>4.1.87.Final</version>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-classes-epoll</artifactId>
- <version>4.1.84.Final</version>
++ <version>4.1.87.Final</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
[asterixdb] 09/10: Merge branch 'gerrit/stabilization-667a908755'
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 6512463b026f5d87eae8d528c1497a4cdebe5f78
Merge: 2aa06c577b fd8cd3051c
Author: Michael Blow <mb...@apache.org>
AuthorDate: Mon Jan 23 21:43:38 2023 -0500
Merge branch 'gerrit/stabilization-667a908755'
Change-Id: Ic9669e91dda5824631d6f134c9f0c332cf7b8590
asterixdb/asterix-app/pom.xml | 1 -
asterixdb/asterix-external-data/pom.xml | 1 -
asterixdb/pom.xml | 4 +-
.../appended-resources/supplemental-models.xml | 88 +++++++++++-----------
....com_netty_netty_netty-4.1.87.Final_NOTICE.txt} | 0
.../hyracks-control/hyracks-nc-service/pom.xml | 1 -
.../hyracks/hyracks-dataflow-std/pom.xml | 1 -
.../hyracks-integration-tests/pom.xml | 1 -
.../hyracks/maven/license/GenerateFileMojo.java | 62 +++++++++------
.../apache/hyracks/maven/license/LicenseMojo.java | 6 ++
.../apache/hyracks/maven/license/ProjectFlag.java | 39 ++++++++--
.../hyracks/test/support/LicensingTestBase.java | 4 +-
hyracks-fullstack/pom.xml | 35 +++++----
13 files changed, 146 insertions(+), 97 deletions(-)
[asterixdb] 07/10: Merge branch 'gerrit/cheshire-cat'
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 8fbe5ddd49f7420aac67602a2eb89965e5b43015
Merge: 429cf26230 23fc48b4e2
Author: Michael Blow <mb...@apache.org>
AuthorDate: Tue Jan 17 10:32:08 2023 -0500
Merge branch 'gerrit/cheshire-cat'
Change-Id: Ifb4a910590d27465951dd7e5fad11110a427fb47
asterixdb/asterix-app/pom.xml | 1 -
asterixdb/asterix-external-data/pom.xml | 1 -
asterixdb/pom.xml | 4 +-
.../appended-resources/supplemental-models.xml | 88 +++++++++++-----------
....com_netty_netty_netty-4.1.87.Final_NOTICE.txt} | 0
.../hyracks-control/hyracks-nc-service/pom.xml | 1 -
.../hyracks/hyracks-dataflow-std/pom.xml | 1 -
.../hyracks-integration-tests/pom.xml | 1 -
.../hyracks/test/support/LicensingTestBase.java | 4 +-
hyracks-fullstack/pom.xml | 35 +++++----
10 files changed, 68 insertions(+), 68 deletions(-)
diff --cc asterixdb/pom.xml
index d48eb8a6a5,5d6a5fe962..1aff200bc8
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@@ -82,18 -82,14 +82,18 @@@
<skip-npm-touch.stage>none</skip-npm-touch.stage>
<!-- Versions under dependencymanagement or used in many projects via properties -->
- <algebricks.version>0.3.6-SNAPSHOT</algebricks.version>
- <hyracks.version>0.3.6-SNAPSHOT</hyracks.version>
- <hadoop.version>2.8.5</hadoop.version>
+ <algebricks.version>0.3.8-SNAPSHOT</algebricks.version>
+ <hyracks.version>0.3.8-SNAPSHOT</hyracks.version>
+ <hadoop.version>3.3.4</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
- <log4j.version>2.17.1</log4j.version>
+ <log4j.version>2.19.0</log4j.version>
<awsjavasdk.version>2.17.218</awsjavasdk.version>
- <azurejavasdk.version>12.12.0</azurejavasdk.version>
- <parquet.version>1.8.2</parquet.version>
+ <parquet.version>1.12.3</parquet.version>
+ <hadoop-awsjavasdk.version>1.12.109</hadoop-awsjavasdk.version>
+ <azureblobjavasdk.version>12.14.2</azureblobjavasdk.version>
+ <azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version>
+ <gcsjavasdk.version>2.9.0</gcsjavasdk.version>
+ <hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version>
<implementation.title>Apache AsterixDB - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
diff --cc hyracks-fullstack/pom.xml
index 86e588df84,b91cbd1afb..69a82799b5
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@@ -70,11 -70,13 +70,13 @@@
<test.includes>${global.test.includes}</test.includes>
<test.excludes>${global.test.excludes}</test.excludes>
<!-- Versions under dependencymanagement or used in many projects via properties -->
- <hadoop.version>2.8.5</hadoop.version>
+ <hadoop.version>3.3.1</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
- <log4j.version>2.17.1</log4j.version>
+ <log4j.version>2.19.0</log4j.version>
<snappy.version>1.1.8.4</snappy.version>
- <jackson.version>2.13.4</jackson.version>
+ <jackson.version>2.14.1</jackson.version>
+ <jackson-databind.version>${jackson.version}</jackson-databind.version>
+ <netty.version>4.1.87.Final</netty.version>
<implementation.title>Apache Hyracks and Algebricks - ${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
@@@ -259,13 -215,13 +261,18 @@@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 -->
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.e-movimento.tinytools</groupId>
+ <artifactId>privilegedaccessor</artifactId>
+ <version>1.3</version>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
[asterixdb] 10/10: Merge branch 'gerrit/neo'
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 576493d894533e9f0eb8d7f09fd8defde6a7627f
Merge: 7436ac1aa8 6512463b02
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Wed Jan 25 20:46:08 2023 -0500
Merge branch 'gerrit/neo'
Change-Id: Icbdf3638df8547973adb3313ce193563a0c0ab0c
asterixdb/asterix-app/pom.xml | 1 -
asterixdb/asterix-external-data/pom.xml | 1 -
asterixdb/pom.xml | 4 +-
.../appended-resources/supplemental-models.xml | 88 +++++++++++-----------
....com_netty_netty_netty-4.1.87.Final_NOTICE.txt} | 0
.../hyracks-control/hyracks-nc-service/pom.xml | 1 -
.../hyracks/hyracks-dataflow-std/pom.xml | 1 -
.../hyracks-integration-tests/pom.xml | 1 -
.../hyracks/maven/license/GenerateFileMojo.java | 68 +++++++++++------
.../apache/hyracks/maven/license/LicenseMojo.java | 6 ++
.../apache/hyracks/maven/license/ProjectFlag.java | 39 ++++++++--
.../hyracks/test/support/LicensingTestBase.java | 4 +-
hyracks-fullstack/pom.xml | 35 +++++----
13 files changed, 152 insertions(+), 97 deletions(-)
diff --cc hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
index 2c7a23b0f5,5c1110689f..c548179d9c
--- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
+++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
@@@ -526,15 -532,14 +532,19 @@@ public class GenerateFileMojo extends L
private void gatherShadowedDependencies(Map<MavenProject, List<Pair<String, String>>> dependencyLicenseMap,
Map<String, MavenProject> dependencyGavMap) throws MojoExecutionException, ProjectBuildingException {
+ if (!includeShadowedDependencies) {
+ getLog().info("Not gathering shadowed dependencies as 'includeShadowedDependencies' is set to "
+ + includeShadowedDependencies);
+ return;
+ }
Set<MavenProject> projects = new TreeSet<>(Comparator.comparing(MavenProject::getId));
+ if (!includeShadowedDependencies) {
+ getLog().info("Not gathering shadowed dependencies as 'includeShadowedDependencies' is set to "
+ + includeShadowedDependencies);
+ return;
+ }
projects.addAll(dependencyLicenseMap.keySet());
for (MavenProject p : projects) {
- boolean finished = false;
File artifactFile = p.getArtifact().getFile();
if (!artifactFile.exists()) {
throw new MojoExecutionException("Artifact file " + artifactFile + " does not exist!");
[asterixdb] 01/10: [NO ISSUE][HYR][MISC] Include flag to skip processing shadowed deps
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 2aa06c577b4ae6a9e7d590525f5978023272a35a
Author: Michael Blow <mb...@apache.org>
AuthorDate: Tue Jan 10 08:28:31 2023 -0500
[NO ISSUE][HYR][MISC] Include flag to skip processing shadowed deps
Change-Id: I12359da7a9e0347fbcae624777e50190a3d5c472
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17309
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Hussain Towaileb <hu...@gmail.com>
Tested-by: Michael Blow <mb...@apache.org>
---
.../java/org/apache/hyracks/maven/license/GenerateFileMojo.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
index 8edc1b212f..d1177a5ec7 100644
--- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
+++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
@@ -118,6 +118,9 @@ public class GenerateFileMojo extends LicenseMojo {
@Parameter
private boolean stripFoundationAssertionFromNotices = false;
+ @Parameter
+ private boolean includeShadowedDependencies = true;
+
@Parameter
private boolean validateShadowLicenses = false;
@@ -524,6 +527,11 @@ public class GenerateFileMojo extends LicenseMojo {
private void gatherShadowedDependencies(Map<MavenProject, List<Pair<String, String>>> dependencyLicenseMap,
Map<String, MavenProject> dependencyGavMap) throws MojoExecutionException, ProjectBuildingException {
+ if (!includeShadowedDependencies) {
+ getLog().info("Not gathering shadowed dependencies as 'includeShadowedDependencies' is set to "
+ + includeShadowedDependencies);
+ return;
+ }
Set<MavenProject> projects = new TreeSet<>(Comparator.comparing(MavenProject::getId));
projects.addAll(dependencyLicenseMap.keySet());
for (MavenProject p : projects) {