You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2022/02/14 17:30:54 UTC
[nifi] branch main updated: NIFI-9681 Upgraded Apache Commons DBCP to 2.9.0
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 f6f50e6 NIFI-9681 Upgraded Apache Commons DBCP to 2.9.0
f6f50e6 is described below
commit f6f50e6b3ac0ed9fef5ecb68e991f335792535aa
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Fri Feb 11 15:32:25 2022 -0600
NIFI-9681 Upgraded Apache Commons DBCP to 2.9.0
- Replaced module references to version 2.7.0 with managed dependency in nifi-nar-bundles
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #5763.
---
.../nifi-hive-bundle/nifi-hive-processors/pom.xml | 7 -------
.../nifi-hive-bundle/nifi-hive3-processors/pom.xml | 7 -------
.../nifi-hive-bundle/nifi-hive_1_1-processors/pom.xml | 7 -------
.../nifi-dbcp-service-bundle/nifi-dbcp-service/pom.xml | 7 -------
.../nifi-hadoop-dbcp-service/pom.xml | 7 -------
nifi-nar-bundles/pom.xml | 15 +++++++++++++++
6 files changed, 15 insertions(+), 35 deletions(-)
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 907deb9..e2634f1 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
@@ -193,13 +193,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.7.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml
index b3d25e8..2126ce4 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml
@@ -292,13 +292,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.7.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</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 4c7f47c..cf1ff0f 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
@@ -201,13 +201,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.7.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/pom.xml
index 8db6d80..fffcd56 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/pom.xml
@@ -90,13 +90,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.7.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/pom.xml
index 9fb8b3b..a85d8af 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/pom.xml
@@ -63,13 +63,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.7.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- We are compiling against hadoop-common to make use of UserGroupInformation, but we don't want to bundle it
into the NAR, users are expected to provided hadoop-common on the driver classpath, or a shaded JAR that includes it -->
diff --git a/nifi-nar-bundles/pom.xml b/nifi-nar-bundles/pom.xml
index 1df9681..415cd15 100755
--- a/nifi-nar-bundles/pom.xml
+++ b/nifi-nar-bundles/pom.xml
@@ -23,6 +23,9 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
<packaging>pom</packaging>
+ <properties>
+ <commons.dbcp2.version>2.9.0</commons.dbcp2.version>
+ </properties>
<modules>
<module>nifi-framework-bundle</module>
<module>nifi-hadoop-bundle</module>
@@ -342,6 +345,18 @@
<version>1.16.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
+ <!-- Managed dependency versions applicable to all modules -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-dbcp2</artifactId>
+ <version>${commons.dbcp2.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>