Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-10728 Upgraded Apache Derby from 10.14.2.0 to 10.16.1.1 

Signed-off-by: Matt Burgess <mattyb149@apache.org>

This closes #7497
This commit is contained in:
exceptionfactory 2023-07-16 13:06:13 -05:00 committed by Matt Burgess
parent 150bfbe990
commit 16c4004d58
12 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml
View File

@ -80,7 +80,13 @@
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId> <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> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

8
nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/pom.xml
View File

@ -95,7 +95,13 @@
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId> <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> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

6
nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml
View File

@ -174,6 +174,12 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </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> <dependency>
<groupId>org.apache.hive.hcatalog</groupId> <groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog-server-extensions</artifactId> <artifactId>hive-hcatalog-server-extensions</artifactId>

2
nifi-nar-bundles/nifi-hive-bundle/pom.xml
View File

@ -80,7 +80,7 @@
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId> <artifactId>derby</artifactId>
<version>10.14.2.0</version> <version>${derby.version}</version>
</dependency> </dependency>
<!-- Override zookeeper --> <!-- Override zookeeper -->
<dependency> <dependency>

6
nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/pom.xml
View File

@ -281,6 +281,12 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </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 --> <!-- Test dependencies -->
<dependency> <dependency>

2
nifi-nar-bundles/nifi-iceberg-bundle/pom.xml
View File

@ -67,7 +67,7 @@
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId> <artifactId>derby</artifactId>
<version>10.14.2.0</version> <version>${derby.version}</version>
</dependency> </dependency>
<!-- Override zookeeper --> <!-- Override zookeeper -->
<dependency> <dependency>

5
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
View File

@ -371,6 +371,11 @@
<artifactId>derby</artifactId> <artifactId>derby</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.xerial.snappy</groupId> <groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId> <artifactId>snappy-java</artifactId>

7
nifi-nar-bundles/nifi-standard-bundle/pom.xml
View File

@ -169,7 +169,12 @@
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId> <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>
<dependency> <dependency>
<groupId>com.jayway.jsonpath</groupId> <groupId>com.jayway.jsonpath</groupId>

3
nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/pom.xml
View File

@ -21,9 +21,6 @@
</parent> </parent>
<artifactId>nifi-dbcp-service</artifactId> <artifactId>nifi-dbcp-service</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties>
<derby.version>10.16.1.1</derby.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>

3
nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/pom.xml
View File

@ -21,9 +21,6 @@
</parent> </parent>
<artifactId>nifi-hikari-dbcp-service</artifactId> <artifactId>nifi-hikari-dbcp-service</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties>
<derby.version>10.16.1.1</derby.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>

8
nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
View File

@ -167,7 +167,13 @@
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId> <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> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

1
pom.xml
View File

@ -120,6 +120,7 @@
<org.bouncycastle.version>1.75</org.bouncycastle.version> <org.bouncycastle.version>1.75</org.bouncycastle.version>
<testcontainers.version>1.18.3</testcontainers.version> <testcontainers.version>1.18.3</testcontainers.version>
<org.slf4j.version>2.0.7</org.slf4j.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> <ranger.version>2.4.0</ranger.version>
<jetty.version>9.4.51.v20230217</jetty.version> <jetty.version>9.4.51.v20230217</jetty.version>
<jackson.bom.version>2.15.2</jackson.bom.version> <jackson.bom.version>2.15.2</jackson.bom.version>