You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ex...@apache.org on 2023/04/10 13:56:16 UTC
[nifi] 10/10: NIFI-11417 Upgraded Caffeine from 2.8.1 to 2.9.3
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 5255d1bad3b02f1966f04971c71e60cfb4c7a452
Author: Pierre Villard <pi...@gmail.com>
AuthorDate: Sat Apr 8 18:23:31 2023 +0300
NIFI-11417 Upgraded Caffeine from 2.8.1 to 2.9.3
This closes #7148
Signed-off-by: David Handermann <ex...@apache.org>
---
nifi-commons/nifi-record-path/pom.xml | 1 -
nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml | 1 -
nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml | 1 -
nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml | 1 -
.../nifi-record-utils/nifi-avro-record-utils/pom.xml | 1 -
.../nifi-framework/nifi-flowfile-repo-serialization/pom.xml | 1 -
.../nifi-framework/nifi-framework-core/pom.xml | 1 -
nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml | 1 -
.../nifi-jolt-record-bundle/nifi-jolt-record-processors/pom.xml | 1 -
nifi-nar-bundles/nifi-jslt-bundle/nifi-jslt-processors/pom.xml | 1 -
.../nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml | 1 -
.../nifi-record-serialization-services/pom.xml | 1 -
.../nifi-update-attribute-processor/pom.xml | 1 -
pom.xml | 6 ++++++
14 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/nifi-commons/nifi-record-path/pom.xml b/nifi-commons/nifi-record-path/pom.xml
index 55840886f4..2f63dce3be 100644
--- a/nifi-commons/nifi-record-path/pom.xml
+++ b/nifi-commons/nifi-record-path/pom.xml
@@ -114,7 +114,6 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
- <version>2.8.1</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
diff --git a/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml b/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml
index fc61edcf19..763286de75 100644
--- a/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml
+++ b/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml
@@ -60,7 +60,6 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
- <version>2.8.1</version>
</dependency>
<dependency>
<groupId>antlr</groupId>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
index 9e6b32b17f..9cf0bf2722 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
@@ -108,7 +108,6 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
- <version>2.9.2</version>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml
index 32bb1b4ecc..453c6b7356 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml
@@ -48,7 +48,6 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
- <version>2.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/pom.xml
index b5ae771bc4..c91740ff25 100755
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/pom.xml
@@ -40,7 +40,6 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
- <version>2.8.1</version>
</dependency>
<!-- Other modules using nifi-avro-record-utils are expected to have these APIs available, typically through a NAR dependency -->
<dependency>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/pom.xml
index d9ea6f8aee..1842536eac 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/pom.xml
@@ -59,7 +59,6 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
- <version>2.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
index 9f51012b4b..80090100c4 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
@@ -270,7 +270,6 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
- <version>2.8.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml
index 9a83f9b23c..975a4b8d98 100644
--- a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml
@@ -117,7 +117,6 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
- <version>2.9.2</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/pom.xml b/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/pom.xml
index 9bc21e808d..3e57850ce4 100644
--- a/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/pom.xml
@@ -69,7 +69,6 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
- <version>2.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-jslt-bundle/nifi-jslt-processors/pom.xml b/nifi-nar-bundles/nifi-jslt-bundle/nifi-jslt-processors/pom.xml
index 60662c997c..af58d38f41 100644
--- a/nifi-nar-bundles/nifi-jslt-bundle/nifi-jslt-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-jslt-bundle/nifi-jslt-processors/pom.xml
@@ -50,7 +50,6 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
- <version>2.9.3</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml b/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml
index 4189c155b3..d577f3bfc4 100644
--- a/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml
+++ b/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml
@@ -77,7 +77,6 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
- <version>2.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml
index 68c2b5e1d4..8e6cce3006 100755
--- a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml
@@ -113,7 +113,6 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
- <version>2.8.1</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
index 1732311697..e0715dafd4 100644
--- a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
+++ b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/pom.xml
@@ -38,7 +38,6 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
- <version>2.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/pom.xml b/pom.xml
index 3519ae9b88..e04ff48cce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,6 +146,7 @@
<swagger.annotations.version>1.6.10</swagger.annotations.version>
<h2.version>2.1.214</h2.version>
<zookeeper.version>3.8.1</zookeeper.version>
+ <caffeine.version>2.9.3</caffeine.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -691,6 +692,11 @@
<artifactId>jsoup</artifactId>
<version>1.15.4</version>
</dependency>
+ <dependency>
+ <groupId>com.github.ben-manes.caffeine</groupId>
+ <artifactId>caffeine</artifactId>
+ <version>${caffeine.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>