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

NIFI-8990 Upgraded Groovy to 2.5.14 

- Added dependency management override for Groovy 2.4.21 in Hive Processors
- Upgraded TinkerPop Gremlin to 3.5.1 in graph bundle to depend on Groovy 2.5.14
- Adjusted TlsHelperGroovyTest variable declaration to avoid compiler warnings

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

This closes #5276
This commit is contained in:
exceptionfactory 2021-08-03 07:50:13 -05:00 committed by Matthew Burgess
parent a239eea8ff
commit a4375a046f
No known key found for this signature in database
GPG Key ID: 05D3DEB8126DAD24
12 changed files with 53 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml
View File

@ -32,6 +32,22 @@
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>2.10.0</version> <version>2.10.0</version>
</dependency> </dependency>
<!-- Override Gremlin -->
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-core</artifactId>
<version>3.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-driver</artifactId>
<version>3.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-groovy</artifactId>
<version>3.5.1</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<dependencies> <dependencies>
@ -60,13 +76,18 @@
<dependency> <dependency>
<groupId>org.janusgraph</groupId> <groupId>org.janusgraph</groupId>
<artifactId>janusgraph-core</artifactId> <artifactId>janusgraph-core</artifactId>
<version>0.4.1</version> <version>0.5.3</version>
</dependency>
<dependency>
<groupId>org.janusgraph</groupId>
<artifactId>janusgraph-inmemory</artifactId>
<version>0.5.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.groovy</groupId> <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId> <artifactId>groovy</artifactId>
<version>2.5.4</version> <version>2.5.14</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>

6
nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/pom.xml
View File

@ -79,17 +79,17 @@
<dependency> <dependency>
<groupId>org.opencypher.gremlin</groupId> <groupId>org.opencypher.gremlin</groupId>
<artifactId>cypher-gremlin-neo4j-driver</artifactId> <artifactId>cypher-gremlin-neo4j-driver</artifactId>
<version>0.9.13</version> <version>1.0.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.tinkerpop</groupId> <groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-core</artifactId> <artifactId>gremlin-core</artifactId>
<version>3.3.5</version> <version>3.5.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.tinkerpop</groupId> <groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-driver</artifactId> <artifactId>gremlin-driver</artifactId>
<version>3.3.5</version> <version>3.5.1</version>
</dependency> </dependency>
</dependencies> </dependencies>

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

@ -31,7 +31,7 @@
</modules> </modules>
<properties> <properties>
<groovyx.groovy.version>2.5.4</groovyx.groovy.version> <groovyx.groovy.version>2.5.14</groovyx.groovy.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>

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

@ -85,6 +85,12 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- Override groovy-all:2.1.6 from Hive -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.4.21</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.hive.hcatalog</groupId> <groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog-core</artifactId> <artifactId>hive-hcatalog-core</artifactId>

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

@ -102,6 +102,12 @@
<artifactId>hive-hcatalog-core</artifactId> <artifactId>hive-hcatalog-core</artifactId>
<version>${hive.version}</version> <version>${hive.version}</version>
</dependency> </dependency>
<!-- Override groovy-all:2.4.11 from Hive -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.4.21</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>
<artifactId>nifi-hadoop-utils</artifactId> <artifactId>nifi-hadoop-utils</artifactId>

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

@ -63,6 +63,12 @@
<artifactId>nifi-kerberos-credentials-service-api</artifactId> <artifactId>nifi-kerberos-credentials-service-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- Override groovy-all:2.1.6 from Hive -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>2.4.21</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.hive</groupId> <groupId>org.apache.hive</groupId>
<artifactId>hive-jdbc</artifactId> <artifactId>hive-jdbc</artifactId>

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

@ -31,7 +31,7 @@
</modules> </modules>
<properties> <properties>
<scripting.groovy.version>2.5.4</scripting.groovy.version> <scripting.groovy.version>2.5.14</scripting.groovy.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>

4
nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml
View File

@ -506,13 +506,13 @@
<dependency> <dependency>
<groupId>org.codehaus.groovy</groupId> <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-json</artifactId> <artifactId>groovy-json</artifactId>
<version>2.5.4</version> <version>2.5.14</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.groovy</groupId> <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId> <artifactId>groovy</artifactId>
<version>2.5.4</version> <version>2.5.14</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

3
nifi-toolkit/nifi-toolkit-tls/src/test/groovy/org/apache/nifi/toolkit/tls/util/TlsHelperGroovyTest.groovy
View File

@ -128,7 +128,8 @@ class TlsHelperGroovyTest extends GroovyTestCase {
File keyFile = new File("src/test/resources/rootCert-pkcs8.key") File keyFile = new File("src/test/resources/rootCert-pkcs8.key")
FileReader keyReader = new FileReader(keyFile) FileReader keyReader = new FileReader(keyFile)
final PrivateKey EXPECTED_PRIVATE_KEY = TlsHelper.parseKeyPairFromReader(new FileReader(new File ("src/test/resources/rootCert.key"))).private final KeyPair expectedKeyPair = TlsHelper.parseKeyPairFromReader(new FileReader(new File ("src/test/resources/rootCert.key")))
final PrivateKey EXPECTED_PRIVATE_KEY = expectedKeyPair.getPrivate()
// Act // Act
KeyPair keyPair = TlsHelper.parseKeyPairFromReader(keyReader) KeyPair keyPair = TlsHelper.parseKeyPairFromReader(keyReader)

2
nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
View File

@ -66,7 +66,7 @@
<dependency> <dependency>
<groupId>org.codehaus.groovy</groupId> <groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId> <artifactId>groovy-all</artifactId>
<version>2.5.4</version> <version>${toolkit.groovy.version}</version>
<type>pom</type> <type>pom</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

2
nifi-toolkit/pom.xml
View File

@ -35,7 +35,7 @@
<module>nifi-toolkit-api</module> <module>nifi-toolkit-api</module>
</modules> </modules>
<properties> <properties>
<toolkit.groovy.version>2.5.4</toolkit.groovy.version> <toolkit.groovy.version>2.5.14</toolkit.groovy.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>

2
pom.xml
View File

@ -97,7 +97,7 @@
<ranger.version>2.1.0</ranger.version> <ranger.version>2.1.0</ranger.version>
<jetty.version>9.4.43.v20210629</jetty.version> <jetty.version>9.4.43.v20210629</jetty.version>
<jackson.version>2.12.3</jackson.version> <jackson.version>2.12.3</jackson.version>
<nifi.groovy.version>2.5.6</nifi.groovy.version> <nifi.groovy.version>2.5.14</nifi.groovy.version>
<surefire.version>2.22.2</surefire.version> <surefire.version>2.22.2</surefire.version>
<!-- The Hadoop version used by nifi-hadoop-libraries-nar and any NARs that depend on it, other NARs that need <!-- The Hadoop version used by nifi-hadoop-libraries-nar and any NARs that depend on it, other NARs that need
a specific version should override this property, or use a more specific property like abc.hadoop.version --> a specific version should override this property, or use a more specific property like abc.hadoop.version -->