Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NIFI-5665 - Setting zookeeper's io.netty:netty transitive dependency … #3067

wants to merge 4 commits into from


Copy link

…version to 3.10.6.Final.

NIFI-5665 - Setting all transitive io.netty dependencies to 3.10.6.Final.

NIFI-5665 - Added comments.

NIFI-5665 - Missed zookeeper in some spots.

NIFI-5665 - Reverted Flume version. The netty version contained was not listed explicitly as vulnerable.

Thank you for submitting a contribution to Apache NiFi.

In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:

For all changes:

  • Is there a JIRA ticket associated with this PR? Is it referenced
    in the commit message?

  • Does your PR title start with NIFI-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.

  • Has your PR been rebased against the latest commit within the target branch (typically master)?

  • Is your initial contribution a single, squashed commit?

For code changes:

  • Have you ensured that the full suite of tests is executed via mvn -Pcontrib-check clean install at the root nifi folder?
  • Have you written or updated unit tests to verify your changes?
  • If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
  • If applicable, have you updated the LICENSE file, including the main LICENSE file under nifi-assembly?
  • If applicable, have you updated the NOTICE file, including the main NOTICE file found under nifi-assembly?
  • If adding new Properties, have you added .displayName in addition to .name (programmatic access) for each of the new properties?

For documentation related changes:

  • Have you ensured that format looks appropriate for the output in which it is rendered?


Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.

…version to 3.10.6.Final.

NIFI-5665 - Setting all transitive io.netty dependencies to 3.10.6.Final.

NIFI-5665 - Added comments.

NIFI-5665 - Missed zookeeper in some spots.

NIFI-5665 - Reverted Flume version. The netty version contained was not listed explicitly as vulnerable.
Copy link

Will review...

Copy link

Thanks @thenatog! This has been merged to master.

@asfgit asfgit closed this in 5eb5e96 Oct 12, 2018
adyoun2 added a commit to adyoun2/nifi that referenced this pull request Oct 15, 2018
commit 7cb39d6
Author: Jeff Storck <>
Date:   Fri Oct 12 16:57:15 2018 -0400

    NIFI-5696 Update references to default value for nifi.cluster.node.load.load.balance.port

    This closes apache#3071.

    Signed-off-by: Koji Kawamura <>

commit 0229a5c
Author: zenfenan <>
Date:   Sun Oct 14 13:18:25 2018 +0530

    NIFI-5698: Fixed DeleteAzureBlobStorage bug

    This closes apache#3073.

    Signed-off-by: Koji Kawamura <>

commit e30a21c
Author: Brad Hards <>
Date:   Sat Oct 13 19:25:43 2018 +1100

    [NIFI-5697] Trivial description fix for GenerateFlowFile processor

    This closes apache#3072.

    Signed-off-by: Aldrin Piri <>

commit 270ce85
Author: Mark Payne <>
Date:   Fri Oct 12 15:27:10 2018 -0400

    NIFI-5695: Fixed bug that caused ports to not properly map to their correct child group on Flow Import if the child group is independently versioned

    This closes apache#3070.

    Signed-off-by: Bryan Bende <>

commit 5eb5e96
Author: thenatog <>
Date:   Mon Oct 8 12:58:20 2018 -0400

    NIFI-5665 - Changed netty versions to more closely match the original netty dependency version.
    NIFI-5665 - Fixed version for nifi-spark-bundle.
    NIFI-5665 - Fixing copy and paste error.

    This closes apache#3067

commit 02e0a16
Author: Bryan Bende <>
Date:   Thu Oct 11 15:58:55 2018 -0400

    NIFI-5680 Handling trailing slashes on URLs of registry clients

    This closes apache#3065.

    Signed-off-by: Mark Payne <>

commit 0f88805
Author: Matt Gilman <>
Date:   Fri Oct 12 10:23:47 2018 -0400

    - Overriding the version of jackson in aws java sdk.

    This closes apache#3066.

    Signed-off-by: Aldrin Piri <>

commit e25b26e
Author: joewitt <>
Date:   Fri Oct 12 11:27:48 2018 -0400

    Revert "NIFI-5448 Added failure relationship to UpdateAttributes to handle bad expression language logic."

    This reverts commit 32ee552.

commit 6b77e7d
Author: joewitt <>
Date:   Fri Oct 12 11:08:22 2018 -0400

    Revert "NIFI-5448 Changed from 'stop' to 'penalize' in allowablevalue field to make the popup more consistent."

    This reverts commit 9d2b698.

commit a6b9364
Author: Carl Gieringer <>
Date:   Thu Oct 4 12:50:08 2018 -0400

    NIFI-5664 Support ArrayList in DataTypeUtils#toArray
    NIFI-5664 Generalize to handling List

    This closes apache#3049

    Signed-off-by: Mike Thomsen <>

commit 5aa4263
Author: Endre Zoltan Kovacs <>
Date:   Mon Oct 8 13:10:37 2018 +0200

    NIFI-1490: better field naming / displayname and description mix up fix

    This closes apache#2994.

    Signed-off-by: Mark Payne <>

commit c81a135
Author: Endre Zoltan Kovacs <>
Date:   Thu Sep 6 17:33:33 2018 +0200

    NIFI-1490: multipart/form-data support for ListenHTTP processor
    - introducing a in-memory-file-size-threashold, above which the incoming file is written to local disk
    - using for such file writes
    - enhancing documentation

commit 8398ea7
Author: Mark Payne <>
Date:   Thu Oct 11 14:57:31 2018 -0400

    NIFI-5688: Ensure that when we map our flow to a VersionedProcessGroup that we include the connections' Load Balance Compression flag

    This closes apache#3064

commit 8da403c
Author: Matt Gilman <>
Date:   Thu Oct 11 13:21:20 2018 -0400

    - Allowing load balance settings to be applied during creation.
    - Clearing the load balance settings when the dialog is closed.

commit 79c03ca
Author: Matt Gilman <>
Date:   Thu Oct 11 12:23:53 2018 -0400

    - Allowing the load balance configuration to be shown/edited in both clustered and standalone mode.

commit 64de5c7
Author: thenatog <>
Date:   Fri Sep 7 12:39:18 2018 -0400

    NIFI-5479 - Supressed the AnnotationParser logs using the logback.xml. Dependency changes can be look at in future.
    NIFI-5479 - Updated comment.

    This closes apache#3034

commit 8a751e8
Author: Koji Kawamura <>
Date:   Fri Sep 14 21:18:04 2018 +0900

    NIFI-5661: Adding Load Balance config UI
    Incorporated review comments.
    Move combo options to a common place.

    This closes apache#3046

commit a6f7222
Author: Koji Kawamura <>
Date:   Fri Sep 28 17:37:34 2018 +0900

    NIFI-5645: Auto reconnect ConsumeWindowsEventLog

    This commit also contains following refactoring:
    - Catch URISyntaxException inside subscribe when constructing provenance
    URI as it does not affect the core responsibility of this processor.
    Even if it fails to be a proper URI, if the query works for consuming
    logs, the processor should proceed forward.

    Upgrade JNA version.

    Do not update lastActivityTimestamp when subscribe failed.

    This closes apache#3037

commit 97afa4e
Author: Mark Payne <>
Date:   Tue Oct 9 14:54:21 2018 -0400

    NIFI-5585: Addressed bug in calculating swap size of a queue partition when rebalancing

    This closes apache#3010.

    Signed-off-by: Mark Payne <>

commit a1a4c99
Author: Mark Payne <>
Date:   Mon Oct 8 09:53:14 2018 -0400

    NIFI-5585: Adjustments to the Connection Load Balancing to ensure that node offloading works smoothly

    Signed-off-by: Jeff Storck <>

commit 01e2098
Author: Jeff Storck <>
Date:   Tue Sep 25 15:17:19 2018 -0400

    NIFI-5585 A node that was previously offloaded can now be reconnected to the cluster and queue flowfiles again
    Added Spock test for NonLocalPartitionPartitioner
    Updated NOTICE files for FontAwesome with the updated version (4.7.0) and URL to the free license
    Updated package-lock.json with the updated version of FontAwesome (4.7.0)
    Added method to FlowFileQueue interface to reset an offloaded queue
    Queues that are now immediately have the offloaded status reset once offloading finishes
    SocketLoadBalancedFlowFileQueue now ignores back-pressure when offloading flowfiles
    Cleaned up javascript in nf-cluster-table.js when creating markup for the node operation icons
    Fixed incorrect handling of a heartbeat from an offloaded node.  Heartbeats from offloading or offloaded nodes will now be reported as an event, the heartbeat will be removed and ignored.
    Added unit tests and integration tests to cover offloading nodes
    Updated Cluster integration test class with accessor for the current cluster coordinator
    Updated Node integration test class's custom NiFiProperties implementation to return the load balancing port and a method to assert an offloaded node
    Added exclusion to top-level pom for ITSpec.class

commit be2c24c
Author: Mark Payne <>
Date:   Mon Sep 24 09:17:22 2018 -0400

    NIFI-5585: Fixed bug that arised when multiple nodes were decommissioning at same time; could get into state where the nodes queued up data for one another so the data just stayed put

commit 04d8da8
Author: Jeff Storck <>
Date:   Tue Sep 18 17:09:13 2018 -0400

    NIFI-5585 Added capability to offload a node that is disconnected from the cluster.
    Updated NodeClusterCoordinator to allow idempotent requests to offload a cluster
    Added capability to connect/delete/disconnect/offload a node from the cluster to the Toolkit CLI
    Added capability to get the status of nodes from the cluster to the Toolkit CLI
    Upgraded FontAwesome to 4.7.0 (from 4.6.1)
    Added icon "fa-upload" for offloading nodes in the cluster table UI

commit 83ca676
Author: Kotaro Terada <>
Date:   Tue Oct 9 18:31:41 2018 +0900

    NIFI-5681: Fix a locale-dependent test in TestVersionedFlowSnapshotMetadataResult

    Signed-off-by: Pierre Villard <>

    This closes apache#3061.

commit 6c17685
Author: Kotaro Terada <>
Date:   Fri Oct 5 16:43:44 2018 +0900

    NIFI-5675: Fix some locale-dependent tests in ConvertExcelToCSVProcessorTest

    Signed-off-by: Pierre Villard <>

    This closes apache#3058.

commit fc5c8ba
Author: Kotaro Terada <>
Date:   Tue Oct 9 14:12:53 2018 +0900

    NIFI-5676: Fix a timezone-dependent test in PutORCTest

    Signed-off-by: Pierre Villard <>

    This closes apache#3059.

commit dd50322
Author: Matt Gilman <>
Date:   Tue Oct 9 12:49:31 2018 -0400

    NIFI-5600: Recalculating the available columns for the queue listing and component state because they contain conditions which need to be re-evaluated.

    Signed-off-by: Pierre Villard <>

    This closes apache#3055.

commit 9dfc668
Author: Mark Payne <>
Date:   Tue Oct 9 12:19:24 2018 -0400

    NIFI-5672: Do not compare Load Balancing address/port for logical equivalence of Node Identifiers. Added more details to logging of Node Identifiers

    This closes apache#3054

commit 77edddd
Author: joewitt <>
Date:   Mon Oct 8 13:35:01 2018 -0400

    NIFI-5666 Updated all usages of Spring, beanutils, collections to move beyond deps with cves

    This closes apache#3052

commit 117e60c
Author: Mark Payne <>
Date:   Tue Oct 9 12:23:44 2018 -0400

    Empty commit to force Github sync

commit c425bd2
Author: Mark Payne <>
Date:   Fri Aug 17 14:08:14 2018 -0400

    NIFI-5533: Be more efficient with heap utilization
     - Updated FlowFile Repo / Write Ahead Log so that any update that writes more than 1 MB of data is written to a file inside the FlowFile Repo rather than being buffered in memory
     - Update SplitText so that it does not hold FlowFiles that are not the latest version in heap. Doing them from being garbage collected, so while the Process Session is holding the latest version of the FlowFile, SplitText is holding an older version, and this results in two copies of the same FlowFile object

    NIFI-5533: Checkpoint

    NIFI-5533: Bug Fixes

    Signed-off-by: Matthew Burgess <>

    This closes apache#2974

commit c87d791
Author: Mark Payne <>
Date:   Fri Oct 5 12:06:39 2018 -0400

    NIFI-5663: Ensure that when sort Node Identifiers that we use both the node's API Address as well as API Port, in case 2 nodes are running on same host. Also ensure that when Local Node ID is determined that we update all Load Balancing Partitions, if necessary

    This closes apache#3048.

    Signed-off-by: Koji Kawamura <>

commit 768bcfb
Author: Pierre Villard <>
Date:   Tue Sep 25 22:53:28 2018 +0200

    NIFI-5635 - Description PutEmail properties with multiple senders/recipients

    This closes apache#3031

    Signed-off-by: Mike Moser <>

commit 246c090
Author: thenatog <>
Date:   Thu Sep 13 21:45:00 2018 -0400

    NIFI-5595 - Added the CORS filter to the templates/upload endpoint using a URL matcher.
    Explicitly allow methods GET, HEAD. These are the Spring defaults when the allowedMethods is empty but now it is explicit. This will require other methods like POST etc to be from the same origin (for the template/upload URL).

    This closes apache#3024.

    Signed-off-by: Andy LoPresto <>

commit c6572f0
Author: Matthew Burgess <>
Date:   Fri Aug 10 16:49:25 2018 -0400

    NIFI-4517: Added ExecuteSQLRecord and QueryDatabaseTableRecord processors

    Signed-off-by: Pierre Villard <>

    This closes apache#2945.

commit b4810b8
Author: Mark Payne <>
Date:   Fri Oct 5 12:08:55 2018 -0400

    Empty commit to force sync with mirrors

commit 619f1ff
Author: Mark Payne <>
Date:   Thu Jun 14 11:57:21 2018 -0400

    NIFI-5516: Implement Load-Balanced Connections
    Refactoring StandardFlowFileQueue to have an AbstractFlowFileQueue
    Refactored more into AbstractFlowFileQueue
    Added documentation, cleaned up code some
    Refactored FlowFileQueue so that there is SwappablePriorityQueue
    Several unit tests written
    Added REST API Endpoint to allow PUT to update connection to use load balancing or not. When enabling load balancing, though, I saw the queue size go from 9 to 18. Then was only able to process 9 FlowFiles.
    Bug fixes
    Code refactoring
    Added integration tests, bug fixes
    Refactored clients to use NIO
    Bug fixes. Appears to finally be working with NIO Client!!!!!
    NIFI-5516: Refactored some code from NioAsyncLoadBalanceClient to LoadBalanceSession
    Bug fixes and allowed load balancing socket connections to be reused
    Implemented ability to compress Nothing, Attributes, or Content + Attributes when performing load-balancing
    Added flag to ConnectionDTO to indicate Load Balance Status
    Updated Diagnostics DTO for connections
    Store state about cluster topology in NodeClusterCoordinator so that the state is known upon restart
    Code cleanup
    Fixed checkstyle and unit tests
    NIFI-5516: Updating logic for Cluster Node Firewall so that the node's identity comes from its certificate, not from whatever it says it is.
    NIFI-5516: FIxed missing License headers
    NIFI-5516: Some minor code cleanup
    NIFI-5516: Adddressed review feedback; Bug fixes; some code cleanup. Changed dependency on nifi-registry from SNAPSHOT to official 0.3.0 release
    NIFI-5516: Take backpressure configuration into account
    NIFI-5516: Fixed ConnectionDiagnosticsSnapshot to include node identifier
    NIFI-5516: Addressed review feedback

    This closes apache#2947

commit 5872eb3
Author: Mark Payne <>
Date:   Wed Aug 15 10:23:49 2018 -0400

    NIFI-5331: When checkpointing SequentialAccessWriteAheadLog, if the journal is not healthy, ensure that we roll it over and ensure that if an Exception is thrown when attempting to fsync() or close() the journal, we continue creating a new one.
    This closes apache#2952.
    Signed-off-by: Brandon Devries <>

commit 8f4d13e
Author: Koji Kawamura <>
Date:   Thu Oct 4 13:48:26 2018 +0900

    NIFI-5581: Fix replicate request timeout

    This closes apache#3044

    - Revert 87cf474 to enable connection
    - Changes the expected HTTP status code for the 1st request of a
    two-phase commit transaction from 150 (NiFi custom) to 202 Accepted
    - Corrected RevisionManager Javadoc about revision varidation protocol

commit f65286b
Author: Andy LoPresto <>
Date:   Fri Sep 21 19:26:10 2018 -0700

    NIFI-5622 Updated test resource keystores and truststores with SubjectAlternativeNames to be compliant with RFC 6125.
    Refactored some test code to be clearer.
    Renamed some resources to be consistent across modules.
    Changed passwords to meet new minimum length requirements.

    This closes apache#3018

commit 8e233ca
Author: joewitt <>
Date:   Thu Sep 20 23:24:17 2018 -0400

    NIFI-4806 updated tika and a ton of other deps as found by dependency versions plugin

    This closes apache#3028

commit de685a7
Author: pepov <>
Date:   Tue Oct 2 15:21:36 2018 +0200

    NIFI-5656 Handly empty "Node Group" property in FileAccessPolicyProvider consistently, add some logs to help with debugging, add test for the invalid group name and for the empty case.

    This closes apache#3043.

    Signed-off-by: Kevin Doran <>

commit b4c8e01
Merge: 895323f 76a9f98
Author: Brandon Devries <>
Date:   Tue Oct 2 11:08:43 2018 -0400

    Merge branch 'pr2931'

commit 76a9f98
Author: Mike Moser <>
Date:   Wed Sep 5 15:49:44 2018 -0400

    NIFI-3531 Catch and rethrow generic Exception to handle RuntimeExceptions, and allow test to pass
    This closes apache#2931.
    Signed-off-by: Brandon Devries <>

commit 895323f
Merge: 813cc1f 4f538f1
Author: Brandon Devries <>
Date:   Tue Oct 2 09:40:36 2018 -0400

    Merge branch 'pr2949'

commit 4f538f1
Author: Mike Moser <>
Date:   Tue Aug 14 18:55:10 2018 +0000

    NIFI-3672 updated PublishJMS message property docs

    This closes apache#2949

    Signed-off-by: Brandon Devries <>

commit 813cc1f
Author: Matthew Burgess <>
Date:   Mon Oct 1 10:23:44 2018 -0400

    NIFI-5650: Added Xerces to scripting bundle for Jython 2.7.1

    This closes apache#3042

    Signed-off-by: Mike Thomsen <>

commit b1478cd
Author: Mike Thomsen <>
Date:   Fri Apr 6 21:38:07 2018 -0400

    NIFI-5051 Created ElasticSearch lookup service.

    NIFI-5051 Fixed checkstyle issue.

    NIFI-5051 Converted ES lookup service to use a SchemaRegistry.

    NIFI-5051 Cleaned up POM and added a simple unit test that uses a mock client service.

    NIFI-5051 Added change; waiting for feedback.

    NIFI-5051 Changed query setup based on code review. Changed tests to Groovy to make them easier to read with all of the inline JSON.

    NIFI-5051 fixed a checkstyle issue.

    NIFI-5051 Rebased to cleanup merge issues

    NIFI-5051 Added changes from a code review.

    NIFI-5051 Fixed a checkstyle issue.

    NIFI-5051 Added coverage generator for tests.


    NIFI-5051 Updated service and switched it over to JsonInferenceSchemaRegistryService.

    NIFI-5051 Removed dead code.

    NIFI-5051 Fixed checkstyle errors.

    NIFI-5051 Refactored query builder.

    NIFI-5051 Added placeholder gitignore to force test compile.

    NIFI-5051 Added note explaining why the .gitignore file was needed.

    NIFI-5051 Made constructor public.

    NIFI-5051 Fixed path issue in client service integration tests.

    NIFI-5051 Added additional mapping capabilities to let users massage the result set into the fields they want.

    Signed-off-by: Matthew Burgess <>

    This closes apache#2615

commit 748cf74
Author: Andy LoPresto <>
Date:   Wed Sep 26 18:18:22 2018 -0700

    NIFI-5628 Added content length check to OkHttpReplicationClient.
    Added unit tests.

    This closes apache#3035

commit 0dd3823
Author: Colin Dean <>
Date:   Wed Sep 19 20:27:47 2018 -0400

    NIFI-5612: Support JDBC drivers that return Long for unsigned ints

    Refactors tests in order to share code repeated in tests and to enable
    some parameterized testing.

    MySQL Connector/J 5.1.x in conjunction with MySQL 5.0.x will return
    a Long for ResultSet#getObject when the SQL type is an unsigned integer.
    This change prevents that error from occurring while implementing a more
    informational exception describing what the failing object's POJO type
    is in addition to its string value.

    Signed-off-by: Matthew Burgess <>

    This closes apache#3032

commit e24388a
Author: Jeff Storck <>
Date:   Tue Sep 25 18:30:19 2018 -0400

    NIFI-5557 Added test in PutHDFSTest for IOException with a nested GSSException
    Resolved most of the code warnings in PutHDFSTest

    This closes apache#2971.

commit 0f55cbf
Author: Endre Zoltan Kovacs <>
Date:   Tue Aug 28 10:47:59 2018 +0200

    NIFI-5557: handling expired ticket by rollback and penalization

commit 2e1005e
Author: Mark Payne <>
Date:   Thu Sep 27 10:10:48 2018 -0400

    NIFI-5640: Improved efficiency of Avro Reader and some methods of AvroTypeUtil. Also switched ServiceStateTransition to using read/write locks instead of synchronized blocks because profiling showed that significant time was spent in determining state of a Controller Service when attempting to use it. Switching to a ReadLock should provide better performance there.

    Signed-off-by: Matthew Burgess <>

    This closes apache#3036

commit ad4c886
Author: Mark Payne <>
Date:   Tue Sep 25 09:05:06 2018 -0400

    NIFI-5634: When merging RPG entities, ensure that we only send back the ports that are common to all nodes - even if that means sending back no ports

    This closes apache#3030

commit 66eeb48
Author: Mike Moser <>
Date:   Mon Aug 13 17:40:54 2018 +0000

    NIFI-3672 Add support for strongly typed message properties in PublishJMS

commit 8309747
Author: Mike Moser <>
Date:   Wed Aug 1 20:11:35 2018 +0000

    NIFI-3531 Moved session.recover in JMSConsumer to exceptional situations
bdesert pushed a commit to bdesert/nifi that referenced this pull request Oct 15, 2018
… netty dependency version.

NIFI-5665 - Fixed version for nifi-spark-bundle.
NIFI-5665 - Fixing copy and paste error.

This closes apache#3067
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
None yet
None yet
2 participants