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:52:33 UTC
[nifi] 06/10: NIFI-11416 Upgraded Caffeine from 2.8.1 to 3.1.6
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit b0997f843de5770217ce8314ddf31154062ee76a
Author: Pierre Villard <pi...@gmail.com>
AuthorDate: Sat Apr 8 18:23:31 2023 +0300
NIFI-11416 Upgraded Caffeine from 2.8.1 to 3.1.6
This closes #7147
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 dac8261d5b..701e35025d 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 c848822cbd..c1a8b0a82d 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 a2ecbe0b44..624bc50878 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 54a5cbbea5..e1120df7ef 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 b7be66479d..4aadc8b01b 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 b2a1500e6e..9c1496f2b4 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 5e6daf64c9..7c403cc88d 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
@@ -298,7 +298,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 fb428430ab..7076517829 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 3b1f1b944f..750f67b1b0 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 109e728528..1d1babf4d3 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 50f58bdd23..e267779f75 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 0288650c58..ee873ce520 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 3ddaa9db57..d8b602f65c 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 d6d36aee27..de353253dc 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>3.1.6</caffeine.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -725,6 +726,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>