This is an automated email from the ASF dual-hosted git repository.
mattyb149 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 16c4004d58 NIFI-10728 Upgraded Apache Derby from 10.14.2.0 to 10.16.1.1
16c4004d58 is described below
commit 16c4004d58275e4ae109ac2808b1e2a583c2b4e9
Author: exceptionfactory <[email protected]>
AuthorDate: Sun Jul 16 13:06:13 2023 -0500
NIFI-10728 Upgraded Apache Derby from 10.14.2.0 to 10.16.1.1
Signed-off-by: Matt Burgess <[email protected]>
This closes #7497
---
nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml | 8 +++++++-
.../nifi-groovyx-bundle/nifi-groovyx-processors/pom.xml | 8 +++++++-
nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml | 6 ++++++
nifi-nar-bundles/nifi-hive-bundle/pom.xml | 2 +-
.../nifi-iceberg-bundle/nifi-iceberg-processors/pom.xml | 6 ++++++
nifi-nar-bundles/nifi-iceberg-bundle/pom.xml | 2 +-
.../nifi-standard-bundle/nifi-standard-processors/pom.xml | 5 +++++
nifi-nar-bundles/nifi-standard-bundle/pom.xml | 7 ++++++-
.../nifi-dbcp-service-bundle/nifi-dbcp-service/pom.xml | 3 ---
.../nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/pom.xml | 3 ---
.../nifi-lookup-services-bundle/nifi-lookup-services/pom.xml | 8 +++++++-
pom.xml | 1 +
12 files changed, 47 insertions(+), 12 deletions(-)
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 e1120df7ef..1c1106f78d 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
@@ -80,7 +80,13 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.14.2.0</version>
+ <version>${derby.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${derby.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/pom.xml
b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/pom.xml
index cc84b8e64f..becc80aa53 100644
--- a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/pom.xml
@@ -95,7 +95,13 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.14.2.0</version>
+ <version>${derby.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${derby.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml
b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml
index b14419e003..2b3328f454 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml
@@ -174,6 +174,12 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- Include Derby Tools since Derby 10.16 moved the EmbeddedDriver
class -->
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog-server-extensions</artifactId>
diff --git a/nifi-nar-bundles/nifi-hive-bundle/pom.xml
b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
index aa98029590..1ec8d2aabc 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
@@ -80,7 +80,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.14.2.0</version>
+ <version>${derby.version}</version>
</dependency>
<!-- Override zookeeper -->
<dependency>
diff --git
a/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/pom.xml
b/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/pom.xml
index 96e67ce03f..55a43b8a3c 100644
--- a/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/pom.xml
@@ -281,6 +281,12 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- Include Derby Tools since Derby 10.16 moved the EmbeddedDriver
class -->
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
<!-- Test dependencies -->
<dependency>
diff --git a/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml
b/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml
index 0a4e2b8703..5ef0893841 100644
--- a/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.14.2.0</version>
+ <version>${derby.version}</version>
</dependency>
<!-- Override zookeeper -->
<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 0aa05a9df0..8c00f9f64a 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
@@ -371,6 +371,11 @@
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index 38c85059af..54bb554e57 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -169,7 +169,12 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.14.2.0</version>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${derby.version}</version>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</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 a091d3f6d3..c8b430239d 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
@@ -21,9 +21,6 @@
</parent>
<artifactId>nifi-dbcp-service</artifactId>
<packaging>jar</packaging>
- <properties>
- <derby.version>10.16.1.1</derby.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/pom.xml
b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/pom.xml
index 395fee7321..9cbbc0fbd7 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/pom.xml
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/pom.xml
@@ -21,9 +21,6 @@
</parent>
<artifactId>nifi-hikari-dbcp-service</artifactId>
<packaging>jar</packaging>
- <properties>
- <derby.version>10.16.1.1</derby.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
index 2a1ba92a70..af9c124788 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
@@ -167,7 +167,13 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.14.2.0</version>
+ <version>${derby.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${derby.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 8153333280..edd78c681b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,6 +120,7 @@
<org.bouncycastle.version>1.75</org.bouncycastle.version>
<testcontainers.version>1.18.3</testcontainers.version>
<org.slf4j.version>2.0.7</org.slf4j.version>
+ <derby.version>10.16.1.1</derby.version>
<ranger.version>2.4.0</ranger.version>
<jetty.version>9.4.51.v20230217</jetty.version>
<jackson.bom.version>2.15.2</jackson.bom.version>
