mirror of https://github.com/apache/nifi.git
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:
parent
150bfbe990
commit
16c4004d58
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
1
pom.xml
1
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>
|
||||
|
|
Loading…
Reference in New Issue