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 2022/03/21 14:13:25 UTC
[nifi] branch main updated: NIFI-9788 Updated commons-codec to 1.15 across all modules.
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
The following commit(s) were added to refs/heads/main by this push:
new 2bb1a06 NIFI-9788 Updated commons-codec to 1.15 across all modules.
2bb1a06 is described below
commit 2bb1a06a8c5efa9eb95ebd9c26983190d09b4211
Author: Mike Thomsen <mt...@apache.org>
AuthorDate: Sun Mar 20 16:16:56 2022 -0400
NIFI-9788 Updated commons-codec to 1.15 across all modules.
This closes #5881
Signed-off-by: David Handermann <ex...@apache.org>
---
minifi/pom.xml | 1 -
nifi-commons/nifi-expression-language/pom.xml | 1 -
nifi-commons/nifi-property-encryptor/pom.xml | 1 -
nifi-commons/nifi-property-protection-cipher/pom.xml | 1 -
nifi-commons/nifi-record-path/pom.xml | 1 -
nifi-commons/nifi-security-kms/pom.xml | 1 -
nifi-commons/nifi-security-utils/pom.xml | 1 -
nifi-commons/nifi-uuid5/pom.xml | 1 -
nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml | 1 -
.../nifi-framework/nifi-file-authorizer/pom.xml | 1 +
.../nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml | 1 +
nifi-nar-bundles/nifi-framework-bundle/pom.xml | 1 -
nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml | 1 -
.../nifi-standard-bundle/nifi-standard-content-viewer/pom.xml | 1 +
.../nifi-standard-bundle/nifi-standard-processors/pom.xml | 1 +
nifi-nar-bundles/nifi-standard-bundle/pom.xml | 1 -
.../nifi-hbase_1_1_2-client-service/pom.xml | 10 ++++++++++
.../nifi-hbase_2-client-service/pom.xml | 8 ++++++++
.../nifi-registry-core/nifi-registry-framework/pom.xml | 1 -
nifi-toolkit/nifi-toolkit-cli/pom.xml | 1 -
pom.xml | 7 +++++++
21 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 7141584..8eb8e1d 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -511,7 +511,6 @@ limitations under the License.
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.10</version>
</dependency>
<dependency>
<groupId>commons-net</groupId>
diff --git a/nifi-commons/nifi-expression-language/pom.xml b/nifi-commons/nifi-expression-language/pom.xml
index d451a33..8d9d5f4 100644
--- a/nifi-commons/nifi-expression-language/pom.xml
+++ b/nifi-commons/nifi-expression-language/pom.xml
@@ -105,7 +105,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.14</version>
</dependency>
</dependencies>
</project>
diff --git a/nifi-commons/nifi-property-encryptor/pom.xml b/nifi-commons/nifi-property-encryptor/pom.xml
index fc727b0..9ab414d 100644
--- a/nifi-commons/nifi-property-encryptor/pom.xml
+++ b/nifi-commons/nifi-property-encryptor/pom.xml
@@ -38,7 +38,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.14</version>
</dependency>
</dependencies>
</project>
diff --git a/nifi-commons/nifi-property-protection-cipher/pom.xml b/nifi-commons/nifi-property-protection-cipher/pom.xml
index c30dcf7..b7b2fbf 100644
--- a/nifi-commons/nifi-property-protection-cipher/pom.xml
+++ b/nifi-commons/nifi-property-protection-cipher/pom.xml
@@ -30,7 +30,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.15</version>
</dependency>
</dependencies>
</project>
diff --git a/nifi-commons/nifi-record-path/pom.xml b/nifi-commons/nifi-record-path/pom.xml
index 11234a1..9aa5a01 100644
--- a/nifi-commons/nifi-record-path/pom.xml
+++ b/nifi-commons/nifi-record-path/pom.xml
@@ -89,7 +89,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.14</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/nifi-commons/nifi-security-kms/pom.xml b/nifi-commons/nifi-security-kms/pom.xml
index 9149221..9640286 100644
--- a/nifi-commons/nifi-security-kms/pom.xml
+++ b/nifi-commons/nifi-security-kms/pom.xml
@@ -25,7 +25,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.15</version>
</dependency>
</dependencies>
</project>
diff --git a/nifi-commons/nifi-security-utils/pom.xml b/nifi-commons/nifi-security-utils/pom.xml
index db5818b..bd1189a 100644
--- a/nifi-commons/nifi-security-utils/pom.xml
+++ b/nifi-commons/nifi-security-utils/pom.xml
@@ -54,7 +54,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.14</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
diff --git a/nifi-commons/nifi-uuid5/pom.xml b/nifi-commons/nifi-uuid5/pom.xml
index 9a2d125..6238b9e 100644
--- a/nifi-commons/nifi-uuid5/pom.xml
+++ b/nifi-commons/nifi-uuid5/pom.xml
@@ -24,7 +24,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.14</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml
index f0bab53..af25dd0 100644
--- a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml
@@ -48,7 +48,6 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.14</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/pom.xml
index 463868b..04344e3 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/pom.xml
@@ -223,6 +223,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
+ <version>1.15</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
index 71eaed2..6f5ea94 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
@@ -58,6 +58,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
+ <version>1.15</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 4d2d441..1eb5062 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -228,7 +228,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.14</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
diff --git a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml
index d2b1977..f8733d9 100755
--- a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml
@@ -58,7 +58,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.14</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
index f000a25..4e53d69 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
@@ -37,6 +37,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
+ <version>1.15</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
index 9c52b51..8800880 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
@@ -151,6 +151,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
+ <version>1.15</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index 4c99b8f..47d88f4 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -177,7 +177,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.14</version>
</dependency>
<dependency>
<groupId>com.hierynomus</groupId>
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml
index e4f82c7..94e2916 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml
@@ -83,6 +83,10 @@
<version>${hbase.version}</version>
<exclusions>
<exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
@@ -100,6 +104,12 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+
<dependency>
<groupId>com.github.stephenc.findbugs</groupId>
<artifactId>findbugs-annotations</artifactId>
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/pom.xml
index fb81002..f2e37e4 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/pom.xml
@@ -80,6 +80,10 @@
<version>${hbase.version}</version>
<exclusions>
<exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
@@ -103,6 +107,10 @@
<version>1.3.9-1</version>
</dependency>
<dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
index 0f4fbf7..1866cbd 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
@@ -340,7 +340,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.12</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
diff --git a/nifi-toolkit/nifi-toolkit-cli/pom.xml b/nifi-toolkit/nifi-toolkit-cli/pom.xml
index 58e2f02..6587798 100644
--- a/nifi-toolkit/nifi-toolkit-cli/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-cli/pom.xml
@@ -109,7 +109,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.14</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
diff --git a/pom.xml b/pom.xml
index dc5f85a..c734f1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -290,6 +290,13 @@
<version>${org.apache.httpcomponents.httpcore.version}</version>
</dependency>
+ <!-- Commons Codec -->
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.15</version>
+ </dependency>
+
<!-- These junit/mockito/groovy/spock/hamcrest dependencies are here to encourage consistent unit test library usage -->
<dependency>
<groupId>org.junit</groupId>