Commit Graph

103 Commits

Author SHA1 Message Date
Bryan Bende ab28464ef0
NIFI-13913 Set provided scope on slf4-api in nifi-registry-web-api (#9431)
- The slf4j-api library is provided in the project lib directory and should not be packaged in the WAR

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2024-10-21 12:16:30 -05:00
dan-s1 b3fac8c80b
NIFI-13403 Removed unnecessary toString in logging statements
This closes #8984

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2024-06-25 20:13:08 -05:00
Joseph Witt 87107b311a
NIFI-13438 Upgraded Spring to 6.1.10 along with other dependencies
- Upgraded sshd from 2.12.1 to 2.13.1
- Upgraded reactor-netty-http from 1.1.19 to 1.1.20
- Upgraded guava from 33.2.0-jre to 33.2.1-jre
- Upgraded maven-artifact from 3.9.7 to 3.9.8
- Upgraded spring-integrations from 6.3.0 to 6.3.1
- Upgraded jjwt from 0.12.5 to 0.12.6
- Upgraded unboundid from 7.0.0 to 7.0.1
- Upgraded json-schema-validator from 1.4.0 to 1.4.2
- Upgraded Spring Boot from 3.3.0 to 3.3.1
- Upgraded jline from 3.26.1 to 3.26.2
- Upgraded com.amazonaws from 1.12.742 to 1.12.748
- Upgraded AWS SDK from 2.26.1 from 2.26.8
- Upgraded Spring from 6.1.9 to 6.1.10
- Upgraded Spring Security from 6.3.0 to 6.3.1

This closes #9001

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2024-06-24 21:59:55 -05:00
dan-s1 957510e65a NIFI-13421 Replaced String.format in logging statements where only formatting strings (%s) with the use of logging parameters ({})
This closes #8994

Signed-off-by: Mike Thomsen <mthomsen@apache.org>
2024-06-23 18:13:39 -04:00
exceptionfactory 49a0401058
NIFI-13414 Removed Property Protection Modules and Encrypt Config
This closes #8978

- Removed nifi-property-protection-api and implementation modules
- Removed nifi-toolkit-encrypt-config and minifi-toolkit-encrypt-config modules
- Removed extra bootstrap.conf configuration files for property protection implementations

Signed-off-by: Joseph Witt <joewitt@apache.org>
2024-06-20 13:04:00 -07:00
dan-s1 a8e8b6a86b NIFI-13379 Replaced use of deprecated com.nimbusds.oauth2.sdk.http.HTTPResponse method getContentAsJSONObject with API suggested replacement getBodyAsJSONObject.
This closes #8944

Signed-off-by: Mike Thomsen <mthomsen@apache.org>
2024-06-13 09:16:32 -04:00
dan-s1 7deac6afac
NIFI-13266 Removed String concatenation in logging messages (#8940)
Signed-off-by: David Handermann <exceptionfactory@apache.org>
2024-06-11 23:26:58 -04:00
dan-s1 86d36d2327
NIFI-13265 Removed instantiation of Object arrays for log arguments
This closes #8896

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2024-05-30 17:17:33 -05:00
dan-s1 4ccf3a288c
NIFI-13225 Replaced most of the deprecated elements in Registry JwtService
This closes #8827

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2024-05-15 07:09:44 -05:00
Pierre Villard ee179f4acf
NIFI-13238 Added Checkstyle rules for whitespace
This closes #8832

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2024-05-15 06:41:19 -05:00
Joseph Witt 03005aa132
NIFI-13185 Removed manual and non-working Integration Tests
Removed the entire integration-tests-ci profile and reference in GitHub workflow.

Removed all tests which require specific local env configs/cloud credentials/ or simply do not work and thus have been blocked from the build for a long time.

Set Disabled annotation on a couple key tests which are by design manual and must be retained.

The move to testcontainers has been a dramatic improvement in test reliability/behaviors and should be a model for all such tests going forward.

This closes #8818

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2024-05-11 20:51:41 -05:00
Joseph Witt f0d0676518
NIFI-13178 Upgraded extension and framework dependencies
- Upgraded Apache Mina 2.1.8 to 2.2.3
- Upgraded unboundid-ldapsdk from 6.0.11 to 7.0.0
- Upgraded okhttp-digest from 2.7 to 3.1.0
- Upgraded reactor-netty-http from 1.0.44 to 1.1.18
- Upgraded jetbrains-annotations 13.0 to 24.1.0
- Upgraded reactor-core from 3.4.37 to 3.6.5
- Upgraded reactor-test from 3.5.16 to 3.6.5

This closes #8775

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2024-05-07 21:49:27 -05:00
Joseph Witt 7a6c26fd96
NIFI-13144 improved depependency update config and various dependencies
com.puppycrawl.tools:checkstyle 10.15.0 -> 10.16.0
software.amazon.awssdk:xray  2.25.40 -> 2.25.45
com.amazonaws:aws-java-sdk-keyspaces  1.12.710 -> 1.12.715
com.azure:azure-sdk-bom  1.2.21 -> 1.2.23
com.google.cloud:libraries-bom  26.37.0 -> 26.38.0
net.bytebuddy:byte-buddy  1.14.12 -> 1.14.14
org.checkerframework:checker-qual  3.37.0 -> 3.43.0
org.eclipse.jdt:ecj  3.33.0 -> 3.37.0
com.microsoft.azure:msal4j  1.14.3 -> 1.15.0
com.google.guava:guava  33.1.0-jre -> 33.2.0-jre
com.ibm.icu:icu4j  74.2 -> 75.1
org.opensaml:opensaml-* 4.3.1 -> 4.3.2
org.apache.sshd:sshd-*  2.12.0 -> 2.12.1
com.nimbusds:oauth2-oidc-sdk  9.43.3 -> 9.43.4
excel-streaming-reader  4.2.1 -> 4.3.1
amqp-client 5.20.0 5.21.0
json-schema-validator 1.3.2 1.4.0
Saxon-HE 12.3 12.4
lucene 8.11.2 8.11.3
commons-compiler 3.1.10 3.1.12
dropbox.client.version 5.4.4 5.4.6
subethasmtp 7.0.1 7.0.2
docker-java-api 3.3.4 3.3.6
google-api-services-drive v3-rev20230520-2.0.0	v3-rev20240327-2.0.0
protobuf-java 3.25.1 3.25.3
hazelcast 5.3.5 5.3.7
jackson-datatype-protobuf 0.9.14 0.9.15
kusto-* 5.0.3 5.0.5
mysql-connector-j 8.3.0 8.4.0
docker-compose-junit-jupiter 2.0.0 2.3.0
bolt-socket-mode 1.37.0 1.39.0
wire-schema-jvm 4.9.3 4.9.9
mysql-binlog-connector-java 0.29.0 0.29.2
jjwt 0.12.3 0.12.5
reactor-core 3.4.34 3.4.37
reactor-test 3.5.14 3.5.16
jakarta.activation-api 2.0.1 (and 2.1.2) to 2.1.3
jakarta.mail-api 2.0.1 (and 2.1.2) to 2.1.3
datafaker 2.0.2 to 2.2.2
jna and jna-platform 5.13.0 5.14.0
activemq-* 6.1.1 6.1.2
camel-salesforce 3.14.9 3.14.10
commons-csv 1.10.0 1.11.0
hbase.version 2.5.5-hadoop3 2.5.8-hadoop3
httpasyncclient 4.1.4 4.1.5
httpcore-nio 4.4.12 4.4.16
iotdb 1.3.0 1.3.1
mina-core 2.1.6 2.1.8
gremlin-* 3.7.1 3.7.2
clojure 1.11.2 1.11.3
angus-mail 2.0.2 2.0.3
jgit* 6.8.0.202311291450-r 6.9.0.202403050737-r
javaassist 3.29.2-GA 3.30.2-GA
jline 3.25.1 3.26.1
mariadb-java-client	3.3.0 3.3.3
mongodb-driver-sync 4.11.1 4.11.2
neo4j-java-driver 4.4.12 4.4.16
postgresql 4.7.2 4.7.3
spring-data-redis 2.7.15 2.7.18
spring-integration-mail 6.2.1 6.2.4
spring-vault-core 3.1.0 3.1.1
xmlunit-core 2.9.1 2.10.0
xmlunit-matchers 2.9.1 2.10.0
amazon-kinesis-client 2.5.7 2.5.8
reactor-netty-http 1.0.39 1.0.44
ant 1.10.13 1.10.14
hamcrest-core and hamcrest-all 1.3 moved to just hamcrest 2.2

This closes #8746

Signed-off-by: Chris Sampson <chris.sampson82@gmail.com>
2024-05-06 15:13:18 +01:00
Joseph Witt 42a4385c82
NIFI-12998 Restructured framework and extension modules
Simplified dependency management into Bill of Material dependencies as parents that align to classloader structures.

- Moved nifi-framework-bundle to root level
- Moved nifi-nar-bundle modules to root nifi-extension-bundles
- Added nifi-extension-bom for internal and external extensions
- Added nifi-framework-nar-bom and nifi-server-nar-bom for managing framework dependencies
- Renamed nifi-jetty-bundle to nifi-jetty-nar

This closes #8677

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2024-04-26 12:12:48 -05:00
mr1716 f70db0d235
NIFI-12729 Upgraded unboundid-ldapsdk from 6.0.10 to 6.0.11
This closes #8344

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2024-02-02 16:29:28 -06:00
David Handermann 693b187396
NIFI-12666 Corrected Registry Data Source Configuration (#8299) 2024-01-24 20:59:03 -05:00
David Handermann 250fe90b34
NIFI-9458 Replaced SimpleDateFormat with DateTimeFormatter (#8248)
- Added FieldConverterRegistry and Standard implementation
- Moved DateTypeUtils methods to FieldConverter implementations
2024-01-16 16:39:40 -05:00
exceptionfactory dc87cfa9ab
NIFI-12591 Upgraded from Swagger Annotations 1.6.12 to 2.2.20
- Added nifi-swagger-integration with ObjectMapperProcessor for enum customization
- Changed nifi-web-api REST API documentation to use HTML template from swagger-codegen-maven-plugin

Upgraded references in multiple modules:

- c2-protocol-api
- c2-protocol-component-api
- minifi-c2-service
- nifi-api
- nifi-client-dto
- nifi-extension-manifest-model
- nifi-registry-revision-entity-model
- nifi-registry-data-model
- nifi-registry-web-api
- nifi-web-api

Signed-off-by: Csaba Bejan <bejan.csaba@gmail.com>

This closes #8232.
2024-01-11 15:11:28 +01:00
exceptionfactory 42547eb60c
NIFI-11703 Upgraded to Spring Framework 6 and Jetty 12
- Upgraded Spring Framework from 5.3.31 to 6.0.15
- Upgraded Spring Security from 5.8.7 to 6.2.0
- Upgraded Spring Vault from 2.3.4 to 3.1.0
- Upgraded Jetty from 10.0.18 to 12.0.5 with EE 10
- Upgraded Jersey from 2.41 to 3.1.4
- Upgraded JAXB from 2.3.9 to 4.0.4
- Upgraded AspectJ from 1.9.20.1 to 1.9.21
- Upgraded JMS API from 2.0.1 to 3.1.0
- Upgraded ActiveMQ Broker from 5.18.2 to 6.0.1 for JMS 3
- Upgraded JJWT from 0.9.1 to 0.12.3
- Replaced jackson-module-jaxb-annotations with jackson-module-jakarta-xmlbind-annotations
- Replaced maven-jaxb2-plugin with hisrc-higherjaxb40-maven-plugin 2.1.1
- Replaced kongchen swagger-maven-plugin with swagger-codegen-maven-plugin from Swagger 3
- Replaced com.nickwongdev AspectJ Plugin with Codehaus 1.14.0 for newer Java versions
- Removed unused cglib-nodep
- Removed references to javax.validation
- Removed custom Jetty ALPN Processor not required for Java 21
- Removed several tests depending on older Jetty and Jakarta libraries
- Removed unnecessary webdefault.xml configurations
- Replaced unsupported cross-context servlet forwarding with HTTP forwarding
- Replaced javax.servlet references with jakarta.servlet
- Replaced javax.xml.bind references with jakarta.xml.bind
- Replaced javax.ws references with jakarata.ws
- Updated Spring Security CSRF implementation for Spring Security 6
- Updated web.xml versions to 6.0
- Updated REST API templates using new swagger-codegen variables
- Removed VALIDATE_DATA property from ParseCEF based on library compatibility issue with javax.validation
- Added application URL logging to NiFi JettyServer

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #8197.
2024-01-04 14:01:32 +04:00
David Handermann 6b7b7cccf8
NIFI-12493 Update Documentation References to Java 21 (#8144)
* NIFI-12493 Updated Documentation References to Java 21

- Removed Apache Maven download step from Custom Distribution instructions and referenced Apache Maven Wrapper in command
- Updated Java Documentation links to Java 21

* NIFI-12493 Updated additional Java version references
2023-12-19 09:49:00 -05:00
David Handermann 2794193608
NIFI-12487 Added CSRF Protection to Registry (#8136)
- Added CSRF Token Repository based on existing implementation
- Updated Angular Request Interceptor to read cookie and send Request-Token Header
2023-12-18 15:08:01 -05:00
exceptionfactory 429b521cb9
NIFI-12434 Upgraded Registry to Spring Framework 6.1.1
- Upgraded Spring Framework from 6.0.13 to 6.1.1
- Upgraded Spring Boot from 3.1.5 to 3.2.0
- Upgraded Spring Security from 6.1.5 to 6.2.0
- Upgraded Jetty from 11.0.18 to 12.0.3
- Upgraded Servlet API from 5.0.0 to 6.0.0
- Adjusted Registry Database Tests to streamline DataSource configuration

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #8087.
2023-12-01 16:07:28 +01:00
mr1716 6255a98b22
NIFI-12430 Upgraded unboundid-ldapsdk from 6.0.9 to 6.0.10
This closes #8080

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2023-11-29 22:42:10 -06:00
exceptionfactory 6617fe8fe2
NIFI-12384 This closes #8044. Upgraded Registry to Spring Framework 6
- Upgraded Spring from 5.3.30 to 6.0.13
- Upgraded Spring Boot from 2.7.16 to 3.1.5
- Upgraded Spring Security from 5.8.7 to 6.1.5
- Upgraded Jetty from 10.0.18 to 11.0.18
- Upgraded Servlet API from 3.1.0 to 5.0.0
- Upgraded JAX-RS from 2.1.1 to 3.1.0
- Upgraded Jersey from 2.41 to 3.1.3
- Upgraded JAXB from 2.3.2 to 4.0.4
- Upgraded Java Validation from 2.0.1 to 3.0.2
- Upgraded Flyway from 8.5.13 to 9.22.3
- Upgraded ASM from 9.3 to 9.6 for Java 21
- Upgraded NiFi Toolkit CLI to JAX RS 3 and Jersey 3
- Set Jersey 3 and JAX RS 3 dependency versions in nifi-flow-registry-client-bundle to align with updates to nifi-registry-client classes

Signed-off-by: Joseph Witt <joewitt@apache.org>
2023-11-21 09:06:51 -07:00
Zackeus Bengtsson 33c8029d65
NIFI-12298 add swagger annotations for createExtensionBundleVersion form fields
Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #7961.
2023-10-31 16:52:57 -07:00
Mark Bean 94e746dc47
NIFI-12283 Added include-swagger-ui profile with activation by default
Deactivating prevents attempt to download swagger asset from the Internet allowing for offline builds.

This closes #7945

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2023-10-27 16:24:21 -05:00
exceptionfactory f0593a0034
NIFI-12272 Added Formatter for Certificate Distinguished Names
- Added standard implementation for formatting Subject and Issuer using RFC 1779
- Replaced direct method references to maintain compatibility with historical getSubjectDN and getIssuerDN methods

This closes #7931

Signed-off-by: Chris Sampson <chris.sampson82@gmail.com>
2023-10-25 19:54:27 +01:00
Paul Grey 88bdeee219
NIFI-12200 Removed module nifi-toolkit-tls
This closes #7879

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2023-10-19 00:01:22 -05:00
Joseph Witt 67ba13796e
NIFI-12150 Restored NiFiRegistrySecurityConfig required for Registry
- NiFiRegistrySecurityConfig was removed mistakenly in NIFI-12147 and updating extractor to match changes in NIFI-12147 for DN extraction

This closes #7815

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2023-09-29 14:21:40 -05:00
Mark Payne db727aa419
NIFI-12142: This closes #7806. Deleted many methods, classes, and references that were deprecated.
Signed-off-by: Joseph Witt <joewitt@apache.org>
2023-09-28 14:07:48 -07:00
Pierre Villard 2aca08910c
NIFI-12103 Replaced deprecated usage of new URL(String)
This closes #7771

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2023-09-23 10:30:42 -05:00
Pierre Villard 4b9eb8361c
NIFI-12113 Replaced Validate.notNull() with Objects.requireNonNull()
This closes #7779

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2023-09-22 15:18:50 -05:00
Joseph Witt a1fca9b44e
NIFI-12064 Upgraded Maven Plugin versions
This closes #7731

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2023-09-14 19:35:51 -05:00
exceptionfactory 98fa7d0290
NIFI-12060 This closes #7694. Removed Groovy Tests using Spock Framework
- Added org.spockframework to the list of banned dependencies
- Removed several other Groovy tests and associated build profiles

Signed-off-by: Joseph Witt <joewitt@apache.org>
2023-09-14 11:22:54 -07:00
Ravinarayan Singh 56a65a5877
NIFI-11947 Support preserving created timestamp for Flow Snapshots
This closes #7610

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2023-08-30 12:19:59 -05:00
exceptionfactory c08560447f NIFI-11518 Upgraded Jetty from 9.4.51 to 10.0.15
- Updated Jetty WebSocket components using Jetty 10 components
- Upgraded Solr components from 8.11.2 to 9.2.1 to align with Jetty 10 dependencies

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

This closes #7622
2023-08-23 14:42:59 -04:00
mr1716 70c756ff78
NIFI-11953 Upgraded download-maven-plugin from 1.6.8 to 1.7.1
This closes #7613

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2023-08-16 21:03:41 -05:00
Pierre Villard dbb2d6905f
NIFI-11842 - remove getTargetUri() and code cleanup
This closes #7511

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2023-07-24 13:53:17 -05:00
mr1716 05322fa8ce
NIFI-11730 Upgraded UnboundID LDAP SDK from 6.0.8 to 6.0.9
This closes #7412

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2023-06-20 17:12:05 -05:00
exceptionfactory 0ed1efc50a
NIFI-11712 Removed java.net.preferIPv4Stack from bootstrap.conf
Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #7392.
2023-06-19 10:22:31 +02:00
exceptionfactory ca6c7f7041 NIFI-11532 Removed JUnit 4 and Groovy Test from default dependencies
- Removed hamcrest-all from default dependencies
- Added groovy-test to selected modules with Groovy test classes
- Added junit-vintage-engine to selected modules with JUnit 4 test classes
- Corrected references to JUnit 4 assertions in JUnit 5 test classes
- Removed several unnecessary test classes from nifi-socket-utils
- Removed duplicative Registry toolkit test classes
- Removed Kudu integration tests

NIFI-11532 Corrected scope for junit-vintage-engine for Elasticsearch

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

This closes #7233
2023-06-13 15:36:23 -04:00
siddr 0cd511f1aa
NIFI-11640 Upgraded download-maven-plugin from 1.2.1 to 1.6.8
This closes #7337

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2023-06-05 11:33:34 -05:00
Jeyassri Balchandran 764cc9e9b0
NIFI-11467 Upgraded jjwt from 0.7.0 to 0.9.1
This closes #7256

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2023-05-17 09:39:11 -05:00
nathluu 0308b5b404
NIFI-11545 Fixed test-all-dbs for Registry integration tests
This closes #7244

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2023-05-15 10:30:24 -05:00
timeabarna 3df8c9d2ac
NIFI-11327 Add Export/Import All - NiFi CLI - NiFi Registry (#7092)
* NIFI-11327 Add Export/Import All - NiFi CLI - NiFi Registry
* NIFI-11327 Addressing review comment, updating storage location, improving serialization
* NIFI-11327 Addressing review comments, updating Rest endpoints and storage location handling
* NIFI-11327 Restoring EventType to its original version
* NIFI-11327 Addressing review comments changing skipExisting, updating documentation, adding some more error handling
2023-04-19 13:27:41 -04:00
Pierre Villard 0160d6d6b9
NIFI-11410 Upgraded multiple integration dependencies
- Upgraded Spring Boot from 2.7.9 to 2.7.10

This closes #7141

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2023-04-10 08:40:09 -05:00
Pierre Villard 4a0b38f4dd
NIFI-11405 Upgraded multiple drivers and test dependencies
This closes #7134

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2023-04-07 15:54:51 -05:00
exceptionfactory f0c9f3f892
NIFI-11372 Removed unused javax.el dependency from Registry
- Removed unnecessary JSTL dependency and reference from Documentation JSP

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #7110.
2023-04-02 17:18:39 +02:00
Mark Bean af3737e670
NIFI-11302 Corrected Registry version retrieval
- Updated Maven JAR plugin configuration for nifi-registry-data-model to include implementation version

This closes #7057

Co-authored-by: David Handermann <exceptionfactory@apache.org>
Signed-off-by: David Handermann <exceptionfactory@apache.org>
2023-03-22 16:44:59 -05:00
Chris Sampson d604c87247
NIFI-11311 Updated maven-antrun-plugin to 3.1.0 across all modules
This closes #7062

Signed-off-by: David Handermann <exceptionfactory@apache.org>
2023-03-21 08:06:02 -05:00