2019-05-28 20:14:09 -04:00
|
|
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
2017-05-19 12:45:14 -04:00
|
|
|
<!-- Licensed to the Apache Software Foundation (ASF) under one or more
|
|
|
|
contributor license agreements. See the NOTICE file distributed with this
|
|
|
|
work for additional information regarding copyright ownership. The ASF licenses
|
|
|
|
this file to You under the Apache License, Version 2.0 (the "License"); you
|
|
|
|
may not use this file except in compliance with the License. You may obtain
|
|
|
|
a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
|
|
|
|
required by applicable law or agreed to in writing, software distributed
|
|
|
|
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
|
|
|
|
OR CONDITIONS OF ANY KIND, either express or implied. See the License for
|
2017-05-10 13:09:45 -04:00
|
|
|
the specific language governing permissions and limitations under the License. -->
|
|
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
|
<parent>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-lookup-services-bundle</artifactId>
|
2021-11-03 11:53:37 -04:00
|
|
|
<version>1.16.0-SNAPSHOT</version>
|
2017-05-10 13:09:45 -04:00
|
|
|
</parent>
|
|
|
|
<artifactId>nifi-lookup-services</artifactId>
|
|
|
|
<packaging>jar</packaging>
|
|
|
|
|
|
|
|
<dependencies>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-api</artifactId>
|
|
|
|
</dependency>
|
2017-05-19 12:45:14 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-processor-utils</artifactId>
|
2021-11-03 11:53:37 -04:00
|
|
|
<version>1.16.0-SNAPSHOT</version>
|
2017-05-19 12:45:14 -04:00
|
|
|
</dependency>
|
2017-05-10 13:09:45 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-lookup-service-api</artifactId>
|
|
|
|
</dependency>
|
2018-03-15 16:28:26 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-distributed-cache-client-service-api</artifactId>
|
|
|
|
</dependency>
|
2017-05-10 13:09:45 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-utils</artifactId>
|
2021-11-03 11:53:37 -04:00
|
|
|
<version>1.16.0-SNAPSHOT</version>
|
2017-05-10 13:09:45 -04:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-record</artifactId>
|
|
|
|
</dependency>
|
2018-05-18 20:08:41 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-expression-language</artifactId>
|
2021-11-03 11:53:37 -04:00
|
|
|
<version>1.16.0-SNAPSHOT</version>
|
2018-05-18 20:08:41 -04:00
|
|
|
</dependency>
|
2017-05-19 12:45:14 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.commons</groupId>
|
|
|
|
<artifactId>commons-configuration2</artifactId>
|
2020-05-25 07:12:40 -04:00
|
|
|
<version>2.7</version>
|
2017-05-19 12:45:14 -04:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.commons</groupId>
|
|
|
|
<artifactId>commons-csv</artifactId>
|
2020-02-23 18:44:28 -05:00
|
|
|
<version>1.8</version>
|
2017-05-19 12:45:14 -04:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>commons-beanutils</groupId>
|
|
|
|
<artifactId>commons-beanutils</artifactId>
|
2020-02-23 18:44:28 -05:00
|
|
|
<version>1.9.4</version>
|
2017-05-19 12:45:14 -04:00
|
|
|
</dependency>
|
2017-05-10 13:09:45 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>com.maxmind.geoip2</groupId>
|
|
|
|
<artifactId>geoip2</artifactId>
|
2019-03-13 17:50:57 -04:00
|
|
|
<version>2.12.0</version>
|
2017-05-10 13:09:45 -04:00
|
|
|
<exclusions>
|
|
|
|
<exclusion>
|
|
|
|
<groupId>com.google.code.findbugs</groupId>
|
|
|
|
<artifactId>jsr305</artifactId>
|
|
|
|
</exclusion>
|
|
|
|
</exclusions>
|
|
|
|
</dependency>
|
2018-05-18 20:08:41 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>com.squareup.okhttp3</groupId>
|
|
|
|
<artifactId>okhttp</artifactId>
|
2021-10-01 15:50:51 -04:00
|
|
|
<version>${okhttp.version}</version>
|
2018-05-18 20:08:41 -04:00
|
|
|
</dependency>
|
2017-05-19 12:45:14 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
2019-02-27 16:17:46 -05:00
|
|
|
<artifactId>nifi-database-utils</artifactId>
|
2021-11-03 11:53:37 -04:00
|
|
|
<version>1.16.0-SNAPSHOT</version>
|
2017-05-19 12:45:14 -04:00
|
|
|
</dependency>
|
2018-05-18 20:08:41 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-record-serialization-service-api</artifactId>
|
|
|
|
<scope>compile</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-ssl-context-service-api</artifactId>
|
|
|
|
<scope>compile</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-record-path</artifactId>
|
2021-11-03 11:53:37 -04:00
|
|
|
<version>1.16.0-SNAPSHOT</version>
|
2018-05-18 20:08:41 -04:00
|
|
|
<scope>compile</scope>
|
|
|
|
</dependency>
|
2019-02-27 16:17:46 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-dbcp-service-api</artifactId>
|
2021-11-03 11:53:37 -04:00
|
|
|
<version>1.16.0-SNAPSHOT</version>
|
2019-02-27 16:17:46 -05:00
|
|
|
<scope>compile</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
2021-05-24 17:17:17 -04:00
|
|
|
<groupId>io.github.rburgst</groupId>
|
2019-02-27 16:17:46 -05:00
|
|
|
<artifactId>okhttp-digest</artifactId>
|
2021-05-24 17:17:17 -04:00
|
|
|
<version>2.5</version>
|
2019-02-27 16:17:46 -05:00
|
|
|
<scope>compile</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-mock</artifactId>
|
2021-11-03 11:53:37 -04:00
|
|
|
<version>1.16.0-SNAPSHOT</version>
|
2019-02-27 16:17:46 -05:00
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
2018-05-18 20:08:41 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-mock-record-utils</artifactId>
|
2021-11-03 11:53:37 -04:00
|
|
|
<version>1.16.0-SNAPSHOT</version>
|
2018-05-18 20:08:41 -04:00
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-proxy-configuration-api</artifactId>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-record-serialization-services</artifactId>
|
2021-11-03 11:53:37 -04:00
|
|
|
<version>1.16.0-SNAPSHOT</version>
|
2018-05-18 20:08:41 -04:00
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-schema-registry-service-api</artifactId>
|
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>javax.servlet</groupId>
|
|
|
|
<artifactId>javax.servlet-api</artifactId>
|
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-standard-web-test-utils</artifactId>
|
2021-11-03 11:53:37 -04:00
|
|
|
<version>1.16.0-SNAPSHOT</version>
|
2018-05-18 20:08:41 -04:00
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
|
|
<artifactId>jetty-servlet</artifactId>
|
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
2019-02-27 16:17:46 -05:00
|
|
|
<groupId>org.apache.derby</groupId>
|
|
|
|
<artifactId>derby</artifactId>
|
2021-05-24 08:24:11 -04:00
|
|
|
<version>10.14.2.0</version>
|
2019-02-27 16:17:46 -05:00
|
|
|
<scope>test</scope>
|
2018-05-18 20:08:41 -04:00
|
|
|
</dependency>
|
NIFI-5254 Upgraded Groovy to version 2.5.4
Updated pom files regarding groovy dependencies. groovy-all was changed to a pom type dependency
Added Groovy Bintray as a plugin repository in root pom
Upgraded spock-core to version 1.3-groovy-2.5 and added exclusion of groovy dependencies to force spock to use the version from dependencyManagement
Updated groovy-eclipse-batch to use the groovy.version property to determine the version
Updated groovy-eclipse-compiler to 3.4.0-01
Updated maven-compiler-plugin to use maven.compiler.source and maven.compiler.target properties for source and target configuration properties
Removed configuration and dependencies sections from nifi-toolkit-admin and nifi-toolkit-encrypt-config maven-compiler-plugin configurations so that the configuration from the root pom's maven-compiler-plugin is inherited
Removed dependencyManagement from nifi-jetty module, version of groovy modules will be inherited from root pom
Removed maven-compiler-plugin configuration from nifi-toolkit-api so that the configuration from the root pom's maven-compiler-plugin is inherited
Updated spock-core dependencyManagement to 1.3-groovy-2.5
Fixed AESSensitivePropertyProviderTest issue with Groovy creating KEY_256_HEX slice of the wrong size due to BigDecimal being used as the result of the division; using intdiv to force an integer result creates the correctly sized array
Added groovy-json test dependency to nifi-web-security
Removed maven-compiler-plugin configuration from nifi-lookup-services, nifi-mock-record-utils, and nifi-web-utils so that the configuration from the root pom's maven-compiler-plugin is inherited
Updated root pom pluginManagement to specify version 3.8.0 of maven-compiler-plugin
Added maven-compiler-plugin config to nifi-toolkit-admin and nifi-toolkit-encrypt-config to use groovy-eclipse-compiler during the compile phase so that the groovy-based tools are compiled
Addressed deprecated CliBuilder and OptionAccessor usage in nifi-toolkit-encrypt-config, those classes were moved from groovy.util to groovy.cli.commons
Removed getInner() usage from nifi-toolkit-encrypt-config, method no longer exists causing the tests to crash
Updated CryptographicHashAttributeTest to use java.time classes instead of java.util.Date
Updated nifi root POM's groovy-test dependency to be test-scoped
Added properties for specifying groovy versions for several modules: nifi, nifi-groovyx-bundle, nifi-scripting-bundle, nifi-toolkit
Established dependency management for groovy-all:pom:2.5.4, and added that dependency to several modules: nifi-groovyx-nar, nifi-scripting-nar, nifi-toolkit-admin, nifi-toolkit-encrypt-config
Added groovy version property usage to several modules that established a dependency on a groovy submodule that was not listed in its own or inherited dependency management
Removed unused build-helper-maven-plugin from nifi-toolkit-api's POM
Removed unnecessary groovy-eclipse-compiler build plugin config from nifi-web-utils' POM to use the inherited config for that plugin
Updated several modules' NOTICEs to include appropriate Groovy NOTICE content
Updated to list groovy-all:pom:2.5.4 and its transitive submodule dependencies to nifi-assembly, nifi-groovyx-nar, nifi-scripting-nar, and nifi-toolkit-assembly NOTICEs
Added missing groovy-all:jar:2.1.6 NOTICE to nifi-hive-nar and nifi-hive_1_1-nar NOTICEs
Added missing groovy-all:jar:2.4.11 NOTICE to nifi-hive3-nar NOTICE
Updated to list groovy-all:jar:2.4.16 nifi-other-graph-services-nar NOTICE
Removed Groovy NOTICE content from nifi-record-serialization-services-nar NOTICE, no Groovy modules are included in the NAR
NIFI-5254 Updated several modules' NOTICEs and LICENSEs to include appropriate content from the LICENSEs and NOTICEs bundled with Groovy modules which in turn are bundled with NiFi binary artifacts: nifi-assembly, nifi-groovyx-nar, nifi-hive-nar, nifi-hive3-nar, nifi-hive_1_1-nar, nifi-other-graph-services-nar, nifi-scripting-nar, nifi-toolkit-assembly
NIFI-5254 Updated NOTICEs and LICENSEs to include appropriate content from the LICENSEs and NOTICEs bundled with modules used by Groovy 2.5.4 which in turn are bundled with NiFi binary artifacts: nifi-assembly, nifi-groovyx-nar, nifi-scripting-nar, nifi-toolkit-assembly.
The following modules' LICENSE and NOTICE content were added: Apache Ant, Apache Commons CLI, JLine, JUnit Platform/Jupiter
This closes #3547
Signed-off-by: Mike Thomsen <mthomsen@apache.org>
2019-06-24 14:35:21 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.codehaus.groovy</groupId>
|
|
|
|
<artifactId>groovy-json</artifactId>
|
|
|
|
<version>${nifi.groovy.version}</version>
|
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
2020-09-11 16:30:08 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
2020-09-17 12:52:22 -04:00
|
|
|
<artifactId>nifi-security-utils</artifactId>
|
2021-11-03 11:53:37 -04:00
|
|
|
<version>1.16.0-SNAPSHOT</version>
|
2020-09-11 16:30:08 -04:00
|
|
|
</dependency>
|
2017-05-10 13:09:45 -04:00
|
|
|
</dependencies>
|
2017-05-19 12:45:14 -04:00
|
|
|
<build>
|
|
|
|
<plugins>
|
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.rat</groupId>
|
|
|
|
<artifactId>apache-rat-plugin</artifactId>
|
|
|
|
<configuration>
|
|
|
|
<excludes combine.children="append">
|
2018-05-18 20:08:41 -04:00
|
|
|
<exclude>src/test/resources/complex.avsc</exclude>
|
|
|
|
<exclude>src/test/resources/simple.avsc</exclude>
|
2017-05-19 12:45:14 -04:00
|
|
|
<exclude>src/test/resources/test.csv</exclude>
|
2020-08-25 05:10:02 -04:00
|
|
|
<exclude>src/test/resources/test_sep_escape_comment.csv</exclude>
|
2018-05-28 21:55:51 -04:00
|
|
|
<exclude>src/test/resources/test_Windows-31J.csv</exclude>
|
2017-05-19 12:45:14 -04:00
|
|
|
<exclude>src/test/resources/test.properties</exclude>
|
|
|
|
<exclude>src/test/resources/test.xml</exclude>
|
|
|
|
</excludes>
|
|
|
|
</configuration>
|
|
|
|
</plugin>
|
|
|
|
</plugins>
|
|
|
|
</build>
|
2017-05-10 13:09:45 -04:00
|
|
|
</project>
|