This is an automated email from the ASF dual-hosted git repository.
thenatog pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 0dc02e26d2 NIFI-10648 Upgraded Apache Commons Text to 1.10.0
0dc02e26d2 is described below
commit 0dc02e26d2116d32b30bf2c16cfee5e66f6b6a93
Author: exceptionfactory <[email protected]>
AuthorDate: Fri Oct 14 09:19:57 2022 -0500
NIFI-10648 Upgraded Apache Commons Text to 1.10.0
- Added org.apache.commons.text.version property in root Maven configuration
- Removed direct version references in favor of managed dependency version
Signed-off-by: Nathan Gough <[email protected]>
This closes #6531.
---
nifi-commons/nifi-expression-language/pom.xml | 1 -
nifi-commons/nifi-flowfile-packager/pom.xml | 1 -
nifi-nar-bundles/nifi-azure-bundle/pom.xml | 5 -----
.../nifi-cassandra-bundle/nifi-cassandra-processors/pom.xml | 1 -
.../nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml | 1 -
.../nifi-record-utils/nifi-standard-record-utils/pom.xml | 1 -
.../nifi-framework/nifi-headless-server/pom.xml | 1 -
.../nifi-framework/nifi-web/nifi-jetty/pom.xml | 1 -
nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/pom.xml | 1 -
nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml | 1 -
nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/pom.xml | 1 -
nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/pom.xml | 1 -
.../nifi-record-serialization-services/pom.xml | 1 -
pom.xml | 6 ++++++
14 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/nifi-commons/nifi-expression-language/pom.xml
b/nifi-commons/nifi-expression-language/pom.xml
index 17bf8b2ec3..476b381129 100644
--- a/nifi-commons/nifi-expression-language/pom.xml
+++ b/nifi-commons/nifi-expression-language/pom.xml
@@ -95,7 +95,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.8</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/nifi-commons/nifi-flowfile-packager/pom.xml
b/nifi-commons/nifi-flowfile-packager/pom.xml
index 9fd0e9aeea..8534746059 100644
--- a/nifi-commons/nifi-flowfile-packager/pom.xml
+++ b/nifi-commons/nifi-flowfile-packager/pom.xml
@@ -34,7 +34,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.8</version>
</dependency>
</dependencies>
</project>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml
b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
index d6299133e9..01d99b716c 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
@@ -54,11 +54,6 @@
<artifactId>azure-storage</artifactId>
<version>${microsoft.azure-storage.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- <version>1.8</version>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
diff --git
a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/pom.xml
b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/pom.xml
index 1be6552067..f7f9ad7873 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/pom.xml
@@ -92,7 +92,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.8</version>
</dependency>
</dependencies>
</project>
diff --git
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml
index fa3608a762..bd6bb25caa 100644
---
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml
+++
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml
@@ -56,7 +56,6 @@ language governing permissions and limitations under the
License. -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.8</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git
a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/pom.xml
b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/pom.xml
index 56891a291e..3362c79ea0 100644
---
a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/pom.xml
+++
b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/pom.xml
@@ -59,7 +59,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.8</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-headless-server/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-headless-server/pom.xml
index ed7254b322..4875eead60 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-headless-server/pom.xml
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-headless-server/pom.xml
@@ -56,7 +56,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.8</version>
</dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
index 40112231f3..772714c90f 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
@@ -211,7 +211,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.8</version>
</dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>
diff --git a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/pom.xml
b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/pom.xml
index e303cd8f9a..d6660e6a60 100644
--- a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/pom.xml
@@ -88,7 +88,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.8</version>
</dependency>
</dependencies>
</project>
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml
index ca40e5290c..90818b8e77 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml
@@ -192,7 +192,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.8</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/pom.xml
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/pom.xml
index 6d2e90b1ee..7fb208899b 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/pom.xml
@@ -196,7 +196,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.8</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/pom.xml
b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/pom.xml
index f83fd0cf7e..935ff11007 100644
--- a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/pom.xml
@@ -86,7 +86,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.8</version>
</dependency>
</dependencies>
</project>
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 a56e54071a..78bb655c4b 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
@@ -109,7 +109,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.8</version>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
diff --git a/pom.xml b/pom.xml
index b0eafbc716..0403b41178 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,6 +111,7 @@
<okhttp.version>4.10.0</okhttp.version>
<org.apache.commons.lang3.version>3.12.0</org.apache.commons.lang3.version>
<org.apache.commons.io.version>2.11.0</org.apache.commons.io.version>
+
<org.apache.commons.text.version>1.10.0</org.apache.commons.text.version>
<org.apache.httpcomponents.httpclient.version>4.5.13</org.apache.httpcomponents.httpclient.version>
<org.apache.httpcomponents.httpcore.version>4.4.15</org.apache.httpcomponents.httpcore.version>
<org.bouncycastle.version>1.70</org.bouncycastle.version>
@@ -238,6 +239,11 @@
<artifactId>commons-lang3</artifactId>
<version>${org.apache.commons.lang3.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>${org.apache.commons.text.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
