2014-12-15 05:14:32 -05:00
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
2018-11-15 12:07:08 -05: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 the specific
|
2022-03-10 13:07:57 -05:00
|
|
|
language governing permissions and limitations under the License. -->
|
|
|
|
<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">
|
2014-12-15 05:14:32 -05:00
|
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
|
<parent>
|
2015-08-15 13:12:22 -04:00
|
|
|
<groupId>org.apache</groupId>
|
|
|
|
<artifactId>apache</artifactId>
|
2022-08-29 15:56:25 -04:00
|
|
|
<version>27</version>
|
2015-01-16 11:59:49 -05:00
|
|
|
<relativePath />
|
2014-12-15 05:14:32 -05:00
|
|
|
</parent>
|
2015-08-15 13:12:22 -04:00
|
|
|
<groupId>org.apache.nifi</groupId>
|
2015-01-21 01:47:48 -05:00
|
|
|
<artifactId>nifi</artifactId>
|
2022-10-03 13:59:36 -04:00
|
|
|
<version>1.19.0-SNAPSHOT</version>
|
2014-12-15 05:14:32 -05:00
|
|
|
<packaging>pom</packaging>
|
2015-07-16 12:35:37 -04:00
|
|
|
<description>Apache NiFi is an easy to use, powerful, and reliable system to process and distribute data.</description>
|
2014-12-15 05:14:32 -05:00
|
|
|
<modules>
|
2015-01-21 01:47:48 -05:00
|
|
|
<module>nifi-commons</module>
|
2014-12-15 05:14:32 -05:00
|
|
|
<module>nifi-api</module>
|
2016-07-13 09:28:19 -04:00
|
|
|
<module>nifi-framework-api</module>
|
2020-10-07 09:12:16 -04:00
|
|
|
<module>nifi-server-api</module>
|
2014-12-15 05:14:32 -05:00
|
|
|
<module>nifi-bootstrap</module>
|
|
|
|
<module>nifi-mock</module>
|
2015-01-21 01:47:48 -05:00
|
|
|
<module>nifi-nar-bundles</module>
|
|
|
|
<module>nifi-assembly</module>
|
2014-12-20 00:40:14 -05:00
|
|
|
<module>nifi-docs</module>
|
2015-01-22 08:53:23 -05:00
|
|
|
<module>nifi-maven-archetypes</module>
|
2015-03-16 22:48:14 -04:00
|
|
|
<module>nifi-external</module>
|
2016-12-29 15:36:04 -05:00
|
|
|
<module>nifi-docker</module>
|
2019-09-24 14:34:39 -04:00
|
|
|
<module>nifi-system-tests</module>
|
2020-12-10 10:25:09 -05:00
|
|
|
<module>minifi</module>
|
2021-05-19 13:17:48 -04:00
|
|
|
<module>nifi-stateless</module>
|
2021-05-26 09:34:55 -04:00
|
|
|
<module>nifi-registry</module>
|
2021-06-06 21:53:39 -04:00
|
|
|
<module>nifi-toolkit</module>
|
2021-12-06 17:05:03 -05:00
|
|
|
<module>nifi-manifest</module>
|
2021-12-10 09:12:38 -05:00
|
|
|
<module>c2</module>
|
2022-01-27 18:37:12 -05:00
|
|
|
<module>nifi-h2</module>
|
2021-05-19 13:17:48 -04:00
|
|
|
</modules>
|
2019-05-28 20:14:09 -04:00
|
|
|
<url>https://nifi.apache.org</url>
|
2015-08-15 13:12:22 -04:00
|
|
|
<organization>
|
|
|
|
<name>Apache NiFi Project</name>
|
2019-05-28 20:14:09 -04:00
|
|
|
<url>https://nifi.apache.org/</url>
|
2015-08-15 13:12:22 -04:00
|
|
|
</organization>
|
|
|
|
<licenses>
|
|
|
|
<license>
|
|
|
|
<name>Apache License, Version 2.0</name>
|
2019-05-28 20:14:09 -04:00
|
|
|
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
|
2015-08-15 13:12:22 -04:00
|
|
|
</license>
|
|
|
|
</licenses>
|
|
|
|
<mailingLists>
|
|
|
|
<mailingList>
|
|
|
|
<name>Dev</name>
|
|
|
|
<subscribe>dev-subscribe@nifi.apache.org</subscribe>
|
|
|
|
<unsubscribe>dev-unsubscribe@nifi.apache.org</unsubscribe>
|
|
|
|
<post>dev@nifi.apache.org</post>
|
2019-05-28 20:14:09 -04:00
|
|
|
<archive>https://mail-archives.apache.org/mod_mbox/nifi-dev</archive>
|
2015-08-15 13:12:22 -04:00
|
|
|
</mailingList>
|
|
|
|
<mailingList>
|
|
|
|
<name>Users</name>
|
|
|
|
<subscribe>users-subscribe@nifi.apache.org</subscribe>
|
|
|
|
<unsubscribe>users-unsubscribe@nifi.apache.org</unsubscribe>
|
|
|
|
<post>users@nifi.apache.org</post>
|
2019-05-28 20:14:09 -04:00
|
|
|
<archive>https://mail-archives.apache.org/mod_mbox/nifi-users</archive>
|
2015-08-15 13:12:22 -04:00
|
|
|
</mailingList>
|
|
|
|
<mailingList>
|
|
|
|
<name>Commits</name>
|
|
|
|
<subscribe>commits-subscribe@nifi.apache.org</subscribe>
|
|
|
|
<unsubscribe>commits-unsubscribe@nifi.apache.org</unsubscribe>
|
|
|
|
<post>commits@nifi.apache.org</post>
|
2019-05-28 20:14:09 -04:00
|
|
|
<archive>https://mail-archives.apache.org/mod_mbox/nifi-commits</archive>
|
2015-08-15 13:12:22 -04:00
|
|
|
</mailingList>
|
|
|
|
</mailingLists>
|
|
|
|
<scm>
|
|
|
|
<connection>scm:git:git://git.apache.org/nifi.git</connection>
|
|
|
|
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/nifi.git</developerConnection>
|
|
|
|
<url>https://git-wip-us.apache.org/repos/asf?p=nifi.git</url>
|
2022-07-27 16:24:09 -04:00
|
|
|
<tag>nifi-1.15.0-RC3</tag>
|
2015-08-15 13:12:22 -04:00
|
|
|
</scm>
|
|
|
|
<issueManagement>
|
|
|
|
<system>JIRA</system>
|
|
|
|
<url>https://issues.apache.org/jira/browse/NIFI</url>
|
2015-08-19 16:53:59 -04:00
|
|
|
</issueManagement>
|
2014-12-15 05:14:32 -05:00
|
|
|
<properties>
|
2016-04-14 09:28:25 -04:00
|
|
|
<maven.compiler.source>1.8</maven.compiler.source>
|
|
|
|
<maven.compiler.target>1.8</maven.compiler.target>
|
2021-08-06 12:56:28 -04:00
|
|
|
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
|
2022-04-06 19:24:31 -04:00
|
|
|
<!-- Set minimum Java version for maven-enforcer-plugin from parent POM -->
|
|
|
|
<minimalJavaBuildVersion>1.8.0-251</minimalJavaBuildVersion>
|
2020-01-19 14:14:38 -05:00
|
|
|
<maven.surefire.arguments />
|
2022-04-06 19:24:31 -04:00
|
|
|
<!-- Disable maven-site-plugin from parent POM -->
|
|
|
|
<maven.site.skip>true</maven.site.skip>
|
2022-01-20 17:26:48 -05:00
|
|
|
<node.version>v16.13.2</node.version>
|
|
|
|
<frontend.mvn.plugin.version>1.12.1</frontend.mvn.plugin.version>
|
2022-07-22 16:54:43 -04:00
|
|
|
<nifi.nar.maven.plugin.version>1.3.5</nifi.nar.maven.plugin.version>
|
2022-10-03 13:59:36 -04:00
|
|
|
<project.build.outputTimestamp>1664819974</project.build.outputTimestamp>
|
2015-08-15 13:12:22 -04:00
|
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
|
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
|
|
|
<inceptionYear>2014</inceptionYear>
|
2022-09-12 11:47:49 -04:00
|
|
|
<com.amazonaws.version>1.12.299</com.amazonaws.version>
|
|
|
|
<software.amazon.awssdk.version>2.17.270</software.amazon.awssdk.version>
|
2022-09-11 09:25:57 -04:00
|
|
|
<gson.version>2.9.1</gson.version>
|
2022-09-10 10:39:47 -04:00
|
|
|
<kotlin.version>1.7.10</kotlin.version>
|
2022-06-28 18:08:42 -04:00
|
|
|
<okhttp.version>4.10.0</okhttp.version>
|
2022-02-15 21:09:34 -05:00
|
|
|
<org.apache.commons.lang3.version>3.12.0</org.apache.commons.lang3.version>
|
2022-05-04 11:28:31 -04:00
|
|
|
<org.apache.commons.io.version>2.11.0</org.apache.commons.io.version>
|
2022-10-14 10:19:57 -04:00
|
|
|
<org.apache.commons.text.version>1.10.0</org.apache.commons.text.version>
|
2022-01-07 16:32:15 -05:00
|
|
|
<org.apache.httpcomponents.httpclient.version>4.5.13</org.apache.httpcomponents.httpclient.version>
|
|
|
|
<org.apache.httpcomponents.httpcore.version>4.4.15</org.apache.httpcomponents.httpcore.version>
|
2021-12-17 09:19:13 -05:00
|
|
|
<org.bouncycastle.version>1.70</org.bouncycastle.version>
|
2022-10-05 13:56:47 -04:00
|
|
|
<testcontainers.version>1.17.5</testcontainers.version>
|
2022-03-03 19:10:32 -05:00
|
|
|
<org.slf4j.version>1.7.36</org.slf4j.version>
|
2022-09-05 08:23:48 -04:00
|
|
|
<ranger.version>2.3.0</ranger.version>
|
2022-09-26 09:32:53 -04:00
|
|
|
<jetty.version>9.4.49.v20220914</jetty.version>
|
2022-10-18 11:14:45 -04:00
|
|
|
<jackson.bom.version>2.13.4.20221013</jackson.bom.version>
|
2022-08-03 07:45:25 -04:00
|
|
|
<avro.version>1.11.1</avro.version>
|
2021-08-19 16:42:13 -04:00
|
|
|
<jaxb.runtime.version>2.3.5</jaxb.runtime.version>
|
2022-07-11 05:19:49 -04:00
|
|
|
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
|
2021-08-19 16:42:13 -04:00
|
|
|
<jakarta.xml.bind-api.version>2.3.3</jakarta.xml.bind-api.version>
|
2022-04-28 22:35:15 -04:00
|
|
|
<json.smart.version>2.4.8</json.smart.version>
|
2022-06-30 12:19:23 -04:00
|
|
|
<nifi.groovy.version>3.0.9</nifi.groovy.version>
|
|
|
|
<groovy.eclipse.batch.version>3.0.8-01</groovy.eclipse.batch.version>
|
2022-06-16 20:08:47 -04:00
|
|
|
<surefire.version>3.0.0-M7</surefire.version>
|
2019-11-19 13:27:59 -05:00
|
|
|
<!-- 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 -->
|
2022-09-19 16:16:12 -04:00
|
|
|
<hadoop.version>3.3.4</hadoop.version>
|
2021-11-23 08:56:30 -05:00
|
|
|
<ozone.version>1.2.1</ozone.version>
|
2020-10-09 09:42:20 -04:00
|
|
|
<gcs.version>2.1.5</gcs.version>
|
2020-09-21 11:44:42 -04:00
|
|
|
<aspectj.version>1.9.6</aspectj.version>
|
2022-06-17 13:21:58 -04:00
|
|
|
<jersey.bom.version>2.36</jersey.bom.version>
|
2022-07-11 20:20:40 -04:00
|
|
|
<log4j2.version>2.18.0</log4j2.version>
|
2022-03-11 07:54:42 -05:00
|
|
|
<logback.version>1.2.11</logback.version>
|
2021-08-13 07:11:25 -04:00
|
|
|
<mockito.version>3.11.2</mockito.version>
|
2021-10-27 21:52:59 -04:00
|
|
|
<netty.3.version>3.10.6.Final</netty.3.version>
|
2022-10-01 20:09:43 -04:00
|
|
|
<snakeyaml.version>1.33</snakeyaml.version>
|
2022-10-07 12:25:59 -04:00
|
|
|
<netty.4.version>4.1.82.Final</netty.4.version>
|
2022-09-21 15:55:38 -04:00
|
|
|
<spring.version>5.3.23</spring.version>
|
2022-08-26 11:53:34 -04:00
|
|
|
<spring.security.version>5.7.3</spring.security.version>
|
2022-08-09 17:12:13 -04:00
|
|
|
<swagger.annotations.version>1.6.6</swagger.annotations.version>
|
2022-07-22 21:20:47 -04:00
|
|
|
<h2.version>2.1.214</h2.version>
|
2022-06-02 17:43:01 -04:00
|
|
|
<zookeeper.version>3.8.0</zookeeper.version>
|
2014-12-15 05:14:32 -05:00
|
|
|
</properties>
|
|
|
|
<dependencyManagement>
|
|
|
|
<dependencies>
|
2018-11-15 12:07:08 -05:00
|
|
|
<!-- The following dependency management entries exist because these are jars
|
2018-03-09 15:00:29 -05:00
|
|
|
that live in the top-level lib directory and will be present in the parent-first
|
|
|
|
classloading of all child nars. Therefore we dont want child nars using different
|
|
|
|
versions anyway.-->
|
2018-03-03 17:32:42 -05:00
|
|
|
|
2018-03-09 15:00:29 -05:00
|
|
|
<!-- javax.servlet-api handling this explicitly Must be in root lib -->
|
|
|
|
<dependency>
|
|
|
|
<groupId>javax.servlet</groupId>
|
|
|
|
<artifactId>javax.servlet-api</artifactId>
|
|
|
|
<version>3.1.0</version>
|
|
|
|
<scope>provided</scope>
|
|
|
|
</dependency>
|
2022-02-07 14:07:45 -05:00
|
|
|
<!-- jetty-schemas handling this explicitly Must be in root lib -->
|
2018-03-09 15:00:29 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty.toolchain</groupId>
|
|
|
|
<artifactId>jetty-schemas</artifactId>
|
2022-02-07 14:07:45 -05:00
|
|
|
<version>5.2</version>
|
2018-03-09 15:00:29 -05:00
|
|
|
<scope>provided</scope>
|
|
|
|
</dependency>
|
|
|
|
<!-- logback-classic, logback-core, log4j-over-slf4j, jul-to-slf4j,jcl-over-slf4j,slf4j-api handling this explicitly Must be in root lib -->
|
2014-12-15 05:14:32 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>ch.qos.logback</groupId>
|
|
|
|
<artifactId>logback-classic</artifactId>
|
2021-09-22 13:23:46 -04:00
|
|
|
<version>${logback.version}</version>
|
2019-08-22 11:00:14 -04:00
|
|
|
<scope>provided</scope>
|
2014-12-15 05:14:32 -05:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.slf4j</groupId>
|
|
|
|
<artifactId>jcl-over-slf4j</artifactId>
|
|
|
|
<version>${org.slf4j.version}</version>
|
|
|
|
<scope>provided</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.slf4j</groupId>
|
|
|
|
<artifactId>log4j-over-slf4j</artifactId>
|
|
|
|
<version>${org.slf4j.version}</version>
|
|
|
|
<scope>provided</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.slf4j</groupId>
|
|
|
|
<artifactId>jul-to-slf4j</artifactId>
|
|
|
|
<version>${org.slf4j.version}</version>
|
|
|
|
<scope>provided</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.slf4j</groupId>
|
|
|
|
<artifactId>slf4j-api</artifactId>
|
|
|
|
<version>${org.slf4j.version}</version>
|
|
|
|
<scope>provided</scope>
|
|
|
|
</dependency>
|
2018-03-09 15:00:29 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.slf4j</groupId>
|
|
|
|
<artifactId>slf4j-simple</artifactId>
|
|
|
|
<version>${org.slf4j.version}</version>
|
|
|
|
</dependency>
|
2021-01-25 08:42:06 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.bouncycastle</groupId>
|
|
|
|
<artifactId>bcprov-jdk15on</artifactId>
|
|
|
|
<version>${org.bouncycastle.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.bouncycastle</groupId>
|
|
|
|
<artifactId>bcpkix-jdk15on</artifactId>
|
|
|
|
<version>${org.bouncycastle.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.bouncycastle</groupId>
|
|
|
|
<artifactId>bcpg-jdk15on</artifactId>
|
|
|
|
<version>${org.bouncycastle.version}</version>
|
|
|
|
</dependency>
|
2022-03-24 20:13:08 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.avro</groupId>
|
|
|
|
<artifactId>avro</artifactId>
|
|
|
|
<version>${avro.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.avro</groupId>
|
|
|
|
<artifactId>avro-ipc</artifactId>
|
|
|
|
<version>${avro.version}</version>
|
|
|
|
</dependency>
|
2022-05-04 11:28:31 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>commons-io</groupId>
|
|
|
|
<artifactId>commons-io</artifactId>
|
|
|
|
<version>${org.apache.commons.io.version}</version>
|
|
|
|
</dependency>
|
2022-02-15 21:09:34 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.commons</groupId>
|
|
|
|
<artifactId>commons-lang3</artifactId>
|
|
|
|
<version>${org.apache.commons.lang3.version}</version>
|
|
|
|
</dependency>
|
2022-10-14 10:19:57 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.commons</groupId>
|
|
|
|
<artifactId>commons-text</artifactId>
|
|
|
|
<version>${org.apache.commons.text.version}</version>
|
|
|
|
</dependency>
|
2022-01-07 16:32:15 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.httpcomponents</groupId>
|
|
|
|
<artifactId>httpclient</artifactId>
|
|
|
|
<version>${org.apache.httpcomponents.httpclient.version}</version>
|
|
|
|
<exclusions>
|
|
|
|
<exclusion>
|
|
|
|
<groupId>commons-logging</groupId>
|
|
|
|
<artifactId>commons-logging</artifactId>
|
|
|
|
</exclusion>
|
|
|
|
</exclusions>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.httpcomponents</groupId>
|
|
|
|
<artifactId>httpcore</artifactId>
|
|
|
|
<version>${org.apache.httpcomponents.httpcore.version}</version>
|
|
|
|
</dependency>
|
2022-07-29 15:21:06 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.httpcomponents</groupId>
|
|
|
|
<artifactId>fluent-hc</artifactId>
|
|
|
|
<version>${org.apache.httpcomponents.httpclient.version}</version>
|
|
|
|
<exclusions>
|
|
|
|
<exclusion>
|
|
|
|
<groupId>commons-logging</groupId>
|
|
|
|
<artifactId>commons-logging</artifactId>
|
|
|
|
</exclusion>
|
|
|
|
</exclusions>
|
|
|
|
</dependency>
|
2018-03-09 15:00:29 -05:00
|
|
|
|
2022-03-20 16:16:56 -04:00
|
|
|
<!-- Commons Codec -->
|
|
|
|
<dependency>
|
|
|
|
<groupId>commons-codec</groupId>
|
|
|
|
<artifactId>commons-codec</artifactId>
|
|
|
|
<version>1.15</version>
|
|
|
|
</dependency>
|
|
|
|
|
2018-03-09 15:00:29 -05:00
|
|
|
<!-- These junit/mockito/groovy/spock/hamcrest dependencies are here to encourage consistent unit test library usage -->
|
2021-08-11 14:20:35 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.junit</groupId>
|
|
|
|
<artifactId>junit-bom</artifactId>
|
2022-10-08 11:17:32 -04:00
|
|
|
<version>5.9.1</version>
|
2021-08-11 14:20:35 -04:00
|
|
|
<type>pom</type>
|
|
|
|
<scope>import</scope>
|
|
|
|
</dependency>
|
2014-12-15 05:14:32 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>junit</groupId>
|
|
|
|
<artifactId>junit</artifactId>
|
2021-05-27 07:15:06 -04:00
|
|
|
<version>4.13.2</version>
|
2021-08-11 14:20:35 -04:00
|
|
|
<scope>test</scope>
|
2014-12-15 05:14:32 -05:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.mockito</groupId>
|
|
|
|
<artifactId>mockito-core</artifactId>
|
2021-10-01 17:34:09 -04:00
|
|
|
<version>${mockito.version}</version>
|
2014-12-15 05:14:32 -05:00
|
|
|
</dependency>
|
2021-08-27 08:33:34 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.mockito</groupId>
|
|
|
|
<artifactId>mockito-junit-jupiter</artifactId>
|
2021-10-01 17:34:09 -04:00
|
|
|
<version>${mockito.version}</version>
|
2021-08-27 08:33:34 -04:00
|
|
|
</dependency>
|
2017-03-21 22:50:06 -04:00
|
|
|
<dependency>
|
2018-03-09 15:00:29 -05:00
|
|
|
<groupId>org.codehaus.groovy</groupId>
|
|
|
|
<artifactId>groovy-all</artifactId>
|
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
|
|
|
<version>${nifi.groovy.version}</version>
|
|
|
|
<type>pom</type>
|
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.codehaus.groovy</groupId>
|
|
|
|
<artifactId>groovy-test</artifactId>
|
|
|
|
<version>${nifi.groovy.version}</version>
|
2017-03-21 22:50:06 -04:00
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
2014-12-15 05:14:32 -05:00
|
|
|
<dependency>
|
2018-03-09 15:00:29 -05:00
|
|
|
<groupId>org.spockframework</groupId>
|
|
|
|
<artifactId>spock-core</artifactId>
|
2022-01-21 14:23:23 -05:00
|
|
|
<version>2.1-M2-groovy-3.0</version>
|
2018-03-09 15:00:29 -05:00
|
|
|
<scope>test</scope>
|
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
|
|
|
<exclusions>
|
|
|
|
<exclusion>
|
|
|
|
<!-- exclude transitive groovy dependencies to force spock to use the the managed groovy dependencies
|
|
|
|
inherited from the parent pom -->
|
|
|
|
<groupId>org.codehaus.groovy</groupId>
|
|
|
|
<artifactId>*</artifactId>
|
|
|
|
</exclusion>
|
|
|
|
</exclusions>
|
2014-12-15 05:14:32 -05:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
2018-03-09 15:00:29 -05:00
|
|
|
<groupId>org.hamcrest</groupId>
|
|
|
|
<artifactId>hamcrest-all</artifactId>
|
2014-12-15 05:14:32 -05:00
|
|
|
<version>1.3</version>
|
2016-02-01 19:13:30 -05:00
|
|
|
<scope>test</scope>
|
2014-12-15 05:14:32 -05:00
|
|
|
</dependency>
|
2019-06-18 20:41:44 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.testcontainers</groupId>
|
|
|
|
<artifactId>testcontainers</artifactId>
|
2022-09-30 09:31:47 -04:00
|
|
|
<version>${testcontainers.version}</version>
|
2019-06-18 20:41:44 -04:00
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
2018-03-09 15:00:29 -05:00
|
|
|
<!-- These Jetty dependencies are required for the Jetty Web Server all nars extend from it so we dont want this getting overriden -->
|
2014-12-15 05:14:32 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
|
|
<artifactId>jetty-server</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
<scope>provided</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
|
|
<artifactId>jetty-servlet</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
<scope>provided</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
|
|
<artifactId>jetty-webapp</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
<scope>provided</scope>
|
|
|
|
</dependency>
|
2018-10-12 11:15:30 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
|
|
<artifactId>jetty-deploy</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
<scope>provided</scope>
|
|
|
|
</dependency>
|
2014-12-15 05:14:32 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
|
|
<artifactId>jetty-servlets</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
<scope>provided</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
2016-05-27 14:53:12 -04:00
|
|
|
<artifactId>jetty-annotations</artifactId>
|
2014-12-15 05:14:32 -05:00
|
|
|
<version>${jetty.version}</version>
|
|
|
|
<scope>provided</scope>
|
|
|
|
</dependency>
|
2022-05-13 14:27:05 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
|
|
<artifactId>jetty-alpn-server</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
<scope>provided</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty.http2</groupId>
|
|
|
|
<artifactId>http2-server</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
<scope>provided</scope>
|
|
|
|
</dependency>
|
|
|
|
|
2021-08-04 13:46:30 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
|
|
<artifactId>jetty-alpn-client</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
|
|
<artifactId>jetty-alpn-java-client</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
|
|
<artifactId>jetty-continuation</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
|
|
<artifactId>jetty-client</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
|
|
<artifactId>jetty-http</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
|
|
<artifactId>jetty-io</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
|
|
<artifactId>jetty-jaas</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
|
|
<artifactId>jetty-rewrite</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
|
|
<artifactId>jetty-runner</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
|
|
<artifactId>jetty-util</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
|
|
<artifactId>jetty-util-ajax</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty.http2</groupId>
|
|
|
|
<artifactId>http2-client</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty.http2</groupId>
|
|
|
|
<artifactId>http2-common</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty.http2</groupId>
|
|
|
|
<artifactId>http2-hpack</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty.http2</groupId>
|
|
|
|
<artifactId>http2-http-client-transport</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
</dependency>
|
2021-10-04 11:08:28 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty.websocket</groupId>
|
|
|
|
<artifactId>websocket-api</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty.websocket</groupId>
|
|
|
|
<artifactId>websocket-client</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty.websocket</groupId>
|
|
|
|
<artifactId>websocket-server</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
|
|
|
</dependency>
|
2014-12-15 05:14:32 -05:00
|
|
|
<dependency>
|
2016-05-27 14:53:12 -04:00
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
|
|
<artifactId>apache-jsp</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
2014-12-15 05:14:32 -05:00
|
|
|
<scope>provided</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
2016-05-27 14:53:12 -04:00
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
|
|
<artifactId>apache-jstl</artifactId>
|
|
|
|
<version>${jetty.version}</version>
|
2014-12-15 05:14:32 -05:00
|
|
|
<scope>provided</scope>
|
|
|
|
</dependency>
|
2020-09-21 11:44:42 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.aspectj</groupId>
|
|
|
|
<artifactId>aspectjrt</artifactId>
|
|
|
|
<version>${aspectj.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.aspectj</groupId>
|
|
|
|
<artifactId>aspectjweaver</artifactId>
|
|
|
|
<version>${aspectj.version}</version>
|
|
|
|
</dependency>
|
2022-04-28 22:35:15 -04:00
|
|
|
<dependency>
|
2022-05-23 14:47:58 -04:00
|
|
|
<groupId>com.google.code.gson</groupId>
|
|
|
|
<artifactId>gson</artifactId>
|
|
|
|
<version>${gson.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
2022-04-28 22:35:15 -04:00
|
|
|
<groupId>net.minidev</groupId>
|
|
|
|
<artifactId>json-smart</artifactId>
|
|
|
|
<version>${json.smart.version}</version>
|
|
|
|
</dependency>
|
2022-08-09 17:12:13 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>io.swagger</groupId>
|
|
|
|
<artifactId>swagger-annotations</artifactId>
|
|
|
|
<version>${swagger.annotations.version}</version>
|
|
|
|
</dependency>
|
2022-09-09 15:19:11 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.yaml</groupId>
|
|
|
|
<artifactId>snakeyaml</artifactId>
|
|
|
|
<version>${snakeyaml.version}</version>
|
|
|
|
</dependency>
|
2022-09-12 11:47:49 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>com.amazonaws</groupId>
|
|
|
|
<artifactId>aws-java-sdk-bom</artifactId>
|
|
|
|
<version>${com.amazonaws.version}</version>
|
|
|
|
<type>pom</type>
|
|
|
|
<scope>import</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>com.amazonaws</groupId>
|
|
|
|
<artifactId>aws-java-sdk-core</artifactId>
|
|
|
|
<version>${com.amazonaws.version}</version>
|
|
|
|
<exclusions>
|
|
|
|
<exclusion>
|
|
|
|
<groupId>commons-logging</groupId>
|
|
|
|
<artifactId>commons-logging</artifactId>
|
|
|
|
</exclusion>
|
|
|
|
</exclusions>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>com.amazonaws</groupId>
|
|
|
|
<artifactId>aws-java-sdk-bundle</artifactId>
|
|
|
|
<version>${com.amazonaws.version}</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>software.amazon.awssdk</groupId>
|
|
|
|
<artifactId>bom</artifactId>
|
|
|
|
<version>${software.amazon.awssdk.version}</version>
|
|
|
|
<type>pom</type>
|
|
|
|
<scope>import</scope>
|
|
|
|
</dependency>
|
2022-03-26 10:31:08 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>com.fasterxml.jackson</groupId>
|
|
|
|
<artifactId>jackson-bom</artifactId>
|
2022-04-22 14:52:43 -04:00
|
|
|
<version>${jackson.bom.version}</version>
|
2022-03-26 10:31:08 -04:00
|
|
|
<type>pom</type>
|
|
|
|
<scope>import</scope>
|
|
|
|
</dependency>
|
2022-02-10 21:04:53 -05:00
|
|
|
<!-- Set snappy-java version for compatibility across multiple Java versions -->
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.xerial.snappy</groupId>
|
|
|
|
<artifactId>snappy-java</artifactId>
|
|
|
|
<version>1.1.8.4</version>
|
|
|
|
</dependency>
|
2022-01-04 15:29:13 -05:00
|
|
|
<!-- Override Log4j 2 libraries for transitive dependencies -->
|
2021-12-13 09:41:34 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.logging.log4j</groupId>
|
|
|
|
<artifactId>log4j-bom</artifactId>
|
2022-07-11 20:20:40 -04:00
|
|
|
<version>${log4j2.version}</version>
|
2021-12-13 09:41:34 -05:00
|
|
|
<scope>import</scope>
|
|
|
|
<type>pom</type>
|
|
|
|
</dependency>
|
2022-01-05 16:39:49 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>io.netty</groupId>
|
|
|
|
<artifactId>netty-bom</artifactId>
|
|
|
|
<version>${netty.4.version}</version>
|
|
|
|
<scope>import</scope>
|
|
|
|
<type>pom</type>
|
|
|
|
</dependency>
|
2022-01-04 20:06:20 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework</groupId>
|
|
|
|
<artifactId>spring-framework-bom</artifactId>
|
|
|
|
<version>${spring.version}</version>
|
|
|
|
<scope>import</scope>
|
|
|
|
<type>pom</type>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework.security</groupId>
|
|
|
|
<artifactId>spring-security-bom</artifactId>
|
|
|
|
<version>${spring.security.version}</version>
|
|
|
|
<scope>import</scope>
|
|
|
|
<type>pom</type>
|
|
|
|
</dependency>
|
2022-02-01 21:23:46 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>com.squareup.okhttp3</groupId>
|
|
|
|
<artifactId>okhttp-bom</artifactId>
|
|
|
|
<version>${okhttp.version}</version>
|
|
|
|
<scope>import</scope>
|
|
|
|
<type>pom</type>
|
|
|
|
</dependency>
|
2022-04-04 21:21:52 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.jetbrains.kotlin</groupId>
|
|
|
|
<artifactId>kotlin-bom</artifactId>
|
|
|
|
<version>${kotlin.version}</version>
|
|
|
|
<scope>import</scope>
|
|
|
|
<type>pom</type>
|
|
|
|
</dependency>
|
2022-06-07 13:30:31 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.glassfish.jersey</groupId>
|
|
|
|
<artifactId>jersey-bom</artifactId>
|
|
|
|
<version>${jersey.bom.version}</version>
|
|
|
|
<scope>import</scope>
|
|
|
|
<type>pom</type>
|
|
|
|
</dependency>
|
2022-09-02 21:24:45 -04:00
|
|
|
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.jsoup</groupId>
|
|
|
|
<artifactId>jsoup</artifactId>
|
|
|
|
<version>1.15.3</version>
|
|
|
|
</dependency>
|
2014-12-15 05:14:32 -05:00
|
|
|
</dependencies>
|
|
|
|
</dependencyManagement>
|
2016-08-24 11:30:14 -04:00
|
|
|
|
2014-12-15 05:14:32 -05:00
|
|
|
<dependencies>
|
|
|
|
<dependency>
|
2021-08-11 14:20:35 -04:00
|
|
|
<groupId>org.junit.jupiter</groupId>
|
|
|
|
<artifactId>junit-jupiter-api</artifactId>
|
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.junit.jupiter</groupId>
|
|
|
|
<artifactId>junit-jupiter-engine</artifactId>
|
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.junit.vintage</groupId>
|
|
|
|
<artifactId>junit-vintage-engine</artifactId>
|
2014-12-15 05:14:32 -05:00
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
2021-10-19 18:35:40 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.junit.jupiter</groupId>
|
|
|
|
<artifactId>junit-jupiter-params</artifactId>
|
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
2014-12-15 05:14:32 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.mockito</groupId>
|
|
|
|
<artifactId>mockito-core</artifactId>
|
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
2021-08-27 08:33:34 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.mockito</groupId>
|
|
|
|
<artifactId>mockito-junit-jupiter</artifactId>
|
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
2014-12-15 05:14:32 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.slf4j</groupId>
|
|
|
|
<artifactId>slf4j-simple</artifactId>
|
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
2016-02-13 19:00:05 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.codehaus.groovy</groupId>
|
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
|
|
|
<artifactId>groovy-test</artifactId>
|
|
|
|
<scope>test</scope>
|
2016-02-13 19:00:05 -05:00
|
|
|
</dependency>
|
2015-03-22 18:59:22 -04:00
|
|
|
</dependencies>
|
2016-08-24 11:30:14 -04:00
|
|
|
|
2014-12-15 05:14:32 -05:00
|
|
|
<build>
|
|
|
|
<pluginManagement>
|
|
|
|
<plugins>
|
2015-08-15 13:12:22 -04:00
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-compiler-plugin</artifactId>
|
2022-06-29 10:32:44 -04:00
|
|
|
<version>3.10.1</version>
|
2015-08-15 13:12:22 -04:00
|
|
|
<configuration>
|
|
|
|
<fork>true</fork>
|
2021-08-06 12:56:28 -04:00
|
|
|
<showDeprecation>${maven.compiler.showDeprecation}</showDeprecation>
|
2015-08-15 13:12:22 -04:00
|
|
|
<showWarnings>true</showWarnings>
|
|
|
|
</configuration>
|
|
|
|
</plugin>
|
2016-02-13 19:00:05 -05:00
|
|
|
<plugin>
|
|
|
|
<groupId>org.codehaus.groovy</groupId>
|
|
|
|
<artifactId>groovy-eclipse-compiler</artifactId>
|
2021-08-06 12:56:28 -04:00
|
|
|
<version>3.7.0</version>
|
2016-02-13 19:00:05 -05:00
|
|
|
<extensions>true</extensions>
|
|
|
|
</plugin>
|
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
|
|
|
<plugin>
|
|
|
|
<groupId>org.codehaus.groovy</groupId>
|
|
|
|
<artifactId>groovy-eclipse-batch</artifactId>
|
2022-06-30 12:19:23 -04:00
|
|
|
<version>${groovy.eclipse.batch.version}</version>
|
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
|
|
|
</plugin>
|
2015-08-15 13:12:22 -04:00
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-surefire-plugin</artifactId>
|
2021-08-06 12:56:28 -04:00
|
|
|
<version>${surefire.version}</version>
|
2015-08-15 13:12:22 -04:00
|
|
|
<configuration>
|
2016-08-26 03:04:17 -04:00
|
|
|
<systemPropertyVariables>
|
|
|
|
<java.awt.headless>true</java.awt.headless>
|
|
|
|
</systemPropertyVariables>
|
2016-05-10 16:07:11 -04:00
|
|
|
<includes>
|
|
|
|
<include>**/*Test.class</include>
|
|
|
|
<include>**/Test*.class</include>
|
|
|
|
<include>**/*Spec.class</include>
|
|
|
|
</includes>
|
2018-09-25 15:17:19 -04:00
|
|
|
<excludes>
|
|
|
|
<exclude>**/*ITSpec.class</exclude>
|
|
|
|
</excludes>
|
2015-08-15 13:12:22 -04:00
|
|
|
<redirectTestOutputToFile>true</redirectTestOutputToFile>
|
|
|
|
</configuration>
|
|
|
|
</plugin>
|
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-assembly-plugin</artifactId>
|
2022-09-12 14:43:53 -04:00
|
|
|
<version>3.4.2</version>
|
2015-08-15 13:12:22 -04:00
|
|
|
<configuration>
|
|
|
|
<tarLongFileMode>gnu</tarLongFileMode>
|
|
|
|
</configuration>
|
|
|
|
</plugin>
|
|
|
|
<plugin>
|
|
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
|
|
<artifactId>jaxb2-maven-plugin</artifactId>
|
2021-08-19 16:42:13 -04:00
|
|
|
<version>2.5.0</version>
|
2015-08-15 13:12:22 -04:00
|
|
|
</plugin>
|
|
|
|
<plugin>
|
|
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
|
|
<artifactId>exec-maven-plugin</artifactId>
|
2022-01-19 13:53:11 -05:00
|
|
|
<version>3.0.0</version>
|
2015-08-15 13:12:22 -04:00
|
|
|
</plugin>
|
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-javadoc-plugin</artifactId>
|
2022-08-29 15:56:25 -04:00
|
|
|
<version>3.4.1</version>
|
2015-08-15 13:12:22 -04:00
|
|
|
<configuration>
|
|
|
|
<failOnError>false</failOnError>
|
|
|
|
<quiet>true</quiet>
|
|
|
|
<show>private</show>
|
|
|
|
<encoding>UTF-8</encoding>
|
|
|
|
<quiet>true</quiet>
|
2016-04-14 09:28:25 -04:00
|
|
|
<javadocVersion>1.8</javadocVersion>
|
2015-08-15 13:12:22 -04:00
|
|
|
<additionalJOption>-J-Xmx512m</additionalJOption>
|
|
|
|
</configuration>
|
|
|
|
</plugin>
|
2015-01-09 15:46:14 -05:00
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-release-plugin</artifactId>
|
2022-08-29 15:56:25 -04:00
|
|
|
<version>3.0.0-M6</version>
|
2015-08-15 13:12:22 -04:00
|
|
|
<configuration>
|
|
|
|
<useReleaseProfile>true</useReleaseProfile>
|
|
|
|
<releaseProfiles>apache-release</releaseProfiles>
|
|
|
|
<autoVersionSubmodules>true</autoVersionSubmodules>
|
|
|
|
<goals>deploy</goals>
|
|
|
|
<tagNameFormat>@{project.artifactId}-@{project.version}</tagNameFormat>
|
|
|
|
<pushChanges>false</pushChanges>
|
|
|
|
<localCheckout>true</localCheckout>
|
|
|
|
</configuration>
|
2015-01-16 11:59:49 -05:00
|
|
|
<executions>
|
|
|
|
<execution>
|
|
|
|
<id>default</id>
|
|
|
|
<goals>
|
|
|
|
<goal>perform</goal>
|
|
|
|
</goals>
|
|
|
|
<configuration>
|
2015-08-15 13:12:22 -04:00
|
|
|
<pomFileName>pom.xml</pomFileName>
|
2015-01-16 11:59:49 -05:00
|
|
|
</configuration>
|
|
|
|
</execution>
|
|
|
|
</executions>
|
2014-12-15 05:14:32 -05:00
|
|
|
</plugin>
|
2015-08-15 13:12:22 -04:00
|
|
|
<plugin>
|
|
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
|
|
<artifactId>rpm-maven-plugin</artifactId>
|
2022-01-19 13:53:11 -05:00
|
|
|
<version>2.2.0</version>
|
2015-08-15 13:12:22 -04:00
|
|
|
</plugin>
|
2016-09-29 14:00:00 -04:00
|
|
|
<plugin>
|
|
|
|
<groupId>org.codehaus.mojo</groupId>
|
|
|
|
<artifactId>buildnumber-maven-plugin</artifactId>
|
2022-07-18 15:15:20 -04:00
|
|
|
<version>3.0.0</version>
|
2016-09-29 14:00:00 -04:00
|
|
|
</plugin>
|
2015-08-15 13:12:22 -04:00
|
|
|
<plugin>
|
|
|
|
<groupId>org.antlr</groupId>
|
|
|
|
<artifactId>antlr3-maven-plugin</artifactId>
|
|
|
|
<version>3.5.2</version>
|
|
|
|
</plugin>
|
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-checkstyle-plugin</artifactId>
|
2022-08-29 15:56:25 -04:00
|
|
|
<version>3.2.0</version>
|
2015-08-15 13:12:22 -04:00
|
|
|
<dependencies>
|
|
|
|
<dependency>
|
|
|
|
<groupId>com.puppycrawl.tools</groupId>
|
|
|
|
<artifactId>checkstyle</artifactId>
|
2022-07-18 15:15:20 -04:00
|
|
|
<version>9.3</version>
|
2015-08-15 13:12:22 -04:00
|
|
|
</dependency>
|
|
|
|
</dependencies>
|
|
|
|
</plugin>
|
2021-11-17 14:38:26 -05:00
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-dependency-plugin</artifactId>
|
2022-07-18 15:15:20 -04:00
|
|
|
<version>3.3.0</version>
|
2021-11-17 14:38:26 -05:00
|
|
|
</plugin>
|
2022-06-29 10:32:44 -04:00
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.rat</groupId>
|
|
|
|
<artifactId>apache-rat-plugin</artifactId>
|
|
|
|
<version>0.14</version>
|
|
|
|
</plugin>
|
2015-08-19 16:53:59 -04:00
|
|
|
</plugins>
|
2014-12-15 05:14:32 -05:00
|
|
|
</pluginManagement>
|
|
|
|
<plugins>
|
2016-02-13 19:00:05 -05:00
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-compiler-plugin</artifactId>
|
|
|
|
<executions>
|
|
|
|
<!-- Only run for tests -->
|
|
|
|
<execution>
|
|
|
|
<id>groovy-tests</id>
|
2016-03-11 11:13:34 -05:00
|
|
|
<goals>
|
|
|
|
<goal>testCompile</goal>
|
|
|
|
</goals>
|
|
|
|
<configuration>
|
|
|
|
<compilerId>groovy-eclipse-compiler</compilerId>
|
2021-08-06 12:56:28 -04:00
|
|
|
|
2016-03-11 11:13:34 -05:00
|
|
|
</configuration>
|
2016-02-13 19:00:05 -05:00
|
|
|
</execution>
|
|
|
|
</executions>
|
|
|
|
<configuration>
|
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
|
|
|
<source>${maven.compiler.source}</source>
|
|
|
|
<target>${maven.compiler.target}</target>
|
2016-02-13 19:00:05 -05:00
|
|
|
</configuration>
|
|
|
|
<dependencies>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.codehaus.groovy</groupId>
|
|
|
|
<artifactId>groovy-eclipse-compiler</artifactId>
|
2021-08-06 12:56:28 -04:00
|
|
|
<version>3.7.0</version>
|
2016-02-13 19:00:05 -05:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.codehaus.groovy</groupId>
|
|
|
|
<artifactId>groovy-eclipse-batch</artifactId>
|
2022-06-30 12:19:23 -04:00
|
|
|
<version>${groovy.eclipse.batch.version}</version>
|
2016-02-13 19:00:05 -05:00
|
|
|
</dependency>
|
|
|
|
</dependencies>
|
|
|
|
</plugin>
|
2014-12-15 05:14:32 -05:00
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
2015-01-21 01:47:48 -05:00
|
|
|
<artifactId>nifi-nar-maven-plugin</artifactId>
|
2022-06-22 13:41:25 -04:00
|
|
|
<version>${nifi.nar.maven.plugin.version}</version>
|
2015-08-15 13:12:22 -04:00
|
|
|
<extensions>true</extensions>
|
2019-05-06 09:59:36 -04:00
|
|
|
<configuration>
|
|
|
|
<enforceDocGeneration>true</enforceDocGeneration>
|
|
|
|
</configuration>
|
2015-08-15 13:12:22 -04:00
|
|
|
</plugin>
|
|
|
|
<plugin>
|
|
|
|
<groupId>org.sonatype.plugins</groupId>
|
|
|
|
<artifactId>nexus-staging-maven-plugin</artifactId>
|
2022-09-08 11:01:16 -04:00
|
|
|
<version>1.6.13</version>
|
2014-12-15 05:14:32 -05:00
|
|
|
<extensions>true</extensions>
|
2015-08-15 13:12:22 -04:00
|
|
|
<configuration>
|
2016-02-06 16:51:34 -05:00
|
|
|
<stagingProgressTimeoutMinutes>15</stagingProgressTimeoutMinutes>
|
2015-08-15 13:12:22 -04:00
|
|
|
<serverId>repository.apache.org</serverId>
|
|
|
|
<nexusUrl>https://repository.apache.org/</nexusUrl>
|
|
|
|
</configuration>
|
|
|
|
</plugin>
|
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-enforcer-plugin</artifactId>
|
2022-07-18 15:15:20 -04:00
|
|
|
<version>3.1.0</version>
|
2015-08-15 13:12:22 -04:00
|
|
|
<executions>
|
|
|
|
<execution>
|
2021-12-29 12:35:59 -05:00
|
|
|
<id>enforce-maven-version</id>
|
2015-08-15 13:12:22 -04:00
|
|
|
<goals>
|
|
|
|
<goal>enforce</goal>
|
|
|
|
</goals>
|
|
|
|
<configuration>
|
|
|
|
<rules>
|
|
|
|
<requireSameVersions>
|
|
|
|
<plugins>
|
|
|
|
<plugin>org.apache.maven.plugins:maven-surefire-plugin</plugin>
|
|
|
|
<plugin>org.apache.maven.plugins:maven-failsafe-plugin</plugin>
|
|
|
|
<plugin>org.apache.maven.plugins:maven-surefire-report-plugin</plugin>
|
|
|
|
</plugins>
|
|
|
|
</requireSameVersions>
|
|
|
|
<requireMavenVersion>
|
2021-07-13 13:32:50 -04:00
|
|
|
<version>3.6.0</version>
|
2015-08-15 13:12:22 -04:00
|
|
|
</requireMavenVersion>
|
2020-03-27 13:50:21 -04:00
|
|
|
<requireReleaseDeps>
|
2021-12-29 12:35:59 -05:00
|
|
|
<message>Dependencies outside of Apache NiFi must not use SNAPSHOT versions</message>
|
2020-03-27 13:50:21 -04:00
|
|
|
<failWhenParentIsSnapshot>false</failWhenParentIsSnapshot>
|
|
|
|
<excludes>
|
|
|
|
<exclude>org.apache.nifi:*</exclude>
|
2020-12-10 10:25:09 -05:00
|
|
|
<exclude>org.apache.nifi.minifi:*</exclude>
|
2020-08-05 15:17:07 -04:00
|
|
|
<exclude>org.apache.nifi.registry:*</exclude>
|
2020-03-27 13:50:21 -04:00
|
|
|
</excludes>
|
|
|
|
</requireReleaseDeps>
|
|
|
|
<bannedDependencies>
|
|
|
|
<excludes>
|
|
|
|
<!-- Cat-X Deps -->
|
|
|
|
<exclude>org.json:json:*:*:compile</exclude>
|
|
|
|
<exclude>c3p0:c3p0:*:*:compile</exclude>
|
|
|
|
<!-- Versions of JSR305 before 3.0.1 are not allowed https://github.com/findbugsproject/findbugs/issues/128 -->
|
|
|
|
<exclude>com.google.code.findbugs:jsr305:*:*:compile</exclude>
|
2022-02-01 20:20:53 -05:00
|
|
|
<!-- SLF4J routing to Log4j 1.2 is a runtime implementation that conflicts with Logback -->
|
|
|
|
<exclude>org.slf4j:slf4j-log4j12</exclude>
|
2022-06-21 08:51:11 -04:00
|
|
|
<exclude>org.slf4j:slf4j-reload4j</exclude>
|
2021-10-04 21:10:20 -04:00
|
|
|
<!-- Log4J excluded in favor of log4j-over-slf4j and logback -->
|
|
|
|
<exclude>log4j:log4j:*</exclude>
|
2021-12-18 19:23:31 -05:00
|
|
|
<!-- Log4j 2 log4j-core excluded in favor of log4j-to-slf4j routing to logback -->
|
|
|
|
<exclude>org.apache.logging.log4j:log4j-core:*</exclude>
|
2021-12-15 17:47:44 -05:00
|
|
|
<!-- Commons Logging excluded in favor of jcl-over-slf4j -->
|
|
|
|
<exclude>commons-logging:commons-logging:*</exclude>
|
2022-08-25 11:50:15 -04:00
|
|
|
<!-- Apache Xalan is no longer maintained and is bundled in the standard JRE -->
|
|
|
|
<exclude>xalan:xalan</exclude>
|
2020-03-27 13:50:21 -04:00
|
|
|
</excludes>
|
|
|
|
<includes>
|
|
|
|
<!-- Versions of JSR305 after 3.0.1 are allowed https://github.com/findbugsproject/findbugs/issues/128 -->
|
|
|
|
<include>com.google.code.findbugs:jsr305:[3.0.0,)</include>
|
|
|
|
</includes>
|
|
|
|
</bannedDependencies>
|
|
|
|
</rules>
|
|
|
|
<fail>true</fail>
|
|
|
|
</configuration>
|
|
|
|
</execution>
|
2015-08-15 13:12:22 -04:00
|
|
|
</executions>
|
2014-12-15 05:14:32 -05:00
|
|
|
</plugin>
|
2015-08-15 13:12:22 -04:00
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-checkstyle-plugin</artifactId>
|
|
|
|
<configuration>
|
2022-09-29 15:16:00 -04:00
|
|
|
<configLocation>checkstyle.xml</configLocation>
|
2015-08-15 13:12:22 -04:00
|
|
|
<violationSeverity>warning</violationSeverity>
|
|
|
|
<includeTestSourceDirectory>true</includeTestSourceDirectory>
|
|
|
|
</configuration>
|
2015-08-19 16:53:59 -04:00
|
|
|
</plugin>
|
2015-08-15 13:12:22 -04:00
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.rat</groupId>
|
|
|
|
<artifactId>apache-rat-plugin</artifactId>
|
|
|
|
<configuration>
|
2018-04-19 13:54:23 -04:00
|
|
|
<consoleOutput>true</consoleOutput>
|
NIFI-6360 Updated Mockito to 2.28.2, PowerMock to 2.0.2
Fixed test failures in nifi-couchbase-processors, BinaryDocument matcher replaced with ByteArrayDocument
Fixed test failures in nifi-riemann-processors, anyInt() matcher replaced with anyLong() matcher, calling method passes a long, not int
Removed unnecessary method mocks from nifi-toolkit-tls tests, TlsCertificateAuthorityServiceHandlerTest and TlsCertificateSigningRequestPerformerTest, since those were flagged by Mockito as unnecessary (they're unused)
Removed explicit mockito dependency version in nifi-gcp-processors pom to inherit version from nifi's pom.xml
Updated ArgumentMatchers in Kafka 0.10, 0.11, 1.0, and 2.0 processor tests, since in Mockito 2.x, the "any" matchers no longer allow nulls
Updated ArgumentMatchers in nifi-jolt-transform-json-ui, since in Mockito 2.x, the "any" matchers no longer allow nulls
Removed unnecessary method mocks from MetricsReportingTaskTest
Updated TestStandardRemoteGroupPort to return Long instead of Integer for test flowfile.size() invocations
Updated AbstractCassandraProcessor to include keyspaceProperty.getValue() in null check
Updated SimpleProcessLogger and TestSimpleProcessLogger, vararg matching does not work the same in Java 8 and 11
Updated TestStandardProcessScheduler to allow null values during mock invocations, Mockito 2.x no longer allows nulls in those matchers
Updated TestPutHiveStreaming to allow null values during mock invocations, Mockito 2.x no longer allows nulls in those matchers
Updated FetchParquetTest to allow null values during mock invocations, Mockito 2.x no longer allows nulls in those matchers
Updated ControllerSearchServiceTest to allow null values during mock invocations, Mockito 2.x no longer allows nulls in those matchers
Removed usage of Whitebox from GetAzureEventHubTest due to Mockito 2.x, replaced with FieldUtils
Removed usage of Whitebox from StandardOidcIdentityProviderTest due to Mockito 2.x, replaced with FieldUtils
Updated apache-rat-plugin configuration in root POM to make use of useIdeaDefaultExcludes which makes the rat plugin exclude IntelliJ artifacts
Updated several modules to use mockito-core instead of mockito-all (discontinued in Mockito 2.x)
Updated nifi-site-to-site-reporting-task tests to be compatible with Mockito 2.x
Ignored TestPutJMS tests; the tests need to be refactored to work with Mockito 2.x, but the processor is deprecated. Refactor may be done in a separate PR.
Adjusted several mock interaction iterations to 0 for TestPublishKafkaRecord_* tests. Mockito 2.x flagged several interactions as unused and were adjusted to 0 interactions.
Updated PowerMock and Mockito dependencies to exclude transitive dependency on bytebuddy, added explicit dependency on bytebuddy 1.9.10 so that PowerMock and Mockito use the same version. Bytebuddy 1.9.3 (used by PowerMock 2.0.2) did not allow for the mocking of final/private classes, bytebuddy 1.9.10 (used by Mockito 2.28.2) does.
Updated TestSiteToSiteProvenanceReportingTask use of InvocationOnMock.getArgument to use objects for the resulting object rather than primitives
Removed unnecessary stubs from evtx tests, Mockito 2.x defaults to strict mocks
Fixed classloader issue with tests in nifi-windows-event-log-processors module that use JNAJUnitRunner when Mockito mocked JNA classes (Kernel32)
Addressed Mockito-related deprecation warnings
Import cleanup
This closes #3533
Signed-off-by: Mike Thomsen <mikerthomsen@gmail.com>
2019-06-06 16:53:04 -04:00
|
|
|
<useIdeaDefaultExcludes>true</useIdeaDefaultExcludes>
|
2015-08-15 13:12:22 -04:00
|
|
|
<excludes>
|
|
|
|
<exclude>nb-configuration.xml</exclude> <!-- courtesy excludes for netbeans users -->
|
|
|
|
<exclude>nbactions.xml</exclude> <!-- courtesy excludes for netbeans users -->
|
|
|
|
<exclude>DEPENDENCIES</exclude> <!-- auto generated file by apache's maven config while building sources.zip -->
|
|
|
|
</excludes>
|
|
|
|
</configuration>
|
2015-08-19 16:53:59 -04:00
|
|
|
</plugin>
|
2014-12-15 05:14:32 -05:00
|
|
|
</plugins>
|
|
|
|
</build>
|
2015-08-15 13:12:22 -04:00
|
|
|
<profiles>
|
2016-01-13 14:13:30 -05:00
|
|
|
<profile>
|
2018-11-15 12:07:08 -05:00
|
|
|
<!-- Performs execution of Integration Tests using the Maven
|
|
|
|
FailSafe Plugin. The view of integration tests in this context are those
|
|
|
|
tests interfacing with external sources and services requiring additional
|
2017-12-05 14:44:07 -05:00
|
|
|
resources or credentials that cannot be explicitly provided. Also appropriate
|
|
|
|
for tests which depend on inter-thread and/or network or having timing
|
|
|
|
considerations which could make the tests brittle on various environments.-->
|
2016-01-13 14:13:30 -05:00
|
|
|
<id>integration-tests</id>
|
|
|
|
<build>
|
|
|
|
<plugins>
|
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-failsafe-plugin</artifactId>
|
|
|
|
<executions>
|
|
|
|
<execution>
|
|
|
|
<goals>
|
|
|
|
<goal>integration-test</goal>
|
|
|
|
<goal>verify</goal>
|
|
|
|
</goals>
|
|
|
|
</execution>
|
|
|
|
</executions>
|
|
|
|
</plugin>
|
|
|
|
</plugins>
|
|
|
|
</build>
|
|
|
|
</profile>
|
2015-08-15 13:12:22 -04:00
|
|
|
<profile>
|
|
|
|
<id>contrib-check</id>
|
|
|
|
<build>
|
|
|
|
<plugins>
|
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.rat</groupId>
|
|
|
|
<artifactId>apache-rat-plugin</artifactId>
|
|
|
|
<executions>
|
|
|
|
<execution>
|
|
|
|
<goals>
|
|
|
|
<goal>check</goal>
|
|
|
|
</goals>
|
2022-07-12 17:08:36 -04:00
|
|
|
<phase>validate</phase>
|
2015-08-15 13:12:22 -04:00
|
|
|
</execution>
|
|
|
|
</executions>
|
|
|
|
</plugin>
|
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-checkstyle-plugin</artifactId>
|
2018-03-03 17:32:42 -05:00
|
|
|
<executions>
|
|
|
|
<execution>
|
|
|
|
<id>check-style</id>
|
2022-07-12 17:08:36 -04:00
|
|
|
<phase>validate</phase>
|
2018-03-03 17:32:42 -05:00
|
|
|
<configuration>
|
|
|
|
<encoding>UTF-8</encoding>
|
2017-05-31 00:08:19 -04:00
|
|
|
<excludes>**/generated-sources/**/*</excludes>
|
|
|
|
<sourceDirectories>
|
|
|
|
<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
|
|
|
|
<sourceDirectory>${project.build.testSourceDirectory}</sourceDirectory>
|
|
|
|
</sourceDirectories>
|
2018-03-03 17:32:42 -05:00
|
|
|
</configuration>
|
|
|
|
<goals>
|
|
|
|
<goal>check</goal>
|
|
|
|
</goals>
|
|
|
|
</execution>
|
|
|
|
</executions>
|
2015-08-15 13:12:22 -04:00
|
|
|
</plugin>
|
|
|
|
</plugins>
|
|
|
|
</build>
|
|
|
|
</profile>
|
2015-09-11 10:17:33 -04:00
|
|
|
<profile>
|
2019-06-17 08:22:19 -04:00
|
|
|
<!-- This profile will disable DocLint which performs strict
|
|
|
|
JavaDoc processing which was introduced in JDK 8. These are technically errors
|
|
|
|
in the JavaDoc which we need to eventually address. However, if a release
|
2018-07-07 15:24:42 -04:00
|
|
|
is performed using JDK 8 or newer, the JavaDoc generation would fail. By activating
|
|
|
|
this profile when running on JDK 8 or newer we can ensure the JavaDocs continue to
|
2016-11-25 23:34:47 -05:00
|
|
|
generate successfully -->
|
2015-09-11 10:17:33 -04:00
|
|
|
<id>disable-doclint</id>
|
|
|
|
<activation>
|
2018-07-07 15:24:42 -04:00
|
|
|
<jdk>[1.8,)</jdk>
|
2015-09-11 10:17:33 -04:00
|
|
|
</activation>
|
|
|
|
<build>
|
|
|
|
<pluginManagement>
|
|
|
|
<plugins>
|
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-javadoc-plugin</artifactId>
|
|
|
|
<configuration>
|
|
|
|
<additionalparam>-Xdoclint:none</additionalparam>
|
|
|
|
</configuration>
|
|
|
|
</plugin>
|
|
|
|
</plugins>
|
|
|
|
</pluginManagement>
|
|
|
|
</build>
|
|
|
|
</profile>
|
NIFI-5176 NiFI builds on Java 11
Added "jigsaw" profile to multiple modules, which auto-activates when building with Java 11 and adds several dependencies: jaxb, activation, and annotation-api.
Updated SslContextFactory to return tuple of socket factory with trust manager for issue with okhttp api changes in java 9+
Updated TestGet/PostHTTPGroovy to use default SSL context to get default cipher suites
Updated StandardTemplateDAOSpec.groovy, was using a 37-character UUID, shortened to 36 characters.
Multiple tests updated to specifically use TLSv1.2, since two-way TLSv1.3 for some component tests fail during the Java 11 build. Needs more investigation.
Replaced GString with String concatenation for map key's value in ScriptedReportingTaskGroovyTest to avoid runtime error of casting GString to String when retrieved from a map that is storing the GString
Removed nifi-toolkit-api plugin configuration of maven-compiler-plugin, it is inherited
Resolved deprecation errors during Groovy compile for bouncycastle, Extension should be used in place of X509Extension
Fixed JNAOverridingJUnitRunner's creation of the classpath for the custom classloader created to be able to mock jna classes
Removed import of IOUtils (from the wrong package) from InferenceSchemaStrategy
Updated maven-compiler-plugin version to 3.8.1
TLS (default in Java 11 is TLSv1.3) working for Site-to-Site client tests after upgrading JDK installation to JDK 11.0.3, httpclient5 5.0-beta4, and httpasyncclient 4.1.4
HttpNotificationService updated to find and use the first found X509TrustManager rather than casting directly from the array of TrustManagers returned from SslContextFactory
Removed unnecessary throws declaration from getSslSocketFactory method
Replaced DnsContextFactory.class.getName() with a string to avoid having to export/open the jdk.naming.dns module
Updated TestGetIgniteCache and TestPutIgniteCache.java to skip tests on Java 11+ (via Assume), and noted the check should be removed once a version of Ignite is released that supports Java 11
Updated SpringContextProcessor to create proper ClassLoader and uses URLClassloader.getResource() instead of URLClassloader.findResource() in isConfigResolvable.
Due to the application classloader no longer being a URLClassLoader in Java 9+, the URLClassLoader created in isConfigResolvable no longer has explicit access to the parent's resources as URLs.
URLClassLoader.getResource() searches the parent classloaders, and must be used instead of URLClassLoader.findResource() which only searches the URLs in the URLClassLoader and does not search the parent classloaders.
NIFI-5176 Moved exclusion of jdk.tools to the jigsaw profile in the POMs of nifi-hbase_1_1_2-client-service and nifi-hbase_2-client-service
NIFI-5176 Updated site-to-site-client's POM to use properties to establish the correct httpclient dependency for when building with Java 11
This closes #3404.
2018-11-30 13:14:31 -05:00
|
|
|
<profile>
|
|
|
|
<!-- This profile, activating when compiling on Java versions above 1.8, provides configuration changes to
|
|
|
|
allow NiFi to be compiled on those JDKs. -->
|
|
|
|
<id>jigsaw</id>
|
|
|
|
<activation>
|
|
|
|
<jdk>(1.8,)</jdk>
|
|
|
|
</activation>
|
|
|
|
<properties>
|
|
|
|
<maven.compiler.source>11</maven.compiler.source>
|
|
|
|
<maven.compiler.target>11</maven.compiler.target>
|
|
|
|
</properties>
|
|
|
|
<build>
|
|
|
|
<pluginManagement>
|
|
|
|
<plugins>
|
|
|
|
<plugin>
|
|
|
|
<groupId>org.jvnet.jaxb2.maven2</groupId>
|
|
|
|
<artifactId>maven-jaxb2-plugin</artifactId>
|
|
|
|
<version>0.14.0</version>
|
|
|
|
</plugin>
|
|
|
|
</plugins>
|
|
|
|
</pluginManagement>
|
|
|
|
</build>
|
|
|
|
<dependencyManagement>
|
|
|
|
<dependencies>
|
|
|
|
<dependency>
|
2021-08-19 16:42:13 -04:00
|
|
|
<groupId>jakarta.xml.bind</groupId>
|
|
|
|
<artifactId>jakarta.xml.bind-api</artifactId>
|
|
|
|
<version>${jakarta.xml.bind-api.version}</version>
|
NIFI-5176 NiFI builds on Java 11
Added "jigsaw" profile to multiple modules, which auto-activates when building with Java 11 and adds several dependencies: jaxb, activation, and annotation-api.
Updated SslContextFactory to return tuple of socket factory with trust manager for issue with okhttp api changes in java 9+
Updated TestGet/PostHTTPGroovy to use default SSL context to get default cipher suites
Updated StandardTemplateDAOSpec.groovy, was using a 37-character UUID, shortened to 36 characters.
Multiple tests updated to specifically use TLSv1.2, since two-way TLSv1.3 for some component tests fail during the Java 11 build. Needs more investigation.
Replaced GString with String concatenation for map key's value in ScriptedReportingTaskGroovyTest to avoid runtime error of casting GString to String when retrieved from a map that is storing the GString
Removed nifi-toolkit-api plugin configuration of maven-compiler-plugin, it is inherited
Resolved deprecation errors during Groovy compile for bouncycastle, Extension should be used in place of X509Extension
Fixed JNAOverridingJUnitRunner's creation of the classpath for the custom classloader created to be able to mock jna classes
Removed import of IOUtils (from the wrong package) from InferenceSchemaStrategy
Updated maven-compiler-plugin version to 3.8.1
TLS (default in Java 11 is TLSv1.3) working for Site-to-Site client tests after upgrading JDK installation to JDK 11.0.3, httpclient5 5.0-beta4, and httpasyncclient 4.1.4
HttpNotificationService updated to find and use the first found X509TrustManager rather than casting directly from the array of TrustManagers returned from SslContextFactory
Removed unnecessary throws declaration from getSslSocketFactory method
Replaced DnsContextFactory.class.getName() with a string to avoid having to export/open the jdk.naming.dns module
Updated TestGetIgniteCache and TestPutIgniteCache.java to skip tests on Java 11+ (via Assume), and noted the check should be removed once a version of Ignite is released that supports Java 11
Updated SpringContextProcessor to create proper ClassLoader and uses URLClassloader.getResource() instead of URLClassloader.findResource() in isConfigResolvable.
Due to the application classloader no longer being a URLClassLoader in Java 9+, the URLClassLoader created in isConfigResolvable no longer has explicit access to the parent's resources as URLs.
URLClassLoader.getResource() searches the parent classloaders, and must be used instead of URLClassLoader.findResource() which only searches the URLs in the URLClassLoader and does not search the parent classloaders.
NIFI-5176 Moved exclusion of jdk.tools to the jigsaw profile in the POMs of nifi-hbase_1_1_2-client-service and nifi-hbase_2-client-service
NIFI-5176 Updated site-to-site-client's POM to use properties to establish the correct httpclient dependency for when building with Java 11
This closes #3404.
2018-11-30 13:14:31 -05:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
2021-08-19 16:42:13 -04:00
|
|
|
<groupId>org.glassfish.jaxb</groupId>
|
|
|
|
<artifactId>jaxb-runtime</artifactId>
|
|
|
|
<version>${jaxb.runtime.version}</version>
|
NIFI-5176 NiFI builds on Java 11
Added "jigsaw" profile to multiple modules, which auto-activates when building with Java 11 and adds several dependencies: jaxb, activation, and annotation-api.
Updated SslContextFactory to return tuple of socket factory with trust manager for issue with okhttp api changes in java 9+
Updated TestGet/PostHTTPGroovy to use default SSL context to get default cipher suites
Updated StandardTemplateDAOSpec.groovy, was using a 37-character UUID, shortened to 36 characters.
Multiple tests updated to specifically use TLSv1.2, since two-way TLSv1.3 for some component tests fail during the Java 11 build. Needs more investigation.
Replaced GString with String concatenation for map key's value in ScriptedReportingTaskGroovyTest to avoid runtime error of casting GString to String when retrieved from a map that is storing the GString
Removed nifi-toolkit-api plugin configuration of maven-compiler-plugin, it is inherited
Resolved deprecation errors during Groovy compile for bouncycastle, Extension should be used in place of X509Extension
Fixed JNAOverridingJUnitRunner's creation of the classpath for the custom classloader created to be able to mock jna classes
Removed import of IOUtils (from the wrong package) from InferenceSchemaStrategy
Updated maven-compiler-plugin version to 3.8.1
TLS (default in Java 11 is TLSv1.3) working for Site-to-Site client tests after upgrading JDK installation to JDK 11.0.3, httpclient5 5.0-beta4, and httpasyncclient 4.1.4
HttpNotificationService updated to find and use the first found X509TrustManager rather than casting directly from the array of TrustManagers returned from SslContextFactory
Removed unnecessary throws declaration from getSslSocketFactory method
Replaced DnsContextFactory.class.getName() with a string to avoid having to export/open the jdk.naming.dns module
Updated TestGetIgniteCache and TestPutIgniteCache.java to skip tests on Java 11+ (via Assume), and noted the check should be removed once a version of Ignite is released that supports Java 11
Updated SpringContextProcessor to create proper ClassLoader and uses URLClassloader.getResource() instead of URLClassloader.findResource() in isConfigResolvable.
Due to the application classloader no longer being a URLClassLoader in Java 9+, the URLClassLoader created in isConfigResolvable no longer has explicit access to the parent's resources as URLs.
URLClassLoader.getResource() searches the parent classloaders, and must be used instead of URLClassLoader.findResource() which only searches the URLs in the URLClassLoader and does not search the parent classloaders.
NIFI-5176 Moved exclusion of jdk.tools to the jigsaw profile in the POMs of nifi-hbase_1_1_2-client-service and nifi-hbase_2-client-service
NIFI-5176 Updated site-to-site-client's POM to use properties to establish the correct httpclient dependency for when building with Java 11
This closes #3404.
2018-11-30 13:14:31 -05:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>com.sun.activation</groupId>
|
|
|
|
<artifactId>javax.activation</artifactId>
|
|
|
|
<version>1.2.0</version>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>javax.annotation</groupId>
|
|
|
|
<artifactId>javax.annotation-api</artifactId>
|
|
|
|
<version>1.3.2</version>
|
|
|
|
</dependency>
|
|
|
|
</dependencies>
|
|
|
|
</dependencyManagement>
|
|
|
|
</profile>
|
2021-03-31 15:44:32 -04:00
|
|
|
<profile>
|
2022-06-04 12:24:53 -04:00
|
|
|
<!-- Run "mvn validate -P dependency-check" to generate dependency-check-report.html in the target directory -->
|
2021-03-31 15:44:32 -04:00
|
|
|
<!-- Report results require detailed analysis to determine whether the vulnerability impacts the application -->
|
2022-06-04 12:24:53 -04:00
|
|
|
<id>dependency-check</id>
|
2021-03-31 15:44:32 -04:00
|
|
|
<build>
|
|
|
|
<plugins>
|
|
|
|
<plugin>
|
|
|
|
<groupId>org.owasp</groupId>
|
|
|
|
<artifactId>dependency-check-maven</artifactId>
|
2022-09-12 10:28:26 -04:00
|
|
|
<version>7.1.2</version>
|
2021-03-31 15:44:32 -04:00
|
|
|
<executions>
|
|
|
|
<execution>
|
|
|
|
<inherited>false</inherited>
|
2022-06-04 12:24:53 -04:00
|
|
|
<phase>validate</phase>
|
2021-03-31 15:44:32 -04:00
|
|
|
<goals>
|
|
|
|
<goal>aggregate</goal>
|
|
|
|
</goals>
|
|
|
|
<configuration>
|
|
|
|
<suppressionFiles>nifi-dependency-check-maven/suppressions.xml</suppressionFiles>
|
2021-09-13 13:42:54 -04:00
|
|
|
<!-- Skip System Scope to avoid dependency resolution errors with jdk.tools on Java 8 -->
|
|
|
|
<skipSystemScope>true</skipSystemScope>
|
2022-09-12 10:28:26 -04:00
|
|
|
<!-- Disable .NET Assembly Analyzer to avoid non-applicable errors -->
|
|
|
|
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
|
2021-03-31 15:44:32 -04:00
|
|
|
</configuration>
|
|
|
|
</execution>
|
|
|
|
</executions>
|
|
|
|
</plugin>
|
|
|
|
</plugins>
|
|
|
|
</build>
|
|
|
|
</profile>
|
2015-08-19 16:53:59 -04:00
|
|
|
</profiles>
|
2015-12-29 13:43:54 -05:00
|
|
|
</project>
|