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 <pierre.villard.fr@gmail.com>

This closes #5763.
This commit is contained in:
exceptionfactory 2022-02-11 15:32:25 -06:00 committed by Pierre Villard
parent 766c4e392c
commit f6f50e6b3a
No known key found for this signature in database
GPG Key ID: F92A93B30C07C6D5
6 changed files with 15 additions and 35 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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 -->

View File

@ -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>