2014-12-08 15:22:14 -05:00
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
|
<!--
|
|
|
|
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 language governing permissions and
|
|
|
|
limitations under the License.
|
|
|
|
-->
|
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">
|
2014-12-08 15:22:14 -05:00
|
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
|
<parent>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
2015-01-21 01:47:48 -05:00
|
|
|
<artifactId>nifi-web</artifactId>
|
2023-02-09 17:32:53 -05:00
|
|
|
<version>2.0.0-SNAPSHOT</version>
|
2014-12-08 15:22:14 -05:00
|
|
|
</parent>
|
2015-01-21 01:47:48 -05:00
|
|
|
<artifactId>nifi-web-security</artifactId>
|
2015-10-07 13:33:34 -04:00
|
|
|
<build>
|
|
|
|
<resources>
|
|
|
|
<resource>
|
|
|
|
<directory>src/main/resources</directory>
|
|
|
|
</resource>
|
|
|
|
<resource>
|
|
|
|
<directory>src/main/xsd</directory>
|
|
|
|
</resource>
|
|
|
|
</resources>
|
|
|
|
<plugins>
|
2019-03-08 16:53:11 -05:00
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-jar-plugin</artifactId>
|
|
|
|
<executions>
|
|
|
|
<execution>
|
|
|
|
<goals>
|
|
|
|
<goal>test-jar</goal>
|
|
|
|
</goals>
|
|
|
|
</execution>
|
|
|
|
</executions>
|
|
|
|
</plugin>
|
2015-10-07 13:33:34 -04:00
|
|
|
<plugin>
|
2023-02-09 23:41:49 -05:00
|
|
|
<groupId>org.jvnet.jaxb2.maven2</groupId>
|
|
|
|
<artifactId>maven-jaxb2-plugin</artifactId>
|
2015-10-07 13:33:34 -04:00
|
|
|
<executions>
|
|
|
|
<execution>
|
|
|
|
<id>current</id>
|
|
|
|
<goals>
|
2023-02-09 23:41:49 -05:00
|
|
|
<goal>generate</goal>
|
2015-10-07 13:33:34 -04:00
|
|
|
</goals>
|
|
|
|
<configuration>
|
2023-02-09 23:41:49 -05:00
|
|
|
<generatePackage>org.apache.nifi.authentication.generated</generatePackage>
|
|
|
|
<schemaDirectory>src/main/xsd</schemaDirectory>
|
2015-10-07 13:33:34 -04:00
|
|
|
</configuration>
|
|
|
|
</execution>
|
|
|
|
</executions>
|
|
|
|
</plugin>
|
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
|
<artifactId>maven-checkstyle-plugin</artifactId>
|
|
|
|
<configuration>
|
|
|
|
<excludes>**/authentication/generated/*.java,</excludes>
|
|
|
|
</configuration>
|
2015-12-22 13:12:02 -05:00
|
|
|
</plugin>
|
2020-09-15 15:53:32 -04:00
|
|
|
<plugin>
|
|
|
|
<groupId>org.apache.rat</groupId>
|
|
|
|
<artifactId>apache-rat-plugin</artifactId>
|
|
|
|
<configuration>
|
|
|
|
<excludes combine.children="append">
|
|
|
|
<exclude>src/test/resources/saml/sso-circle-meta.xml</exclude>
|
|
|
|
</excludes>
|
|
|
|
</configuration>
|
|
|
|
</plugin>
|
2015-10-07 13:33:34 -04:00
|
|
|
</plugins>
|
|
|
|
</build>
|
2014-12-08 15:22:14 -05:00
|
|
|
<dependencies>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-administration</artifactId>
|
|
|
|
</dependency>
|
2015-10-07 13:33:34 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-nar-utils</artifactId>
|
|
|
|
</dependency>
|
2014-12-08 15:22:14 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-api</artifactId>
|
|
|
|
</dependency>
|
2016-07-13 09:28:19 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-framework-api</artifactId>
|
|
|
|
</dependency>
|
2014-12-08 15:22:14 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-web-utils</artifactId>
|
|
|
|
</dependency>
|
2017-09-06 19:45:13 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-security-utils</artifactId>
|
|
|
|
</dependency>
|
2014-12-08 15:22:14 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
2015-01-21 01:47:48 -05:00
|
|
|
<artifactId>nifi-framework-core</artifactId>
|
2014-12-08 15:22:14 -05:00
|
|
|
</dependency>
|
2016-04-29 14:49:13 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-framework-authorization</artifactId>
|
|
|
|
</dependency>
|
2022-04-19 11:08:04 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-property-protection-api</artifactId>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-property-protection-loader</artifactId>
|
|
|
|
</dependency>
|
2014-12-08 15:22:14 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.bouncycastle</groupId>
|
2022-10-07 19:11:58 -04:00
|
|
|
<artifactId>bcprov-jdk18on</artifactId>
|
2015-12-22 22:03:09 -05:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.bouncycastle</groupId>
|
2022-10-07 19:11:58 -04:00
|
|
|
<artifactId>bcpkix-jdk18on</artifactId>
|
2014-12-08 15:22:14 -05:00
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework</groupId>
|
|
|
|
<artifactId>spring-jdbc</artifactId>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework</groupId>
|
|
|
|
<artifactId>spring-web</artifactId>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework.security</groupId>
|
|
|
|
<artifactId>spring-security-core</artifactId>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework.security</groupId>
|
|
|
|
<artifactId>spring-security-config</artifactId>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework.security</groupId>
|
|
|
|
<artifactId>spring-security-web</artifactId>
|
|
|
|
</dependency>
|
2022-06-13 15:06:07 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework</groupId>
|
|
|
|
<artifactId>spring-context-support</artifactId>
|
|
|
|
</dependency>
|
2023-02-09 23:41:49 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>jakarta.xml.bind</groupId>
|
|
|
|
<artifactId>jakarta.xml.bind-api</artifactId>
|
|
|
|
</dependency>
|
2014-12-08 15:22:14 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>javax.servlet</groupId>
|
|
|
|
<artifactId>javax.servlet-api</artifactId>
|
|
|
|
<scope>provided</scope>
|
|
|
|
</dependency>
|
2020-09-15 15:53:32 -04:00
|
|
|
<dependency>
|
2022-06-13 15:06:07 -04:00
|
|
|
<groupId>org.springframework.security</groupId>
|
|
|
|
<artifactId>spring-security-saml2-service-provider</artifactId>
|
|
|
|
<exclusions>
|
|
|
|
<!-- Exclude Velocity from OpenSAML -->
|
|
|
|
<exclusion>
|
|
|
|
<groupId>org.apache.velocity</groupId>
|
|
|
|
<artifactId>velocity</artifactId>
|
|
|
|
</exclusion>
|
2022-10-07 19:11:58 -04:00
|
|
|
<exclusion>
|
|
|
|
<groupId>org.bouncycastle</groupId>
|
|
|
|
<artifactId>bcprov-jdk15on</artifactId>
|
|
|
|
</exclusion>
|
2022-06-13 15:06:07 -04:00
|
|
|
</exclusions>
|
2020-09-15 15:53:32 -04:00
|
|
|
</dependency>
|
2016-03-11 18:11:19 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework.security.kerberos</groupId>
|
|
|
|
<artifactId>spring-security-kerberos-core</artifactId>
|
|
|
|
</dependency>
|
2021-07-28 17:45:39 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework.security</groupId>
|
|
|
|
<artifactId>spring-security-oauth2-resource-server</artifactId>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework.security</groupId>
|
|
|
|
<artifactId>spring-security-oauth2-core</artifactId>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework.security</groupId>
|
|
|
|
<artifactId>spring-security-oauth2-jose</artifactId>
|
|
|
|
</dependency>
|
2021-02-25 12:59:03 -05:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.slf4j</groupId>
|
|
|
|
<artifactId>jcl-over-slf4j</artifactId>
|
|
|
|
</dependency>
|
2017-08-01 10:46:45 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>com.nimbusds</groupId>
|
|
|
|
<artifactId>oauth2-oidc-sdk</artifactId>
|
|
|
|
</dependency>
|
2017-10-02 17:01:31 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>javax.ws.rs</groupId>
|
|
|
|
<artifactId>javax.ws.rs-api</artifactId>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.glassfish.jersey.core</groupId>
|
|
|
|
<artifactId>jersey-client</artifactId>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.glassfish.jersey.media</groupId>
|
|
|
|
<artifactId>jersey-media-json-jackson</artifactId>
|
|
|
|
</dependency>
|
2021-07-28 17:45:39 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>com.fasterxml.jackson.datatype</groupId>
|
|
|
|
<artifactId>jackson-datatype-jsr310</artifactId>
|
|
|
|
</dependency>
|
2022-06-13 15:06:07 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>com.squareup.okhttp3</groupId>
|
|
|
|
<artifactId>okhttp</artifactId>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>com.squareup.okhttp3</groupId>
|
|
|
|
<artifactId>mockwebserver</artifactId>
|
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
2022-04-19 11:08:04 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.apache.nifi</groupId>
|
|
|
|
<artifactId>nifi-property-protection-factory</artifactId>
|
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
2017-10-02 17:01:31 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.codehaus.jettison</groupId>
|
|
|
|
<artifactId>jettison</artifactId>
|
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
2018-08-31 19:50:15 -04:00
|
|
|
<dependency>
|
|
|
|
<groupId>org.springframework</groupId>
|
|
|
|
<artifactId>spring-test</artifactId>
|
|
|
|
<scope>test</scope>
|
|
|
|
</dependency>
|
|
|
|
<dependency>
|
|
|
|
<groupId>org.eclipse.jetty</groupId>
|
|
|
|
<artifactId>jetty-servlet</artifactId>
|
|
|
|
<scope>test</scope>
|
|
|
|
</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>
|
2014-12-08 15:22:14 -05:00
|
|
|
</dependencies>
|
|
|
|
</project>
|