Merge branch 'gerrit/neo' into 'gerrit/trinity'
Change-Id: I568a2df4594bdde19932ba72362c9661096a9183
diff --git a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveNotificationHandler.java b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveNotificationHandler.java
index 60bfa69..9a05148 100644
--- a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveNotificationHandler.java
+++ b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/IActiveNotificationHandler.java
@@ -19,6 +19,8 @@
*/
package org.apache.asterix.active;
+import java.util.Collection;
+
import org.apache.asterix.active.message.ActivePartitionMessage;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -53,6 +55,11 @@
void unregisterListener(IActiveEntityEventsListener listener) throws HyracksDataException;
/**
+ * @return List of all the registered event listeners
+ */
+ Collection<IActiveEntityEventsListener> getEventListenersAsList();
+
+ /**
* @return all the registered event listeners
*/
IActiveEntityEventsListener[] getEventListeners();
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
index 6b3581e..3c277d5 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
@@ -19,6 +19,7 @@
package org.apache.asterix.app.active;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -187,6 +188,11 @@
}
@Override
+ public synchronized Collection<IActiveEntityEventsListener> getEventListenersAsList() {
+ return Collections.unmodifiableCollection(entityEventListeners.values());
+ }
+
+ @Override
public synchronized void registerListener(IActiveEntityEventsListener listener) throws HyracksDataException {
if (suspended) {
throw new RuntimeDataException(ErrorCode.ACTIVE_NOTIFICATION_HANDLER_IS_SUSPENDED);
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IRequestTracker.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IRequestTracker.java
index a3ddb30..0019015 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IRequestTracker.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IRequestTracker.java
@@ -75,4 +75,10 @@
* @return the recently completed requests
*/
Collection<IClientRequest> getCompletedRequests();
+
+ /**
+ *
+ * @return the total number of requests since cluster start/restart
+ */
+ long getTotalNumberOfRequests();
}
diff --git a/asterixdb/asterix-external-data/pom.xml b/asterixdb/asterix-external-data/pom.xml
index 45d1f44..4306864 100644
--- a/asterixdb/asterix-external-data/pom.xml
+++ b/asterixdb/asterix-external-data/pom.xml
@@ -212,7 +212,11 @@
<usedDependency>io.netty:netty-codec-http2</usedDependency>
<usedDependency>io.netty:netty-transport-native-unix-common</usedDependency>
<usedDependency>io.netty:netty-handler-proxy</usedDependency>
+ <usedDependency>io.netty:netty-handler-proxy</usedDependency>
</usedDependencies>
+ <ignoredUnusedDeclaredDependencies>
+ <unusedDeclaredDependency>io.grpc:grpc-census:*</unusedDeclaredDependency>
+ </ignoredUnusedDeclaredDependencies>
</configuration>
</plugin>
</plugins>
@@ -518,6 +522,11 @@
<groupId>com.google.cloud.bigdataoss</groupId>
<artifactId>gcs-connector</artifactId>
</dependency>
+ <!-- explicitly include grpc-census, to ensure the correct version -->
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-census</artifactId>
+ </dependency>
<!-- apply patch for HADOOP-17225 to workaround CVE-2019-10172 -->
<dependency>
<groupId>org.codehaus.jackson</groupId>
@@ -546,21 +555,16 @@
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
</dependency>
- <!-- TODO(htowaileb): removed from hadoop transitively and added separately to avoid CVEs, can
- be removed once upgraded to hadoop 3.3.4 as it addresses the CVEs -->
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util-ajax</artifactId>
- </dependency>
<!-- Manually included to avoid CVE-2023-1370 -->
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
</dependency>
+ <!-- Manually overridden to avoid CVE-2023-1436, CVE-2022-45693, CVE-2022-45685, CVE-2022-40150, CVE-2022-40149 -->
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ </dependency>
</dependencies>
<!-- apply patch for HADOOP-17225 to workaround CVE-2019-10172 -->
<repositories>
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RequestTracker.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RequestTracker.java
index 333c709..c9425c6 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RequestTracker.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RequestTracker.java
@@ -24,6 +24,7 @@
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
import org.apache.asterix.common.api.IClientRequest;
import org.apache.asterix.common.api.IRequestTracker;
@@ -37,10 +38,12 @@
private final Map<String, IClientRequest> clientIdRequests = new ConcurrentHashMap<>();
private final CircularFifoQueue<IClientRequest> completedRequests;
private final ICcApplicationContext ccAppCtx;
+ private final AtomicLong numRequests;
public RequestTracker(ICcApplicationContext ccAppCtx) {
this.ccAppCtx = ccAppCtx;
completedRequests = new CircularFifoQueue<>(ccAppCtx.getExternalProperties().getRequestsArchiveSize());
+ numRequests = new AtomicLong(0);
}
@Override
@@ -57,6 +60,7 @@
@Override
public void track(IClientRequest request) {
runningRequests.put(request.getId(), request);
+ numRequests.incrementAndGet();
if (request.getClientContextId() != null) {
clientIdRequests.put(request.getClientContextId(), request);
}
@@ -112,4 +116,8 @@
private synchronized void archive(IClientRequest request) {
completedRequests.add(request);
}
+
+ public long getTotalNumberOfRequests() {
+ return numRequests.get();
+ }
}
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index dcd8e1b..479ef85 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -540,13 +540,6 @@
<gav>com.google.api:gax-grpc:2.7.1</gav>
<url>https://raw.githubusercontent.com/googleapis/gax-java/v2.7.1/LICENSE</url>
</override>
- <override>
- <gavs>
- <gav>org.bouncycastle:bcprov-jdk15on:1.60</gav>
- <gav>org.bouncycastle:bcpkix-jdk15on:1.60</gav>
- </gavs>
- <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url>
- </override>
</overrides>
<licenses>
<license>
@@ -582,6 +575,7 @@
<aliasUrl>http://www.apache.org/licenses/LICENSE-2.0.html</aliasUrl>
<aliasUrl>https://www.apache.org/licenses/LICENSE-2.0.html</aliasUrl>
<aliasUrl>https://aws.amazon.com/apache2.0</aliasUrl>
+ <aliasUrl>https://opensource.org/licenses/Apache-2.0</aliasUrl>
<aliasUrl>https://raw.githubusercontent.com/jorabin/KeePassJava2/KeePassJava2-2.1.4/LICENSE</aliasUrl>
<aliasUrl>https://raw.githubusercontent.com/reactor/reactor-core/v3.4.27/LICENSE</aliasUrl>
<aliasUrl>https://raw.githubusercontent.com/codehaus/stax/master/dev/ASF2.0.txt</aliasUrl>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index a710303..265aa37 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -86,7 +86,7 @@
<!-- Versions under dependencymanagement or used in many projects via properties -->
<algebricks.version>0.3.8.2-SNAPSHOT</algebricks.version>
<hyracks.version>0.3.8.2-SNAPSHOT</hyracks.version>
- <hadoop.version>3.3.4</hadoop.version>
+ <hadoop.version>3.3.6</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.19.0</log4j.version>
<awsjavasdk.version>2.17.218</awsjavasdk.version>
@@ -96,7 +96,7 @@
<azurecommonjavasdk.version>12.21.0</azurecommonjavasdk.version>
<azureidentity.version>1.9.0</azureidentity.version>
<azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version>
- <gcsjavasdk.version>2.17.2</gcsjavasdk.version>
+ <gcsjavasdk.version>2.26.0</gcsjavasdk.version>
<hadoop-azuresdk.version>8.6.6</hadoop-azuresdk.version>
<hadoop-gcs.version>hadoop3-2.2.6</hadoop-gcs.version>
@@ -1001,18 +1001,13 @@
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
- <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 -->
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util-ajax</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1021,6 +1016,10 @@
<version>${hadoop.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
</exclusion>
@@ -1076,15 +1075,6 @@
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</exclusion>
- <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 -->
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util-ajax</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1121,18 +1111,13 @@
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
- <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 -->
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util-ajax</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1156,11 +1141,6 @@
<groupId>org.jline</groupId>
<artifactId>jline</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>
@@ -1188,18 +1168,13 @@
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
- <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 -->
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util-ajax</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1217,24 +1192,19 @@
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
- <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 -->
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util-ajax</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.22</version>
+ <version>1.24.0</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -1962,17 +1932,6 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-azure</artifactId>
<version>${hadoop.version}</version>
- <exclusions>
- <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 -->
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util-ajax</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Hadoop Azure end -->
<!-- Hadoop GCS start -->
@@ -1985,21 +1944,27 @@
<groupId>org.checkerframework</groupId>
<artifactId>checker-compat-qual</artifactId>
</exclusion>
+ <!-- exclude transitive grpc-api,grpc-census dependencies, as they are bringing in older versions -->
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-census</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- Hadoop GCS end -->
-
- <!-- TODO(htowaileb): removed from hadoop transitively and added separately to avoid CVEs, can
- be removed once upgraded to hadoop 3.3.4 as it addresses the CVEs -->
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>9.4.51.v20230217</version>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>1.5.4</version>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util-ajax</artifactId>
- <version>9.4.51.v20230217</version>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-census</artifactId>
+ <version>1.56.1</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml
index d4efbf1..57c6fe6 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -346,7 +346,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,31.1-jre</license.ignoreMissingEmbeddedNotice>
+ <!-- see https://github.com/google/guava/blob/v32.1.2/LICENSE -->
+ <license.ignoreMissingEmbeddedNotice>18.0,28.0-jre,28.1-jre,28.2-jre,30.1-jre,31.0.1-jre,31.1-jre,jre,32.1.2-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>
@@ -370,8 +371,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,2.11.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.3.2,2.3.4,2.7.1,2.11.0</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>2.3.2,2.3.4,2.7.1,2.11.0,2.18.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.3.2,2.3.4,2.7.1,2.11.0,2.18.0</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -463,10 +464,12 @@
<properties>
<!-- snappy-java is ALv2, and does not contain any embedded LICENSE or NOTICE file -->
<!-- license override not needed, ALv2 is specified in its pom.xml -->
- <!-- see https://raw.githubusercontent.com/xerial/snappy-java/v1.1.10.1/LICENSE -->
- <license.ignoreMissingEmbeddedLicense>1.1.10.1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.1.10.1</license.ignoreMissingEmbeddedNotice>
- <license.ignoreNoticeOverride>1.1.10.1</license.ignoreNoticeOverride>
+ <!-- see https://raw.githubusercontent.com/xerial/snappy-java/1.1.10.5/LICENSE -->
+ <license.ignoreMissingEmbeddedLicense>1.1.10.5</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.1.10.5</license.ignoreMissingEmbeddedNotice>
+ <!-- snappy does have a NOTICE file, we add an override to pick that up -->
+ <!-- see https://raw.githubusercontent.com/xerial/snappy-java/1.1.10.5/NOTICE -->
+ <license.ignoreNoticeOverride>1.1.10.5</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -1164,9 +1167,8 @@
<groupId>com.google.api</groupId>
<artifactId>api-common</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>2.5.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.5.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>2.5.0</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>2.15.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.15.0</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1177,9 +1179,8 @@
<groupId>com.google.api</groupId>
<artifactId>gax-httpjson</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>0.107.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>0.107.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>0.107.0</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>2.32.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.32.0</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1190,9 +1191,8 @@
<groupId>com.google.api</groupId>
<artifactId>gax</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>2.22.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.22.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>2.22.0</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>2.32.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.32.0</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1203,9 +1203,8 @@
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>2.1.2</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.1.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>2.1.2</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>2.2.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.2.0</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1292,9 +1291,9 @@
<groupId>io.opencensus</groupId>
<artifactId>opencensus-contrib-grpc-metrics</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>0.31.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>0.31.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>0.31.0</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>0.31.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>0.31.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>0.31.1</license.ignoreLicenseOverride>
</properties>
</project>
</supplement>
@@ -1312,19 +1311,6 @@
</project>
</supplement>
- <!-- io.opencensus uses ALv2 with no NOTICE file -->
- <supplement>
- <project>
- <groupId>io.opencensus</groupId>
- <artifactId>opencensus-contrib-grpc-metrics</artifactId>
- <properties>
- <license.ignoreMissingEmbeddedLicense>0.31.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>0.31.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>0.31.0</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
<!-- io.opencensus uses non-fixed ALv2 with no NOTICE file -->
<supplement>
<project>
@@ -1344,9 +1330,8 @@
<groupId>com.google.api.grpc</groupId>
<artifactId>gapic-google-cloud-storage-v2</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>2.17.2-alpha</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.17.2-alpha</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>2.17.2-alpha</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>2.26.0-alpha</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.26.0-alpha</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1357,9 +1342,8 @@
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-storage-v2</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>2.17.2-alpha</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.17.2-alpha</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>2.17.2-alpha</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>2.26.0-alpha</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.26.0-alpha</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1370,9 +1354,8 @@
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-storage-v2</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>2.17.2-alpha</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.17.2-alpha</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>2.17.2-alpha</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>2.26.0-alpha</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.26.0-alpha</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1398,7 +1381,7 @@
<properties>
<license.ignoreMissingEmbeddedLicense>0.26.0</license.ignoreMissingEmbeddedLicense>
<license.ignoreMissingEmbeddedNotice>0.26.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>0.26.0</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>0.26.0</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -1409,8 +1392,8 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-annotations</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.22</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.22</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.23</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.23</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1433,9 +1416,8 @@
<groupId>com.google.api</groupId>
<artifactId>gax-grpc</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>2.22.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.22.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>2.22.0</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>2.32.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.32.0</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1446,9 +1428,8 @@
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core-grpc</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>2.9.4</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.9.4</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>2.9.4</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>2.22.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.22.0</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1661,19 +1642,6 @@
</project>
</supplement>
- <!-- io.perfmark uses ALv2 license -->
- <supplement>
- <project>
- <groupId>io.perfmark</groupId>
- <artifactId>perfmark-api</artifactId>
- <properties>
- <license.ignoreMissingEmbeddedLicense>0.23.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>0.23.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>0.23.0</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
<!-- com.google.apis:google-api-services-iamcredentials has embedded ASLv2 in pom.xml -->
<supplement>
<project>
@@ -1692,9 +1660,8 @@
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>2.9.4</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.9.4</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>2.9.4</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>2.22.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.22.0</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1705,9 +1672,8 @@
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core-http</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>2.9.4</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.9.4</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>2.9.4</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>2.22.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.22.0</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1718,9 +1684,8 @@
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-credentials</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.14.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.14.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.14.0</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>1.19.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.19.0</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1731,9 +1696,8 @@
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.14.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.14.0</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.14.0</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>1.19.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.19.0</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1744,9 +1708,9 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-alts</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.52.1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.52.1</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.52.1</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>1.56.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.56.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>1.56.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -1757,10 +1721,9 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-api</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.43.2,1.52.1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.43.2,1.52.1</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.43.2,1.52.1</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>1.43.2,1.52.1</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>1.56.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.56.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>1.56.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -1771,9 +1734,9 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-auth</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.52.1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.52.1</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.52.1</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>1.56.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.56.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>1.56.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -1784,9 +1747,10 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-census</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.43.2</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.43.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.43.2</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>1.56.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.56.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>1.56.1</license.ignoreLicenseOverride>
+ <license.ignoreNoticeOverride>1.56.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -1797,9 +1761,9 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-context</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.52.1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.52.1</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.52.1</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>1.56.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.56.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>1.56.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -1810,9 +1774,9 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.52.1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.52.1</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.52.1</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>1.56.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.56.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>1.56.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -1823,10 +1787,10 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-googleapis</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.52.1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.52.1</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.52.1</license.ignoreLicenseOverride>
- <license.ignoreNoticeOverride>1.52.1</license.ignoreNoticeOverride>
+ <license.ignoreMissingEmbeddedLicense>1.56.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.56.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>1.56.1</license.ignoreNoticeOverride>
+ <license.ignoreNoticeOverride>1.56.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -1837,9 +1801,9 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-grpclb</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.52.1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.52.1</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.52.1</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>1.56.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.56.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>1.56.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -1850,9 +1814,9 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf-lite</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.52.1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.52.1</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.52.1</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>1.56.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.56.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>1.56.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -1863,9 +1827,22 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.52.1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.52.1</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.52.1</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>1.56.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.56.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>1.56.1</license.ignoreNoticeOverride>
+ </properties>
+ </project>
+ </supplement>
+
+ <!-- io.grpc uses ALv2 -->
+ <supplement>
+ <project>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-rls</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>1.56.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.56.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>1.56.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -1876,9 +1853,9 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-services</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.52.1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.52.1</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.52.1</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>1.56.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.56.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>1.56.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -1889,9 +1866,9 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.52.1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.52.1</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.52.1</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>1.56.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.56.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>1.56.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -1902,100 +1879,9 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-xds</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.52.1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.52.1</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.52.1</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
- <!-- io.grpc uses ALv2 -->
- <supplement>
- <project>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-core</artifactId>
- <properties>
- <license.ignoreMissingEmbeddedLicense>1.43.2</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.43.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.43.2</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
- <!-- io.grpc uses ALv2 -->
- <supplement>
- <project>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-grpclb</artifactId>
- <properties>
- <license.ignoreMissingEmbeddedLicense>1.43.2</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.43.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.43.2</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
- <!-- io.grpc uses ALv2 -->
- <supplement>
- <project>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-protobuf-lite</artifactId>
- <properties>
- <license.ignoreMissingEmbeddedLicense>1.43.2</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.43.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.43.2</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
- <!-- io.grpc uses ALv2 -->
- <supplement>
- <project>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-protobuf</artifactId>
- <properties>
- <license.ignoreMissingEmbeddedLicense>1.43.2</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.43.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.43.2</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
- <!-- io.grpc uses ALv2 -->
- <supplement>
- <project>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-services</artifactId>
- <properties>
- <license.ignoreMissingEmbeddedLicense>1.43.2</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.43.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.43.2</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
- <!-- io.grpc uses ALv2 -->
- <supplement>
- <project>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-stub</artifactId>
- <properties>
- <license.ignoreMissingEmbeddedLicense>1.43.2</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.43.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.43.2</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
- <!-- io.grpc uses ALv2 -->
- <supplement>
- <project>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-xds</artifactId>
- <properties>
- <license.ignoreMissingEmbeddedLicense>1.43.2</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.43.2</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.43.2</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>1.56.1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.56.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreNoticeOverride>1.56.1</license.ignoreNoticeOverride>
</properties>
</project>
</supplement>
@@ -2006,9 +1892,8 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>3.21.12</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>3.21.12</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>3.21.12</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>3.23.2</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>3.23.2</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -2019,9 +1904,19 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>3.21.12</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>3.21.12</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>3.21.12</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>3.23.2</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>3.23.2</license.ignoreMissingEmbeddedNotice>
+ </properties>
+ </project>
+ </supplement>
+
+ <supplement>
+ <project>
+ <groupId>com.google.re2j</groupId>
+ <artifactId>re2j</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>1.7</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.7</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -2032,7 +1927,7 @@
<groupId>org.threeten</groupId>
<artifactId>threetenbp</artifactId>
<properties>
- <license.ignoreMissingEmbeddedNotice>1.6.5</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedNotice>1.6.8</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -2043,8 +1938,8 @@
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-jackson2</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.42.3</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.42.3</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.43.3</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.43.3</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -2055,8 +1950,8 @@
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.42.3</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.42.3</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.43.3</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.43.3</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -2067,8 +1962,8 @@
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-appengine</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.42.3</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.42.3</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.43.3</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.43.3</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -2079,8 +1974,8 @@
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-apache-v2</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.42.3</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.42.3</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.43.3</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.43.3</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -2091,8 +1986,8 @@
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-gson</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.42.3</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.42.3</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.43.3</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.43.3</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -2142,7 +2037,7 @@
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<properties>
- <license.ignoreMissingEmbeddedNotice>3.29.0</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedNotice>3.33.0</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -2153,8 +2048,8 @@
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.10.1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.10.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.10.2</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.10.2</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -2165,8 +2060,8 @@
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value-annotations</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.10.1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.10.1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.10.2</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.10.2</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -2189,8 +2084,8 @@
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-storage</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>v1-rev20220705-2.0.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>v1-rev20220705-2.0.0</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>v1-rev20230617-2.0.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>v1-rev20230617-2.0.0</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -2214,8 +2109,8 @@
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-iam-v1</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.8.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.8.0</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.18.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.18.0</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -2226,8 +2121,8 @@
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>2.13.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.13.0</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>2.23.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.23.0</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -2238,8 +2133,8 @@
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>2.17.2</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>2.17.2</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>2.26.0</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.26.0</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -2250,8 +2145,8 @@
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.3</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.3</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>2.8</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>2.8</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -2486,26 +2381,13 @@
</project>
</supplement>
+ <!-- Contains embedded LICENSE but missing NOTICE -->
<supplement>
<project>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
<properties>
- <license.ignoreMissingEmbeddedNotice>1.60</license.ignoreMissingEmbeddedNotice>
- <license.ignoreMissingEmbeddedLicense>1.60</license.ignoreMissingEmbeddedLicense>
- <license.ignoreLicenseOverride>1.60</license.ignoreLicenseOverride>
- </properties>
- </project>
- </supplement>
-
- <supplement>
- <project>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <properties>
- <license.ignoreMissingEmbeddedNotice>1.60</license.ignoreMissingEmbeddedNotice>
- <license.ignoreMissingEmbeddedLicense>1.60</license.ignoreMissingEmbeddedLicense>
- <license.ignoreLicenseOverride>1.60</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedNotice>1.5.4</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
diff --git a/asterixdb/src/main/licenses/content/github.com_googleapis_api-common-java_blob_main_LICENSE.txt b/asterixdb/src/main/licenses/content/github.com_googleapis_api-common-java_blob_main_LICENSE.txt
new file mode 100644
index 0000000..7fea74e
--- /dev/null
+++ b/asterixdb/src/main/licenses/content/github.com_googleapis_api-common-java_blob_main_LICENSE.txt
@@ -0,0 +1,26 @@
+Copyright 2016, Google Inc.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/asterixdb/src/main/licenses/content/github.com_googleapis_gax-java_blob_master_LICENSE.txt b/asterixdb/src/main/licenses/content/github.com_googleapis_gax-java_blob_master_LICENSE.txt
new file mode 100644
index 0000000..267561b
--- /dev/null
+++ b/asterixdb/src/main/licenses/content/github.com_googleapis_gax-java_blob_master_LICENSE.txt
@@ -0,0 +1,27 @@
+Copyright 2016, Google Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/asterixdb/src/main/licenses/content/opensource.org_licenses_BSD-3-Clause.txt b/asterixdb/src/main/licenses/content/opensource.org_licenses_BSD-3-Clause.txt
new file mode 100644
index 0000000..fe354c5
--- /dev/null
+++ b/asterixdb/src/main/licenses/content/opensource.org_licenses_BSD-3-Clause.txt
@@ -0,0 +1,11 @@
+Copyright <YEAR> <COPYRIGHT HOLDER>
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_grpc_grpc-java_v1.50.2_NOTICE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_grpc_grpc-java_v1.50.2_NOTICE.txt
deleted file mode 100644
index c5d3ec2..0000000
--- a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_grpc_grpc-java_v1.50.2_NOTICE.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-Copyright 2014 The gRPC Authors
-
-Licensed 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
-
- http://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.
-
------------------------------------------------------------------------
-
-This product contains a modified portion of 'OkHttp', an open source
-HTTP & SPDY client for Android and Java applications, which can be obtained
-at:
-
- * LICENSE:
- * okhttp/third_party/okhttp/LICENSE (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/square/okhttp
- * LOCATION_IN_GRPC:
- * okhttp/third_party/okhttp
-
-This product contains a modified portion of 'Envoy', an open source
-cloud-native high-performance edge/middle/service proxy, which can be
-obtained at:
-
- * LICENSE:
- * xds/third_party/envoy/LICENSE (Apache License 2.0)
- * NOTICE:
- * xds/third_party/envoy/NOTICE
- * HOMEPAGE:
- * https://www.envoyproxy.io
- * LOCATION_IN_GRPC:
- * xds/third_party/envoy
-
-This product contains a modified portion of 'protoc-gen-validate (PGV)',
-an open source protoc plugin to generate polyglot message validators,
-which can be obtained at:
-
- * LICENSE:
- * xds/third_party/protoc-gen-validate/LICENSE (Apache License 2.0)
- * NOTICE:
- * xds/third_party/protoc-gen-validate/NOTICE
- * HOMEPAGE:
- * https://github.com/envoyproxy/protoc-gen-validate
- * LOCATION_IN_GRPC:
- * xds/third_party/protoc-gen-validate
-
-This product contains a modified portion of 'udpa',
-an open source universal data plane API, which can be obtained at:
-
- * LICENSE:
- * xds/third_party/udpa/LICENSE (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/cncf/udpa
- * LOCATION_IN_GRPC:
- * xds/third_party/udpa
\ No newline at end of file
diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_grpc_grpc-java_v1.52.1_NOTICE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_grpc_grpc-java_v1.56.1_NOTICE.txt
similarity index 100%
rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_grpc_grpc-java_v1.52.1_NOTICE.txt
rename to asterixdb/src/main/licenses/content/raw.githubusercontent.com_grpc_grpc-java_v1.56.1_NOTICE.txt
diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_xerial_snappy-java_v1.1.10.1_NOTICE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_xerial_snappy-java_v1.1.10.5_NOTICE.txt
similarity index 62%
rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_xerial_snappy-java_v1.1.10.1_NOTICE.txt
rename to asterixdb/src/main/licenses/content/raw.githubusercontent.com_xerial_snappy-java_v1.1.10.5_NOTICE.txt
index 19301705..20b1317 100644
--- a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_xerial_snappy-java_v1.1.10.1_NOTICE.txt
+++ b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_xerial_snappy-java_v1.1.10.5_NOTICE.txt
@@ -5,8 +5,8 @@
PureJavaCrc32C from apache-hadoop-common http://hadoop.apache.org/
(Apache 2.0 license)
-This library containd statically linked libstdc++. This inclusion is allowed by
-"GCC RUntime Library Exception"
+This library contains statically linked libstdc++. This inclusion is allowed by
+"GCC Runtime Library Exception"
http://gcc.gnu.org/onlinedocs/libstdc++/manual/license.html
== Contributors ==
@@ -14,3 +14,9 @@
* Providing benchmark suite
* Alec Wysoker
* Performance and memory usage improvement
+
+Third-Party Notices and Licenses:
+
+- Hadoop: Apache Hadoop is used as a dependency
+ License: Apache License 2.0
+ Source/Reference: https://github.com/apache/hadoop/blob/trunk/NOTICE.txt
\ No newline at end of file
diff --git a/asterixdb/src/main/licenses/content/spdx.org_licenses_MIT.txt b/asterixdb/src/main/licenses/content/spdx.org_licenses_MIT.txt
new file mode 100644
index 0000000..3f28a5f
--- /dev/null
+++ b/asterixdb/src/main/licenses/content/spdx.org_licenses_MIT.txt
@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+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.
\ No newline at end of file
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/IJobManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/IJobManager.java
index a9ddee3..b2795d4 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/IJobManager.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/IJobManager.java
@@ -112,6 +112,11 @@
Collection<JobRun> getRunningJobs();
/**
+ * @return number of jobs that are currently running.
+ */
+ int getRunningJobsCount();
+
+ /**
* @return all jobs that are currently waiting in the job queue.
*/
Collection<JobRun> getPendingJobs();
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
index 9850ee2..4882f4a 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
@@ -264,6 +264,11 @@
}
@Override
+ public int getRunningJobsCount() {
+ return activeRunMap.size();
+ }
+
+ @Override
public Collection<JobRun> getPendingJobs() {
return jobQueue.jobs();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
index 33526f1..237d799 100644
--- a/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml
@@ -159,15 +159,6 @@
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
- <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 -->
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util-ajax</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -190,11 +181,6 @@
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</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>
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 7070ca6..0601b2f 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -70,10 +70,10 @@
<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>3.3.1</hadoop.version>
+ <hadoop.version>3.3.6</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.19.0</log4j.version>
- <snappy.version>1.1.10.1</snappy.version>
+ <snappy.version>1.1.10.5</snappy.version>
<jackson.version>2.14.3</jackson.version>
<jackson-databind.version>${jackson.version}</jackson-databind.version>
<netty.version>4.1.94.Final</netty.version>
@@ -200,17 +200,8 @@
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
<exclusion>
- <groupId>ch.qos.reload4j</groupId>
- <artifactId>reload4j</artifactId>
- </exclusion>
- <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 -->
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util-ajax</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -231,15 +222,6 @@
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
- <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 -->
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util-ajax</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -255,14 +237,9 @@
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion>
- <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 -->
<exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util-ajax</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -270,13 +247,6 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
<version>${hadoop.version}</version>
- <!-- TODO(htowaileb): Remove after updating to hadoop 3.3.4 -->
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -293,11 +263,6 @@
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</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>
@@ -333,7 +298,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>31.1-jre</version>
+ <version>32.1.2-jre</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
@@ -492,18 +457,6 @@
<artifactId>snappy-java</artifactId>
<version>${snappy.version}</version>
</dependency>
- <!-- TODO(htowaileb): removed from hadoop transitively and added separately to avoid CVEs, can
- be removed once upgraded to hadoop 3.3.4 as it addresses the CVEs -->
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>9.4.51.v20230217</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util-ajax</artifactId>
- <version>9.4.51.v20230217</version>
- </dependency>
<!-- Manually included to avoid CVE-2023-1370 -->
<dependency>
<groupId>net.minidev</groupId>