[nifi-standard-libraries] branch main updated: Bump com.puppycrawl.tools:checkstyle from 8.21 to 8.29 (#2)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-standard-libraries.git


The following commit(s) were added to refs/heads/main by this push:
 new 3523803  Bump com.puppycrawl.tools:checkstyle from 8.21 to 8.29 (#2)
3523803 is described below

commit 352380337af619da37623234fab10026735848c5
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Fri Aug 25 10:37:55 2023 -0400

Bump com.puppycrawl.tools:checkstyle from 8.21 to 8.29 (#2)

Bumps 
[com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) 
from 8.21 to 8.29.
- [Release notes](https://github.com/checkstyle/checkstyle/releases)
- 
[Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-8.21...checkstyle-8.29)

---
updated-dependencies:
- dependency-name: com.puppycrawl.tools:checkstyle
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c0590f6..2ba2dd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,7 +253,7 @@
 
 com.puppycrawl.tools
 checkstyle
-8.21
+8.29
 
 
 

svn commit: r62399 - /release/nifi/KEYS

[kdoran]

Author: kdoran
Date: Tue Jun 13 13:00:11 2023
New Revision: 62399

Log:
Adding committer’s code signing key to KEYS file

Modified:
release/nifi/KEYS

Modified: release/nifi/KEYS
==
--- release/nifi/KEYS (original)
+++ release/nifi/KEYS Tue Jun 13 13:00:11 2023
@@ -2062,3 +2062,62 @@ YGyDIBjSMKPCjz0dUtR1NNVMaeaSvjIyL2px+8DE
 q3SLZrvhGOPdiHwD5Uq+evcS1NYKXcFNLtcPNt4ngE74SPww0u/RFK4rzLzFTYo=
 =FDju
 -END PGP PUBLIC KEY BLOCK-
+pub   rsa4096 2023-03-17 [SC]
+  2E7E B364 DE7B 4378 E49E  3B12 AFFF D8C3 A1A8 8ED7
+uid   [ultimate] Nandor Soma Abonyi (CODE SIGNING KEY) 

+sig 3AFFFD8C3A1A88ED7 2023-03-17  [self-signature]
+sub   rsa4096 2023-03-17 [E]
+sig  AFFFD8C3A1A88ED7 2023-03-17  [self-signature]
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+
+mQINBGQUgnkBEAC8vMdqLnqA05bZc9nR3PyEnW0wu0jPoZweOiYxRkeLriUav90w
+NRT3VPISUuLEJ+KB1QpruScRY6YNBRl/4jRxts+5DWVkCX6jgWkWMnXzqv7rCwmr
+oEjTom2TwgZqqJTYxOaVWaSu98gBUbtywM/3vluGHp5XdsS770HtDb9MLYtsiD6t
+ZmBgKoUrYwjc8qnQ4ip0URiFxuLiKLnpWowqpcG2BwzXTkTPvYbJKjf2vGNNHbUS
+wSddfSW/YYu9EceEa1iT6Fftam4xmdKsx2mIBP+XLiDhCP9B/CrJr4Tvh6bGEZlJ
+pSv+/R11SmjVxIy/RGsw933jQRAcOwRt36vvYfhPWbXNn30iHU38LmwR4VNH22x3
+jTb4r+RYCUast3jzEeiMnISe1trkMZmcM2mwRFXmdilBHu7cpq9czBLacsk+s8uq
+bI8yMSr4JQ08VjNv4/XuAUFq+aPUpZ1EgyjKqoUG58EcUQ0Jlrkyo5e2IT9Dy8ID
+NkmyiQzxaMRcGFNITbfj2gr48mo16aODUCXl3ACDsbt3ArUhSQFqRlrlhBkJGqyq
+H1EB2Q3ZeZBBkmbfldrQ5fVy4JOaEX+ukMJhL6AXCBecyg8HvRcCvCo27xcizWyS
+S1GWaJyG/qYWLzUS0hvqPWX6UoYM2ZCwHdWCOPfMuKfEx/W5it5fqexTbQARAQAB
+tDtOYW5kb3IgU29tYSBBYm9ueWkgKENPREUgU0lHTklORyBLRVkpIDxuc2Fib255
+aUBhcGFjaGUub3JnPokCUQQTAQgAOxYhBC5+s2Tee0N45J47Eq//2MOhqI7XBQJk
+FIJ5AhsDBQsJCAcCAiICBhUKCQgLAgQWAgMBAh4HAheAAAoJEK//2MOhqI7XDIYP
+/2i4766if6pyAaEzNvj1Az6ZX4+iQRi7npDjrPtjLohTSP3YtP3Kg/iXVKXRm6/g
+QJ2KLeeFHZstrldbPNhA5YlONrOA1+45y3FPeq3sYzLnFZRYFRjUVv6xkVH5tYBQ
+2HCCrgIn2vvSL8mdGhEm/1Bf47pwKJhFybJ0W8J7Cb7Yc1PNRG4SMC7Vc17wRbPB
+GxETVcDpOjhc/c/sxqrjPTBkglM2GCgZcfLcHBIYBbc4y5076A4tO398eeHlVkc9
+YGyORXAqW29EwQE5RGexaK4QwqoTZErdWcbsR93BvpEql0QFzVPdTmhZgHBDcIoA
+XJLWJD06yXuSgtVu+YQSb5jeT+8CakOouyv8OvZPZ8/TzGwQKTuYjVK0MSNuZl92
+XkuPGveaKx2KFeWsakY3vEaS5vhAlJOzUU1pCvx/5h9Lvyd8jiSdgy8QA8hvDciY
+H1UUWZlEKxUOUvx14E47c12j5QjqFbIT+kO/lj9P1UM/NmgRo5ACr5tZFtCL0med
+IFL20EItBPIM+Im97BYO2wlMZ6u2ecRIPxuG/5iEj2Sf2jXI5a1gdDOO9DHQEHVx
+LNq8Zc/bHg5yjjdexRtDyMTZ0LnrsjPMT70mDQ/hx07h11WAtltp6B6CtLuAq7i5
+lRtAbqTto/GY7Z2qzyjEFtGZbCUlPxgKiSpTvy/rrM7JuQINBGQUgnkBEAC7V30D
+z6Y8XLGZCJus+a8jXeegPN6bU49EgoOAE7YInnuAzj1o7ywUY2IKGS180bE9Vzpz
+zLFjpHQzFOhHWDWzad2Vnx8I2JpRGaHLN7gBiQc8DDy8YUvGDvNZL0gFXQcTXSA+
+ncdo+oeLNgS+HXST0Fpm+9RCz4CSTtKkOB6y2Mw0HMd8G6j7DyOiM4biQjL61ug1
+LMzTMmMbGQzHcThSLd41PAKG6l44hg6eRF1Vz9A3zCeS6u0e7dxzvvuh+GklpWil
+Xnofen66VwtpZKMdcbV25i1AD9zf+ZyKk9QhdzMujL4Htu4DiYFpLF0d8dpSyYn4
+vJhDMTNfvJmreSvpoEqR+cjXCA4ei15y4wBk6dAJ5BAb13lDyJCp1P6HlvIRXHlH
+UvZN0MbaS5bSlflLaEcCtIQa+ySK04Sz/4cdYFUmR5xb2yndwdmMoA3NlghNwaSR
+qT1bgbCTF0v8y7HwLX5JRS3QEuhZJMNyCrkGCjTBAddmi3vK2iH+ca9Hwq/GlLE0
+acOjg28nCTPsxuTwZA+ohdBsPNMQuTsvpwePzdOkzao5yQwxsVnI2frNJyqoQIY0
+aAkwBY1CPrYWH4QliDCW14i17puhj8q4sC172XAE3fWcTz8weObnF9FVQoq7wYFN
+y/aeF6C8AV1AMjbZFDEPPA4Sb1a6i3NYHHCylQARAQABiQI2BBgBCAAgFiEELn6z
+ZN57Q3jknjsSr//Yw6GojtcFAmQUgnkCGwwACgkQr//Yw6Gojtc4iA//Z5pTB+35
+HJddvvtGTZUAc53+zoAHeFgD3drmR9+TIVJ9AbwFDL++qStJx32o5wheCQ3DkknT
+7uYJCi+SHmutzWYivp8SyskDJOgKGkLN2LYo2i8nq2806HpRRFjqp7gpP2k+APqb
+OJgGXjN2bZ3iIkADSpViAM6xSZ50VfD9QsYo2plEazDQT94opi2WOl/aW0gOZTWY
+q/YaBWBH3MnBWqcs/QZVnRtax97DRMgwXn1u4Bmy+aSNmtFRW0U0eOEp+Qqzb83a
+sUnC/zy026WwESyRqjo9BavKBLGuzOoMtGfqnxCt5vDuwc6Gzau51UmSs9vVv6mi
+w1Rcbp9c3Kg9gi7K00vxUz3FO8ZzdX0DJy6x2/XGlZTi3qaoB+FaS3RkLofYNYCk
+I3xa6v92Ktjc3nmsl2uFRP6Bo+v1jTDR3d3QYhQfBOOx6bJ4C+H59Fn3SreD+ZT9
+NwYBw4Z5dT4nKWJuqpYch0PqccEvEDRr/i6GDhE756yzpkZ2GFvrO3VJxthihXk2
++lEgN6pQ4K7ORnSnPOUk/A9gtWnA+LbqS1rzYAIKHxnlaBQnnI0GJKgnJQLuYpM3
+pgFJoG7sh/RJvROcKTNn1VwHFKwGoflN1sHn2jHWcD++JeMolYXhiLQdV29J4UzH
+pKnZOa4ObDfC+OAR1d5cLXUZIrqxwna8skE=
+=lpsK
+-END PGP PUBLIC KEY BLOCK-

[nifi-maven] branch main updated: NIFI-11324 Set system properties in the user properties of artifact requests (#33)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


The following commit(s) were added to refs/heads/main by this push:
 new ccca6f2  NIFI-11324 Set system properties in the user properties of 
artifact requests (#33)
ccca6f2 is described below

commit ccca6f239ff0738cbf226f22d08d3bdd796c30eb
Author: Bryan Bende 
AuthorDate: Wed May 10 10:03:02 2023 -0400

NIFI-11324 Set system properties in the user properties of artifact 
requests (#33)
---
 .../extraction/ExtensionClassLoaderFactory.java| 25 +++---
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git 
a/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactory.java
 
b/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactory.java
index c5e4888..ace4226 100644
--- 
a/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactory.java
+++ 
b/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactory.java
@@ -145,10 +145,7 @@ public class ExtensionClassLoaderFactory {
 }
 
 private Set getNarDependencies(final Artifact narArtifact) 
throws MojoExecutionException, ProjectBuildingException {
-final ProjectBuildingRequest narRequest = new 
DefaultProjectBuildingRequest();
-narRequest.setRepositorySession(repoSession);
-narRequest.setSystemProperties(System.getProperties());
-narRequest.setLocalRepository(localRepo);
+final ProjectBuildingRequest narRequest = 
createProjectBuildingRequest();
 
 final ProjectBuildingResult narResult = 
projectBuilder.build(narArtifact, narRequest);
 
@@ -173,10 +170,7 @@ public class ExtensionClassLoaderFactory {
 }
 
 private String findProvidedDependencyVersion(final Set 
artifacts, final String groupId, final String artifactId) {
-final ProjectBuildingRequest projectRequest = new 
DefaultProjectBuildingRequest();
-projectRequest.setRepositorySession(repoSession);
-projectRequest.setSystemProperties(System.getProperties());
-projectRequest.setLocalRepository(localRepo);
+final ProjectBuildingRequest projectRequest = 
createProjectBuildingRequest();
 
 for (final Artifact artifact : artifacts) {
 try {
@@ -304,10 +298,7 @@ public class ExtensionClassLoaderFactory {
 };
 
 try {
-final ProjectBuildingRequest projectRequest = new 
DefaultProjectBuildingRequest();
-projectRequest.setRepositorySession(repoSession);
-projectRequest.setSystemProperties(System.getProperties());
-projectRequest.setLocalRepository(localRepo);
+final ProjectBuildingRequest projectRequest = 
createProjectBuildingRequest();
 projectRequest.setProject(mavenProject);
 
 final ArtifactFilter excludesFilter = new 
ExclusionSetFilter(EXCLUDED_ARTIFACT_IDS);
@@ -319,6 +310,16 @@ public class ExtensionClassLoaderFactory {
 return artifacts;
 }
 
+private ProjectBuildingRequest createProjectBuildingRequest() {
+final ProjectBuildingRequest projectRequest = new 
DefaultProjectBuildingRequest();
+projectRequest.setRepositorySession(repoSession);
+projectRequest.setSystemProperties(System.getProperties());
+projectRequest.setUserProperties(System.getProperties());
+projectRequest.setLocalRepository(localRepo);
+projectRequest.setRemoteRepositories(remoteRepos);
+return projectRequest;
+}
+
 private Set toURLs(final Artifact artifact) throws 
MojoExecutionException {
 final Set urls = new HashSet<>();
 

svn commit: r60644 - /release/nifi/nifi-nar-maven-plugin-1.4.0/

[kdoran]

Author: kdoran
Date: Thu Mar 16 02:46:54 2023
New Revision: 60644

Log:
NIFI-11278 Removing old release dir

Removed:
release/nifi/nifi-nar-maven-plugin-1.4.0/

svn commit: r60643 - /dev/nifi/nifi-nar-maven-plugin-1.5.0/ /release/nifi/nifi-nar-maven-plugin-1.5.0/

[kdoran]

Author: kdoran
Date: Thu Mar 16 02:44:13 2023
New Revision: 60643

Log:
NIFI-11278

Added:
release/nifi/nifi-nar-maven-plugin-1.5.0/
  - copied from r60642, dev/nifi/nifi-nar-maven-plugin-1.5.0/
Removed:
dev/nifi/nifi-nar-maven-plugin-1.5.0/

svn commit: r60642 - /dev/nifi/nifi-nar-maven-plugin-1.5.0/

[kdoran]

Author: kdoran
Date: Thu Mar 16 02:43:23 2023
New Revision: 60642

Log:
NIFI-11278 Adding artifacts for nifi-nar-maven-plugin-1.5.0

Added:
dev/nifi/nifi-nar-maven-plugin-1.5.0/

dev/nifi/nifi-nar-maven-plugin-1.5.0/nifi-nar-maven-plugin-1.5.0-source-release.zip
   (with props)

dev/nifi/nifi-nar-maven-plugin-1.5.0/nifi-nar-maven-plugin-1.5.0-source-release.zip.asc

dev/nifi/nifi-nar-maven-plugin-1.5.0/nifi-nar-maven-plugin-1.5.0-source-release.zip.sha256

dev/nifi/nifi-nar-maven-plugin-1.5.0/nifi-nar-maven-plugin-1.5.0-source-release.zip.sha512

Added: 
dev/nifi/nifi-nar-maven-plugin-1.5.0/nifi-nar-maven-plugin-1.5.0-source-release.zip
==
Binary file - no diff available.

Propchange: 
dev/nifi/nifi-nar-maven-plugin-1.5.0/nifi-nar-maven-plugin-1.5.0-source-release.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/nifi/nifi-nar-maven-plugin-1.5.0/nifi-nar-maven-plugin-1.5.0-source-release.zip.asc
==
--- 
dev/nifi/nifi-nar-maven-plugin-1.5.0/nifi-nar-maven-plugin-1.5.0-source-release.zip.asc
 (added)
+++ 
dev/nifi/nifi-nar-maven-plugin-1.5.0/nifi-nar-maven-plugin-1.5.0-source-release.zip.asc
 Thu Mar 16 02:43:23 2023
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCgAdFiEEwJuoka7UW4wsIxr+H7ZqkfcbYgcFAmQSgOUACgkQH7Zqkfcb
+Ygfo5w/+JAmpJmf7smxgstHwtYz7IYC8bqXd40Ez++Lo4pIsK+wwAeEiZ/iGB/6F
+JDPXhORN+CSaonf+XzGaI3Zo3XBvngf3HzZqxCj7F2E8p1lH4+dNMlNxhXLynZqY
+JVQwSf2Lr+CUPhAbOwF641yxPVynr6yYpkmuGj2EmworI3Vc/hrtPgrT1eD8Gl0l
+5qBaPppeoiqDger74YRMcL4TatGjR6sD2dRXVtMf9F5OTKJT1EFjJS6w7wLoVwV2
+wLei40o+yX4X/5MozMqcOkDOQK9aT08TjfJ63Xx0qHGZLx6rpZg/20/ioCAa+Fya
+H9jx7SIemTBGukUGDwZRR/hDJ6LYIykCPQZ4hSqgEKvCeTxZ7REySfGNHivoc/jj
+bbrbS1PUcT45uXfZ4XEka9OQQ7MJ2JFmlu2kII/kv3u2As/J55uwd7WU+CtVaUL8
+ylv+EVghyp9C8oEwGv427pxE3r8egsCWW58fxAIKTxNVOu0HHuzB/wt6Um7jTpfQ
+mpejXvv7Wahaiof3kZG3suK4RkSCt96Jlgi0oW98ImR97aZBv/A1H8eDoZkZvFjN
+w1N4gczAzc1QpPY9o4tePbTbrHYh1fwKKDTq1wTtHrcydvoEMsv73bkknPjoWbO4
+o47lEwitjGLgJ1lOJHdgEsyE8KmyvJ4hYV/vbVJX279/pz3jGKM=
+=+sCt
+-END PGP SIGNATURE-

Added: 
dev/nifi/nifi-nar-maven-plugin-1.5.0/nifi-nar-maven-plugin-1.5.0-source-release.zip.sha256
==
--- 
dev/nifi/nifi-nar-maven-plugin-1.5.0/nifi-nar-maven-plugin-1.5.0-source-release.zip.sha256
 (added)
+++ 
dev/nifi/nifi-nar-maven-plugin-1.5.0/nifi-nar-maven-plugin-1.5.0-source-release.zip.sha256
 Thu Mar 16 02:43:23 2023
@@ -0,0 +1 @@
+6a25615ff50cf91df2cc4feffb83154f7e5f909a68b7e93ebafb1e5a01da68d5

Added: 
dev/nifi/nifi-nar-maven-plugin-1.5.0/nifi-nar-maven-plugin-1.5.0-source-release.zip.sha512
==
--- 
dev/nifi/nifi-nar-maven-plugin-1.5.0/nifi-nar-maven-plugin-1.5.0-source-release.zip.sha512
 (added)
+++ 
dev/nifi/nifi-nar-maven-plugin-1.5.0/nifi-nar-maven-plugin-1.5.0-source-release.zip.sha512
 Thu Mar 16 02:43:23 2023
@@ -0,0 +1 @@
+a265587f8bfb31359cae2335394d88d76d36ae9806030e38fc9846264f20a4e70d642c4f0c08425b843794aaabaeea416b1104ede26671ffcbe001e1976d4efd

[nifi-maven] annotated tag rel/nifi-nar-maven-plugin-1.5.0 updated (277f9e8 -> 39c3423)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to annotated tag rel/nifi-nar-maven-plugin-1.5.0
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


*** WARNING: tag rel/nifi-nar-maven-plugin-1.5.0 was modified! ***

from 277f9e8  (commit)
  to 39c3423  (tag)
 tagging 277f9e8998ca76a972c90d8ecf3f771414c86700 (commit)
 replaces rel/nifi-nar-maven-plugin-1.4.0
  by Kevin Doran
  on Wed Mar 15 22:29:05 2023 -0400

- Log -
NIFI-11278 signed release tag for approved release of NiFi NAR Maven Plugin 
1.5.0
-BEGIN PGP SIGNATURE-

iQIzBAABCgAdFiEEwJuoka7UW4wsIxr+H7ZqkfcbYgcFAmQSfvEACgkQH7Zqkfcb
YgctQxAAmu2MarUIq/rPlVQM1uQGGvxlv8b+ZoQ+F1vfXiwo0r4eNazbzYsV9xWo
bG9wGvYpZ3By8YA9XMmuug8HCWV3uhSe3ukuZyynZ4Rt2QcbBBUCvy7+9uHi9R+M
t7qrTJgCebIwXoiKHzq5Aq0IQHdXl8tb6NoevCCz3fcWCyz8RKcWAbzCAUtwkQeR
l/rutCQUZBfYlU+RudD1PZGFwwBXCM6bANsOKhSI9SP951IrNB8bhFXPRajhcxm/
0T1NsGunai4d0CUbW5mZL9PHagg6MhND1rTPUWBPYsYC4oKsviZ2RD0H6p3N1sWh
9zfoSHnng9njLZsWlvZWqLniLvR3kClbV4pu35oYKvHI8nnvwrlfFu9mVyNuWw+t
QewXxvLLkYSe0ZpUqKX45kyA9LQ8pnySyaV8EUNmfjmDbkgElP+s5Oedd8iRK8Aq
4Rub05alSuRcu1Ereg1mrT7u5GL93Mq4EUcvOLMNk2pDNgMF6TY3a8deOL9W180V
3O7Ra8MZkpbrJ/H83ETxZ/UA+c+iQE+G7drQI+Y9FiIrLq2kIqYbQyfbkF08admS
shhos78VPyjFc1kWgxekg1+p7FldEUq0F90PB7N6yQNdJDrFuye1ZGNjqSXQPnuP
r7Zft8h8QYxq+B8uyYRFXYzhJN0wHPiLuYTqoqC7M+9EcmMkzYE=
=SlN3
-END PGP SIGNATURE-
---


No new revisions were added by this update.

Summary of changes:

[nifi-maven] branch main updated (c33e500 -> 3ec4448)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


from c33e500  NIFI-11283 Add GitHub Actions build workflow (#32)
 add 277f9e8  NIFI-11278-RC2 prepare release nifi-nar-maven-plugin-1.5.0-RC2
 add fc2ab48  NIFI-11278-RC2 prepare for next development iteration
 new 3ec4448  Merge branch 'NIFI-11278-RC2'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[nifi-maven] 01/01: Merge branch 'NIFI-11278-RC2'

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git

commit 3ec4448c7cf94cf3137c7a67b168c65a33192eea
Merge: c33e500 fc2ab48
Author: Kevin Doran 
AuthorDate: Wed Mar 15 22:16:46 2023 -0400

Merge branch 'NIFI-11278-RC2'

 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc pom.xml
index 25f85a7,8a24687..0d75d65
--- a/pom.xml
+++ b/pom.xml
@@@ -71,19 -74,13 +71,19 @@@
  https://issues.apache.org/jira/browse/NIFI
  
  
 +
 +1.8.0-251
 +
 +3.6.3
  1.8
  1.8
 -3.6.3
  UTF-8
  
UTF-8
- 
2023-03-08T15:05:37Z
+ 
2023-03-14T20:49:10Z
  2014
 +4.11.0
 +5.9.2
 +2.0.6
  
  
  

[nifi-maven] branch main updated: NIFI-11283 Add GitHub Actions build workflow (#32)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


The following commit(s) were added to refs/heads/main by this push:
 new c33e500  NIFI-11283 Add GitHub Actions build workflow (#32)
c33e500 is described below

commit c33e5003f22e238328021822a3819fac830f02f5
Author: exceptionfactory 
AuthorDate: Wed Mar 15 11:27:12 2023 -0500

NIFI-11283 Add GitHub Actions build workflow (#32)

* NIFI-11283 Added GitHub Actions build workflow

- Set minimum Java version to 1.8.0-251
- Set minimum Maven version to 3.6.3
- Updated Apache Parent POM to 29
- Removed unnecessary plugin version overrides
- Upgraded Mockito to 4.11.0
- Moved Checkstyle and Apache RAT plugins to standard build

* NIFI-11283 Added push to branches for initial workflow

Signed-off-by: Kevin Doran 
---
 .github/workflows/build.yml |  43 +++
 README.md   |   9 ++-
 pom.xml | 184 ++--
 3 files changed, 90 insertions(+), 146 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 000..ed3de84
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,43 @@
+# 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.
+name: build
+
+on:
+  push:
+branches:
+  - main
+  - NIFI-11283
+  pull_request:
+branches:
+  - main
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+runs-on: ubuntu-latest
+steps:
+  - name: Checkout Sources
+uses: actions/checkout@v3
+  - name: Setup Java JDK
+uses: actions/setup-java@v3
+with:
+  java-version: '8'
+  distribution: 'zulu'
+  cache: 'maven'
+  - name: Build
+run: mvn --batch-mode --update-snapshots verify
diff --git a/README.md b/README.md
index e939cc9..295a696 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,8 @@
 -->
 # Apache NiFi NAR Maven Plugin
 
+[![build](https://github.com/apache/nifi-maven/actions/workflows/build.yml/badge.svg)](https://github.com/apache/nifi-maven/actions/workflows/build.yml)
+
 Apache NiFi NAR Maven Plugin helps to build NiFi Archive bundles to support 
the classloader isolation model of NiFi.
 
 ## Table of Contents
@@ -23,9 +25,10 @@ Apache NiFi NAR Maven Plugin helps to build NiFi Archive 
bundles to support the
 - [Getting Help](#getting-help)
 - [License](#license)
 
-## Requirements
-* JDK 1.8 or higher
-* Apache Maven 3.1.0 or higher
+## Minimum Requirements
+
+* JDK 1.8.0-251
+* Apache Maven 3.6.3
 
 ## Getting Started
 
diff --git a/pom.xml b/pom.xml
index 873330e..25f85a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache
 apache
-25
+29
 
 
 org.apache.nifi
@@ -60,9 +60,6 @@
 
http://mail-archives.apache.org/mod_mbox/nifi-commits
 
 
-
-${maven.min-version}
-
 
 scm:git:git://git.apache.org/nifi-maven.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/nifi-maven.git
@@ -74,75 +71,32 @@
 https://issues.apache.org/jira/browse/NIFI
 
 
+
+1.8.0-251
+
+3.6.3
 1.8
 1.8
-3.6.3
 UTF-8
 
UTF-8
 
2023-03-08T15:05:37Z
 2014
+4.11.0
+5.9.2
+2.0.6
 
 
 
 
-
-org.apache.maven.plugins
-maven-compiler-plugin
-3.2
-
-true
-true
-true
-true
-
-
-
-org.apache.maven.plugins
-maven-dependency-plugin
-2.9
-
-
-org.apache.maven.plugins
-maven-resources-plugin
-2.7
-
 
 org.apache.maven.plugins
   

[nifi-maven] annotated tag nifi-nar-maven-plugin-1.5.0-RC2 updated (277f9e8 -> 4830daa)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to annotated tag nifi-nar-maven-plugin-1.5.0-RC2
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


*** WARNING: tag nifi-nar-maven-plugin-1.5.0-RC2 was modified! ***

from 277f9e8  (commit)
  to 4830daa  (tag)
 tagging 277f9e8998ca76a972c90d8ecf3f771414c86700 (commit)
 replaces rel/nifi-nar-maven-plugin-1.4.0
  by Kevin Doran
  on Tue Mar 14 16:49:10 2023 -0400

- Log -
NIFI-11278-RC2 copy for tag nifi-nar-maven-plugin-1.5.0-RC2
---


No new revisions were added by this update.

Summary of changes:

[nifi-maven] branch NIFI-11278-RC2 created (now fc2ab48)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to branch NIFI-11278-RC2
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


  at fc2ab48  NIFI-11278-RC2 prepare for next development iteration

This branch includes the following new commits:

 new 277f9e8  NIFI-11278-RC2 prepare release nifi-nar-maven-plugin-1.5.0-RC2
 new fc2ab48  NIFI-11278-RC2 prepare for next development iteration

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[nifi-maven] 02/02: NIFI-11278-RC2 prepare for next development iteration

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch NIFI-11278-RC2
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git

commit fc2ab484f670726c906bfd7e012f1169d5edb8d1
Author: Kevin Doran 
AuthorDate: Tue Mar 14 16:49:11 2023 -0400

NIFI-11278-RC2 prepare for next development iteration
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index f7fea59..8a24687 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.nifi
 nifi-nar-maven-plugin
-1.5.0
+1.5.1-SNAPSHOT
 maven-plugin
 Apache NiFi Nar Maven Plugin
 http://nifi.apache.org
@@ -67,7 +67,7 @@
 scm:git:git://git.apache.org/nifi-maven.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/nifi-maven.git
 https://git-wip-us.apache.org/repos/asf?p=nifi-maven.git
-nifi-nar-maven-plugin-1.5.0-RC2
+nifi-nar-maven-plugin-1.4.0-RC1
 
 
 JIRA
@@ -79,7 +79,7 @@
 3.6.3
 UTF-8
 
UTF-8
-
2023-03-14T20:48:20Z
+
2023-03-14T20:49:10Z
 2014
 
 

[nifi-maven] 01/02: NIFI-11278-RC2 prepare release nifi-nar-maven-plugin-1.5.0-RC2

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch NIFI-11278-RC2
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git

commit 277f9e8998ca76a972c90d8ecf3f771414c86700
Author: Kevin Doran 
AuthorDate: Tue Mar 14 16:48:33 2023 -0400

NIFI-11278-RC2 prepare release nifi-nar-maven-plugin-1.5.0-RC2
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 873330e..f7fea59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.nifi
 nifi-nar-maven-plugin
-1.5.0-SNAPSHOT
+1.5.0
 maven-plugin
 Apache NiFi Nar Maven Plugin
 http://nifi.apache.org
@@ -67,7 +67,7 @@
 scm:git:git://git.apache.org/nifi-maven.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/nifi-maven.git
 https://git-wip-us.apache.org/repos/asf?p=nifi-maven.git
-nifi-nar-maven-plugin-1.4.0-RC1
+nifi-nar-maven-plugin-1.5.0-RC2
 
 
 JIRA
@@ -79,7 +79,7 @@
 3.6.3
 UTF-8
 
UTF-8
-
2023-03-08T15:05:37Z
+
2023-03-14T20:48:20Z
 2014
 
 

[nifi-maven] annotated tag nifi-nar-maven-plugin-1.5.0-RC1 updated (ec2635b -> 43a0363)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to annotated tag nifi-nar-maven-plugin-1.5.0-RC1
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


*** WARNING: tag nifi-nar-maven-plugin-1.5.0-RC1 was modified! ***

from ec2635b  (commit)
  to 43a0363  (tag)
 tagging ec2635b0474994861d3225538168e46638c0d2bb (commit)
 replaces rel/nifi-nar-maven-plugin-1.4.0
  by Kevin Doran
  on Mon Mar 13 14:29:47 2023 -0400

- Log -
NIFI-11278-RC1 copy for tag nifi-nar-maven-plugin-1.5.0-RC1
---


No new revisions were added by this update.

Summary of changes:

[nifi-maven] 01/02: NIFI-11278-RC1 prepare release nifi-nar-maven-plugin-1.5.0-RC1

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch NIFI-11278-RC1
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git

commit ec2635b0474994861d3225538168e46638c0d2bb
Author: Kevin Doran 
AuthorDate: Mon Mar 13 14:29:39 2023 -0400

NIFI-11278-RC1 prepare release nifi-nar-maven-plugin-1.5.0-RC1
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 873330e..02eed5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.nifi
 nifi-nar-maven-plugin
-1.5.0-SNAPSHOT
+1.5.0
 maven-plugin
 Apache NiFi Nar Maven Plugin
 http://nifi.apache.org
@@ -67,7 +67,7 @@
 scm:git:git://git.apache.org/nifi-maven.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/nifi-maven.git
 https://git-wip-us.apache.org/repos/asf?p=nifi-maven.git
-nifi-nar-maven-plugin-1.4.0-RC1
+nifi-nar-maven-plugin-1.5.0-RC1
 
 
 JIRA
@@ -79,7 +79,7 @@
 3.6.3
 UTF-8
 
UTF-8
-
2023-03-08T15:05:37Z
+
2023-03-13T18:29:26Z
 2014
 
 

[nifi-maven] 02/02: NIFI-11278-RC1 prepare for next development iteration

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch NIFI-11278-RC1
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git

commit e6b7b454999dce8f769a5840808efef2b7ca4b96
Author: Kevin Doran 
AuthorDate: Mon Mar 13 14:29:47 2023 -0400

NIFI-11278-RC1 prepare for next development iteration
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 02eed5b..a70548d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.nifi
 nifi-nar-maven-plugin
-1.5.0
+1.5.1-SNAPSHOT
 maven-plugin
 Apache NiFi Nar Maven Plugin
 http://nifi.apache.org
@@ -67,7 +67,7 @@
 scm:git:git://git.apache.org/nifi-maven.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/nifi-maven.git
 https://git-wip-us.apache.org/repos/asf?p=nifi-maven.git
-nifi-nar-maven-plugin-1.5.0-RC1
+nifi-nar-maven-plugin-1.4.0-RC1
 
 
 JIRA
@@ -79,7 +79,7 @@
 3.6.3
 UTF-8
 
UTF-8
-
2023-03-13T18:29:26Z
+
2023-03-13T18:29:47Z
 2014
 
 

[nifi-maven] branch NIFI-11278-RC1 created (now e6b7b45)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to branch NIFI-11278-RC1
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


  at e6b7b45  NIFI-11278-RC1 prepare for next development iteration

This branch includes the following new commits:

 new ec2635b  NIFI-11278-RC1 prepare release nifi-nar-maven-plugin-1.5.0-RC1
 new e6b7b45  NIFI-11278-RC1 prepare for next development iteration

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[nifi] branch support/nifi-1.x updated: NIFI-11274 only add @timestamp to PutElasticsearchRecord document if not null

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
 new 63bb245a2a NIFI-11274 only add @timestamp to PutElasticsearchRecord 
document if not null
63bb245a2a is described below

commit 63bb245a2a9512fd28677e85d49754d3754565a3
Author: Chris Sampson 
AuthorDate: Mon Mar 13 14:08:14 2023 +

NIFI-11274 only add @timestamp to PutElasticsearchRecord document if not 
null

This closes #7036.

Signed-off-by: Kevin Doran 
---
 .../nifi/processors/elasticsearch/PutElasticsearchRecord.java| 4 +++-
 .../processors/elasticsearch/PutElasticsearchRecordTest.groovy   | 9 -
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecord.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecord.java
index 2b682c2c24..d70a615915 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecord.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecord.java
@@ -373,7 +373,9 @@ public class PutElasticsearchRecord extends 
AbstractPutElasticsearch {
 final Map contentMap = (Map) 
DataTypeUtils
 .convertRecordFieldtoObject(record, 
RecordFieldType.RECORD.getRecordDataType(record.getSchema()));
 formatDateTimeFields(contentMap, record);
-contentMap.putIfAbsent("@timestamp", timestamp);
+if (timestamp != null) {
+contentMap.putIfAbsent("@timestamp", timestamp);
+}
 
 operationList.add(new IndexOperationRequest(idx, t, id, 
contentMap, o));
 originals.add(record);
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecordTest.groovy
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecordTest.groovy
index 3c0426023a..5e976a31d3 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecordTest.groovy
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecordTest.groovy
@@ -30,7 +30,6 @@ import org.apache.nifi.serialization.RecordReaderFactory
 import org.apache.nifi.serialization.record.MockRecordParser
 import org.apache.nifi.serialization.record.MockSchemaRegistry
 import org.apache.nifi.serialization.record.RecordFieldType
-import org.apache.nifi.util.MockFlowFile
 import org.apache.nifi.util.StringUtils
 import org.apache.nifi.util.TestRunner
 import org.apache.nifi.util.TestRunners
@@ -425,7 +424,7 @@ class PutElasticsearchRecordTest {
 [ id: "rec-2", op: "create", index: "bulk_b", type: "message", 
msg: "Hello" ],
 [ id: "rec-3", op: "update", index: "bulk_a", type: "message", 
msg: "Hello" ],
 [ id: "rec-4", op: "upsert", index: "bulk_b", type: "message", 
msg: "Hello" ],
-[ id: "rec-5", op: "create", index: "bulk_a", type: "message", 
msg: "Hello" ],
+[ id: "rec-5", op: "create", index: "bulk_a", type: "message", 
msg: "Hello", code: null ],
 [ id: "rec-6", op: "delete", index: "bulk_b", type: "message", 
msg: "Hello", code: 101L ]
 ]))
 
@@ -436,7 +435,7 @@ class PutElasticsearchRecordTest {
 int upsert = items.findAll { it.operation == 
IndexOperationRequest.Operation.Upsert }.size()
 int delete = items.findAll { it.operation == 
IndexOperationRequest.Operation.Delete }.size()
 def timestampCount = items.findAll { it.fields.get("@timestamp") 
== 101L }.size()
-def noTimestampCount = items.findAll { it.fields.get("@timestamp") 
== null }.size()
+def noTimestampCount = items.findAll { 
!it.fields.containsKey("@timestamp"

[nifi] branch main updated (1f34b9cd99 -> f71ba8aadb)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


from 1f34b9cd99 [NIFI-11258] update nifi-registry frontend deps (#7025)
 add f71ba8aadb NIFI-11274 only add @timestamp to PutElasticsearchRecord 
document if not null

No new revisions were added by this update.

Summary of changes:
 .../nifi/processors/elasticsearch/PutElasticsearchRecord.java| 4 +++-
 .../processors/elasticsearch/PutElasticsearchRecordTest.groovy   | 9 -
 2 files changed, 7 insertions(+), 6 deletions(-)

[nifi] branch support/nifi-1.x updated: NIFI-11193 Improve GitFlowPersisenceProvider logging

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
 new 17b4480831 NIFI-11193 Improve GitFlowPersisenceProvider logging
17b4480831 is described below

commit 17b4480831a9b0f194f5db74ba72c454242776cb
Author: Kevin Doran 
AuthorDate: Thu Feb 16 15:28:59 2023 -0500

NIFI-11193 Improve GitFlowPersisenceProvider logging

This closes #6967

Co-authored-by: David Handermann 
Signed-off-by: David Handermann 
---
 .../nifi/registry/provider/flow/git/GitFlowMetaData.java | 12 
 .../provider/flow/git/GitFlowPersistenceProvider.java|  3 +++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git 
a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/flow/git/GitFlowMetaData.java
 
b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/flow/git/GitFlowMetaData.java
index 4bac3284b3..0ef7d333a0 100644
--- 
a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/flow/git/GitFlowMetaData.java
+++ 
b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/flow/git/GitFlowMetaData.java
@@ -181,16 +181,12 @@ class GitFlowMetaData {
  * @param remoteRepository the URI value of the 'Remote Clone Repository' 
configuration
  * @throws IOException if creating the repository fails
  */
-public void remoteRepoExists(String remoteRepository) throws IOException {
+public void remoteRepoExists(String remoteRepository) throws 
GitAPIException, IOException {
 final Git git = new Git(FileRepositoryBuilder.create(new 
File(remoteRepository)));
 final LsRemoteCommand lsCmd = git.lsRemote();
-try {
-lsCmd.setRemote(remoteRepository);
-lsCmd.setCredentialsProvider(this.credentialsProvider);
-lsCmd.call();
-} catch (Exception e){
-throw new IllegalArgumentException("InvalidRemoteRepository : 
Given remote repository is not valid");
-}
+lsCmd.setRemote(remoteRepository);
+lsCmd.setCredentialsProvider(this.credentialsProvider);
+lsCmd.call();
 }
 
 /**
diff --git 
a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/flow/git/GitFlowPersistenceProvider.java
 
b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/flow/git/GitFlowPersistenceProvider.java
index d511f877b5..2d262dfa5f 100644
--- 
a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/flow/git/GitFlowPersistenceProvider.java
+++ 
b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/flow/git/GitFlowPersistenceProvider.java
@@ -94,9 +94,12 @@ public class GitFlowPersistenceProvider implements 
MetadataAwareFlowPersistenceP
 flowStorageDir = new File(flowStorageDirValue);
 final boolean localRepoExists = 
flowMetaData.localRepoExists(flowStorageDir);
 if (remoteRepo != null && !remoteRepo.isEmpty() && 
!localRepoExists){
+logger.info("Validating remote repository [{}]", remoteRepo);
 flowMetaData.remoteRepoExists(remoteRepo);
+logger.info("Cloning remote repository [{}] to [{}]", 
remoteRepo, flowStorageDirValue);
 flowMetaData.cloneRepository(flowStorageDir, remoteRepo);
 }
+logger.info("Loading remote repository [{}]", remoteRepo);
 flowMetaData.loadGitRepository(flowStorageDir);
 flowMetaData.startPushThread();
 logger.info("Configured GitFlowPersistenceProvider with Flow 
Storage Directory {}",

[nifi] branch main updated: NIFI-11191 Refactored HikariCPConnectionPoolTest with Mock Driver (#6966)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new 5507bfa4b2 NIFI-11191 Refactored HikariCPConnectionPoolTest with Mock 
Driver (#6966)
5507bfa4b2 is described below

commit 5507bfa4b2e30cc09673d83250e3779dfd0aa109
Author: exceptionfactory 
AuthorDate: Thu Feb 16 16:34:57 2023 -0600

NIFI-11191 Refactored HikariCPConnectionPoolTest with Mock Driver (#6966)

- Removed Derby dependencies from HikariCP module no longer required for 
testing

Signed-off-by: Kevin Doran 
---
 .../nifi-hikari-dbcp-service/pom.xml   |  40 ---
 .../nifi/dbcp/HikariCPConnectionPoolTest.java  | 117 +++--
 .../test/java/org/apache/nifi/dbcp/MockDriver.java |  66 
 3 files changed, 78 insertions(+), 145 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/pom.xml
 
b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/pom.xml
index cfe497eeb6..27f5b9ea2a 100644
--- 
a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/pom.xml
+++ 
b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/pom.xml
@@ -65,45 +65,5 @@
 2.0.0-SNAPSHOT
 test
 
-
-org.slf4j
-jcl-over-slf4j
-
-
-org.apache.derby
-derby
-${derby.version}
-
-
-org.apache.derby
-derbynet
-${derby.version}
-test
-
-
-org.apache.derby
-derbytools
-${derby.version}
-test
-
-
-org.apache.derby
-derbyclient
-${derby.version}
-test
-
 
-
-
-
-org.apache.rat
-apache-rat-plugin
-
-
-src/test/resources/fake.keytab
-
-
-
-
-
 
\ No newline at end of file
diff --git 
a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/src/test/java/org/apache/nifi/dbcp/HikariCPConnectionPoolTest.java
 
b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/src/test/java/org/apache/nifi/dbcp/HikariCPConnectionPoolTest.java
index 9754ba8044..922ec6e5b4 100644
--- 
a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/src/test/java/org/apache/nifi/dbcp/HikariCPConnectionPoolTest.java
+++ 
b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-hikari-dbcp-service/src/test/java/org/apache/nifi/dbcp/HikariCPConnectionPoolTest.java
@@ -16,69 +16,28 @@
  */
 package org.apache.nifi.dbcp;
 
-import org.apache.derby.jdbc.EmbeddedDriver;
 import org.apache.nifi.reporting.InitializationException;
 import org.apache.nifi.util.NoOpProcessor;
 import org.apache.nifi.util.TestRunner;
 import org.apache.nifi.util.TestRunners;
-import org.apache.nifi.util.file.FileUtils;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Paths;
 import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.UUID;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
 
 public class HikariCPConnectionPoolTest {
 private final static String SERVICE_ID = 
HikariCPConnectionPoolTest.class.getSimpleName();
 
-private static final String DERBY_LOG_PROPERTY = "derby.stream.error.file";
-
-private static final String DERBY_SHUTDOWN_STATE = "XJ015";
-
 private TestRunner runner;
 
-private File databaseDirectory;
-
-@BeforeAll
-public static void setDerbyLog() {
-final File derbyLog = new File(getSystemTemporaryDirectory(), 
"derby.log");
-derbyLog.deleteOnExit();
-System.setProperty(DERBY_LOG_PROPERTY, derbyLog.getAbsolutePath());
-}
-
-@AfterAll
-public static void clearDerbyLog() {
-System.clearProperty(DERBY_LOG_PROPERTY);
-}
-
 @BeforeEach
 public void setup() {
 runner = TestRunners.newTestRunner(NoOpProcessor.class);
-databas

[nifi-maven] annotated tag rel/nifi-nar-maven-plugin-1.4.0 updated (09d7bb9 -> cf25e59)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to annotated tag rel/nifi-nar-maven-plugin-1.4.0
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


*** WARNING: tag rel/nifi-nar-maven-plugin-1.4.0 was modified! ***

from 09d7bb9  (commit)
  to cf25e59  (tag)
 tagging 09d7bb9ff679d0eed9feaa066d2cbdd347a20204 (commit)
 replaces rel/nifi-nar-maven-plugin-1.3.5
  by Kevin Doran
  on Mon Feb 6 11:58:35 2023 -0500

- Log -
NIFI-10906 signed release tag for approved release of NiFi NAR Maven Plugin 
1.4.0
-BEGIN PGP SIGNATURE-

iQIzBAABCgAdFiEEwJuoka7UW4wsIxr+H7ZqkfcbYgcFAmPhMbsACgkQH7Zqkfcb
Ygdguw//eEf1z46qrfegLufeoK1OgrXQdaYbXleRKZDGxzq6aX3FyFozkqIobraI
G7VrMPjCux2UvG+rOR3UeQVmGuLKzuhWo97W5bRyIWvhEnNW97zAkeMQ9xmLgRxR
lFvjtE6bCWjL5zTOgXOMj3YN4ZihbCcryxjoGG57dwHcKD5CN5NmTqSlNcKLwg67
0lNoPyD/Ab1E53Qd7XD4gedFbtp85mJhIUEoBAeYqfOoZ6xxpY6GpR1MU32cQ2J7
WU8D43vhMVIHPmVf9EqtWBzE0+EYjWaE8brnDWoTwkfIWDzK9+IctzLFADIkX9GT
OD25S4wkhL4GwsFe26fcram/7EcEYZdIVa/txoHdJ6pL9YsFEIiu3RnfyadRbY0l
XzvyQ1EG6dLm0nbmyJRIhgukZjY07zk4NaCfPQXzmfZVAnuy6eMdUPOLxe6bv/Ar
KM+DM2SG0fCQhVVZZ4euvm84yLxA0BZgemptVLhIVxJI2mPeFEwmbfxQvmgDtJ9Y
IoAGPRlxiQNTjoX0Trh5IQtUBmtkoMKi5SE1ptjdJfEWxATdOJuDRfh8EfBMjvTU
ndDA2Stfs5+6tIhJ0ydqm3cBfGN18uJ/xpe6kMD5bENAlvnDrdCguApc3H1T6sBQ
rzzVM3Es/ZW3Vg/dycYBRRm6Fl83w1uy7OfLxbITDLiP1I0eGLs=
=LKAx
-END PGP SIGNATURE-
---


No new revisions were added by this update.

Summary of changes:

svn commit: r59930 - /release/nifi/nifi-nar-maven-plugin-1.3.5/

[kdoran]

Author: kdoran
Date: Mon Feb  6 16:54:18 2023
New Revision: 59930

Log:
NIFI-10906 Removing old release dir

Removed:
release/nifi/nifi-nar-maven-plugin-1.3.5/

[nifi-maven] 01/01: Merge branch 'NIFI-10906-RC1'

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git

commit 47d8d3b681744bdf476d9e58885455fa1318664a
Merge: 794333f 08be9cd
Author: Kevin Doran 
AuthorDate: Mon Feb 6 10:48:56 2023 -0500

Merge branch 'NIFI-10906-RC1'

 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

[nifi-maven] branch main updated (794333f -> 47d8d3b)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


from 794333f  Merge pull request #28 from 
kevdoran/NIFI-10906-update-notice-year
 add 09d7bb9  NIFI-10906-RC1 prepare release nifi-nar-maven-plugin-1.4.0-RC1
 add 08be9cd  NIFI-10906-RC1 prepare for next development iteration
 new 47d8d3b  Merge branch 'NIFI-10906-RC1'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

svn commit: r59925 - /dev/nifi/nifi-nar-maven-plugin-1.4.0/ /release/nifi/nifi-nar-maven-plugin-1.4.0/

[kdoran]

Author: kdoran
Date: Mon Feb  6 15:48:05 2023
New Revision: 59925

Log:
NIFI-10906

Added:
release/nifi/nifi-nar-maven-plugin-1.4.0/
  - copied from r59924, dev/nifi/nifi-nar-maven-plugin-1.4.0/
Removed:
dev/nifi/nifi-nar-maven-plugin-1.4.0/

svn commit: r59924 - /dev/nifi/nifi-nar-maven-plugin-1.4.0/

[kdoran]

Author: kdoran
Date: Mon Feb  6 15:46:09 2023
New Revision: 59924

Log:
NIFI-10906 Staging artifacts for nifi-nar-maven-plugin-1.4.0-RC1

Added:
dev/nifi/nifi-nar-maven-plugin-1.4.0/

dev/nifi/nifi-nar-maven-plugin-1.4.0/nifi-nar-maven-plugin-1.4.0-source-release.zip
   (with props)

dev/nifi/nifi-nar-maven-plugin-1.4.0/nifi-nar-maven-plugin-1.4.0-source-release.zip.asc

dev/nifi/nifi-nar-maven-plugin-1.4.0/nifi-nar-maven-plugin-1.4.0-source-release.zip.sha256

dev/nifi/nifi-nar-maven-plugin-1.4.0/nifi-nar-maven-plugin-1.4.0-source-release.zip.sha512

Added: 
dev/nifi/nifi-nar-maven-plugin-1.4.0/nifi-nar-maven-plugin-1.4.0-source-release.zip
==
Binary file - no diff available.

Propchange: 
dev/nifi/nifi-nar-maven-plugin-1.4.0/nifi-nar-maven-plugin-1.4.0-source-release.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/nifi/nifi-nar-maven-plugin-1.4.0/nifi-nar-maven-plugin-1.4.0-source-release.zip.asc
==
--- 
dev/nifi/nifi-nar-maven-plugin-1.4.0/nifi-nar-maven-plugin-1.4.0-source-release.zip.asc
 (added)
+++ 
dev/nifi/nifi-nar-maven-plugin-1.4.0/nifi-nar-maven-plugin-1.4.0-source-release.zip.asc
 Mon Feb  6 15:46:09 2023
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCgAdFiEEwJuoka7UW4wsIxr+H7ZqkfcbYgcFAmPhH5QACgkQH7Zqkfcb
+Yge0lxAAjbStaBu4zT2UEyFPEs4dLx5u/DBGoa0SRIDE5t9EOqGY206w3qhstLxr
+bs98DlIQMdHWMaHgNoblpyvjmHVZ5it9sEroNmr7FXW4Uc1X1Jumklj13uhNz7LV
+abyGCDFWMUwwd2ckmFoIEqjZuV3Ls9AUM1gJGY52rkeyciI5p2+spX5dPmloAeTf
+z+aQvKo4TbaoR2JtuPSwNGQhrObvkBzK4/ysfKtL90tF8ZXE7wbXrz8lbxKSbBHg
+Mdh5aqSctstoWh8C48t+opQOSq/lCTfm7CaHm4R/ldEcDz50V/tLfk8cwE9tW252
+cBwUAkHN0c9rIbVFiJSehLkInvwzrD4KD9CFe/vOFFkUznIkcDVBRm+H4UojHzU/
+GJe0l2TZJpGDXnphFeBR/kaSI7nLGON1rmqed5DjhlwGHdbO+h/WNWqxLmVREZrp
+LqTatSeI7YRopeFG+nkEHumAhGu9ZPKy+MXfCmKJHYZ23+/MY3gyIHHymXRDQQaE
+orJVzYXhzgw/fAZ50D9/rEFOlRK42sFu5mGbm2+ec6laE/3o9EoA/wmickHIDgHt
+CIIDDS7BWQ8uHO8qGvAQqamqHD8+/GIAuk/hhI4lSeCvrxSGfzZiZCZTgd4lmDYb
+tmuMn5vnNnBLIJIIpKJBTChnnDznrIRJHc+26UCXMQL8X6I5Y1g=
+=wwls
+-END PGP SIGNATURE-

Added: 
dev/nifi/nifi-nar-maven-plugin-1.4.0/nifi-nar-maven-plugin-1.4.0-source-release.zip.sha256
==
--- 
dev/nifi/nifi-nar-maven-plugin-1.4.0/nifi-nar-maven-plugin-1.4.0-source-release.zip.sha256
 (added)
+++ 
dev/nifi/nifi-nar-maven-plugin-1.4.0/nifi-nar-maven-plugin-1.4.0-source-release.zip.sha256
 Mon Feb  6 15:46:09 2023
@@ -0,0 +1 @@
+fc1b5e2ec659ae7be3e8c184b7f01b02692aaafea68d83d2a5e46fda51780064

Added: 
dev/nifi/nifi-nar-maven-plugin-1.4.0/nifi-nar-maven-plugin-1.4.0-source-release.zip.sha512
==
--- 
dev/nifi/nifi-nar-maven-plugin-1.4.0/nifi-nar-maven-plugin-1.4.0-source-release.zip.sha512
 (added)
+++ 
dev/nifi/nifi-nar-maven-plugin-1.4.0/nifi-nar-maven-plugin-1.4.0-source-release.zip.sha512
 Mon Feb  6 15:46:09 2023
@@ -0,0 +1 @@
+d48bfde8a5bab8a17b320889297c09efa162a7017db2268e274db626926ff9b58173abab54db4e1a50b5664fc86a9501ce2ef267b3e3b768eb80ef5c929860c9

[nifi-maven] annotated tag nifi-nar-maven-plugin-1.4.0-RC1 updated (09d7bb9 -> 26bcde9)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to annotated tag nifi-nar-maven-plugin-1.4.0-RC1
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


*** WARNING: tag nifi-nar-maven-plugin-1.4.0-RC1 was modified! ***

from 09d7bb9  (commit)
  to 26bcde9  (tag)
 tagging 09d7bb9ff679d0eed9feaa066d2cbdd347a20204 (commit)
 replaces rel/nifi-nar-maven-plugin-1.3.5
  by Kevin Doran
  on Mon Jan 30 17:57:33 2023 -0500

- Log -
NIFI-10906-RC1 copy for tag nifi-nar-maven-plugin-1.4.0-RC1
---


No new revisions were added by this update.

Summary of changes:

[nifi-maven] branch NIFI-10906-RC1 created (now 08be9cd)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to branch NIFI-10906-RC1
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


  at 08be9cd  NIFI-10906-RC1 prepare for next development iteration

This branch includes the following new commits:

 new 09d7bb9  NIFI-10906-RC1 prepare release nifi-nar-maven-plugin-1.4.0-RC1
 new 08be9cd  NIFI-10906-RC1 prepare for next development iteration

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[nifi-maven] 01/02: NIFI-10906-RC1 prepare release nifi-nar-maven-plugin-1.4.0-RC1

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch NIFI-10906-RC1
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git

commit 09d7bb9ff679d0eed9feaa066d2cbdd347a20204
Author: Kevin Doran 
AuthorDate: Mon Jan 30 17:57:29 2023 -0500

NIFI-10906-RC1 prepare release nifi-nar-maven-plugin-1.4.0-RC1
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index b2ca352..c9094a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.nifi
 nifi-nar-maven-plugin
-1.4.0-SNAPSHOT
+1.4.0
 maven-plugin
 Apache NiFi Nar Maven Plugin
 http://nifi.apache.org
@@ -67,7 +67,7 @@
 scm:git:git://git.apache.org/nifi-maven.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/nifi-maven.git
 https://git-wip-us.apache.org/repos/asf?p=nifi-maven.git
-HEAD
+nifi-nar-maven-plugin-1.4.0-RC1
 
 
 JIRA
@@ -79,7 +79,7 @@
 3.1.0
 UTF-8
 
UTF-8
-
2022-11-29T21:10:17Z
+
2023-01-30T22:55:12Z
 2014
 
 

[nifi-maven] 02/02: NIFI-10906-RC1 prepare for next development iteration

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch NIFI-10906-RC1
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git

commit 08be9cd031155fc78ffa1dcfcd05553631a8bc31
Author: Kevin Doran 
AuthorDate: Mon Jan 30 17:57:33 2023 -0500

NIFI-10906-RC1 prepare for next development iteration
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c9094a5..a578b83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.nifi
 nifi-nar-maven-plugin
-1.4.0
+1.4.1-SNAPSHOT
 maven-plugin
 Apache NiFi Nar Maven Plugin
 http://nifi.apache.org
@@ -79,7 +79,7 @@
 3.1.0
 UTF-8
 
UTF-8
-
2023-01-30T22:55:12Z
+
2023-01-30T22:57:33Z
 2014
 
 

[nifi-maven] 01/02: NIFI-10926 Exclude jdk.tools and com.sun:tools from classpath for extension class loader

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git

commit eedc64430f6974f43f1f4c8b65a9ee581fc5ec3b
Author: Bryan Bende 
AuthorDate: Thu Dec 1 15:01:51 2022 -0500

NIFI-10926 Exclude jdk.tools and com.sun:tools from classpath for extension 
class loader

This closes #26.

Signed-off-by: Kevin Doran 
---
 .../extraction/ExtensionClassLoaderFactory.java  | 16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git 
a/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactory.java
 
b/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactory.java
index 66d7f0d..57bbc7d 100644
--- 
a/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactory.java
+++ 
b/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactory.java
@@ -24,6 +24,8 @@ import 
org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.artifact.resolver.filter.ExclusionSetFilter;
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.logging.Log;
@@ -51,6 +53,15 @@ import java.util.Set;
 import java.util.TreeSet;
 
 public class ExtensionClassLoaderFactory {
+
+private final static Set EXCLUDED_ARTIFACT_IDS;
+static {
+final Set excludedArtifactIds = new HashSet<>();
+excludedArtifactIds.add("jdk.tools:jdk.tools");
+excludedArtifactIds.add("com.sun:tools");
+EXCLUDED_ARTIFACT_IDS = 
Collections.unmodifiableSet(excludedArtifactIds);
+}
+
 private final Log log;
 private final MavenProject project;
 private final RepositorySystemSession repoSession;
@@ -295,15 +306,14 @@ public class ExtensionClassLoaderFactory {
 projectRequest.setLocalRepository(localRepo);
 projectRequest.setProject(mavenProject);
 
-final DependencyNode depNode = 
dependencyGraphBuilder.buildDependencyGraph(projectRequest, null);
+final ArtifactFilter excludesFilter = new 
ExclusionSetFilter(EXCLUDED_ARTIFACT_IDS);
+final DependencyNode depNode = 
dependencyGraphBuilder.buildDependencyGraph(projectRequest, excludesFilter);
 depNode.accept(nodeVisitor);
 } catch (DependencyGraphBuilderException e) {
 throw new MojoExecutionException("Failed to build dependency 
tree", e);
 }
 }
 
-
-
 private Set toURLs(final Artifact artifact) throws 
MojoExecutionException {
 final Set urls = new HashSet<>();
 

[nifi-maven] branch main updated (0b6788c -> cc26442)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


from 0b6788c  NIFI-10906 Set version to 1.4.0-SNAPSHOT
 new eedc644  NIFI-10926 Exclude jdk.tools and com.sun:tools from classpath 
for extension class loader
 new cc26442  NIFI-10927 Remove service files from parent class loader 
before discovering class names

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../extraction/ExtensionClassLoaderFactory.java  | 16 +---
 .../extraction/ExtensionDefinitionFactory.java   | 20 +++-
 2 files changed, 28 insertions(+), 8 deletions(-)

[nifi-maven] 02/02: NIFI-10927 Remove service files from parent class loader before discovering class names

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git

commit cc264428959b9e41f3bc7cae852f43b060bc248a
Author: Bryan Bende 
AuthorDate: Thu Dec 1 12:15:52 2022 -0500

NIFI-10927 Remove service files from parent class loader before discovering 
class names

This closes #27.

Signed-off-by: Kevin Doran 
---
 .../extraction/ExtensionDefinitionFactory.java   | 20 +++-
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git 
a/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionDefinitionFactory.java
 
b/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionDefinitionFactory.java
index 1f2f037..d8cabd3 100644
--- 
a/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionDefinitionFactory.java
+++ 
b/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionDefinitionFactory.java
@@ -137,19 +137,29 @@ public class ExtensionDefinitionFactory {
 }
 
 private Set discoverClassNames(final String extensionType) throws 
IOException {
-final Set classNames = new HashSet<>();
+final Set resourceUrls = new HashSet<>();
 
 final Enumeration resources = 
extensionClassLoader.getResources(SERVICES_DIRECTORY + extensionType);
-
 while (resources.hasMoreElements()) {
-final URL resourceUrl = resources.nextElement();
-classNames.addAll(discoverClassNames(extensionClassLoader, 
resourceUrl));
+resourceUrls.add(resources.nextElement());
 }
 
+final ClassLoader parentClassLoader = extensionClassLoader.getParent();
+if (parentClassLoader != null) {
+final Enumeration parentResources = 
parentClassLoader.getResources(SERVICES_DIRECTORY + extensionType);
+while (parentResources.hasMoreElements()) {
+resourceUrls.remove(parentResources.nextElement());
+}
+}
+
+final Set classNames = new HashSet<>();
+for (final URL resourceUrl : resourceUrls) {
+classNames.addAll(discoverClassNames(resourceUrl));
+}
 return classNames;
 }
 
-private Set discoverClassNames(final ClassLoader classLoader, 
final URL serviceUrl) throws IOException {
+private Set discoverClassNames(final URL serviceUrl) throws 
IOException {
 final Set classNames = new HashSet<>();
 
 try (final InputStream in = serviceUrl.openStream();

[nifi-maven] branch main updated: NIFI-10599 Correct class loader creation when reaching top of chain

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


The following commit(s) were added to refs/heads/main by this push:
 new 12d7012  NIFI-10599 Correct class loader creation when reaching top of 
chain
12d7012 is described below

commit 12d7012de5250c424aa16586c30b0824246e95c4
Author: Bryan Bende 
AuthorDate: Thu Oct 6 12:45:17 2022 -0400

NIFI-10599 Correct class loader creation when reaching top of chain

This closes #22.

Signed-off-by: Kevin Doran 
---
 .../extension/definition/extraction/ExtensionClassLoaderFactory.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git 
a/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactory.java
 
b/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactory.java
index e840cb2..66d7f0d 100644
--- 
a/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactory.java
+++ 
b/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactory.java
@@ -100,8 +100,7 @@ public class ExtensionClassLoaderFactory {
 
 final Artifact nar = removeNarArtifact(artifacts);
 if (nar == null) {
-final ExtensionClassLoader providedEntityClassLoader = 
createProvidedEntitiesClassLoader(artifactsHolder);
-return createClassLoader(artifacts, providedEntityClassLoader, 
null);
+return createProvidedEntitiesClassLoader(artifactsHolder);
 }
 
 final Set narDependencies = getNarDependencies(nar);

[nifi-maven] branch main updated: [NIFI-10325] force UTC timezone expected by date format (#21)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


The following commit(s) were added to refs/heads/main by this push:
 new 150b1bd  [NIFI-10325] force UTC timezone expected by date format (#21)
150b1bd is described below

commit 150b1bd70bbe80c392eed1b70a489804f07b6fd0
Author: Hervé Boutemy 
AuthorDate: Tue Nov 29 16:05:45 2022 +0100

[NIFI-10325] force UTC timezone expected by date format (#21)

Signed-off-by: Kevin Doran 
---
 src/main/java/org/apache/nifi/NarMojo.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/apache/nifi/NarMojo.java 
b/src/main/java/org/apache/nifi/NarMojo.java
index d355232..e1cb252 100644
--- a/src/main/java/org/apache/nifi/NarMojo.java
+++ b/src/main/java/org/apache/nifi/NarMojo.java
@@ -99,6 +99,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TimeZone;
 import java.util.TreeSet;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
@@ -1093,6 +1094,7 @@ public class NarMojo extends AbstractMojo {
 }
 
 SimpleDateFormat dateFormat = new 
SimpleDateFormat(BUILD_TIMESTAMP_FORMAT);
+dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
 archive.addManifestEntry("Build-Timestamp", 
dateFormat.format(timestamp == null ? new Date() : timestamp));
 
 archive.addManifestEntry("Clone-During-Instance-Class-Loading", 
String.valueOf(cloneDuringInstanceClassLoading));

[nifi] branch main updated: NIFI-10701 Update MiNiFi docker base images to eclipse-temurin

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new 709110da35 NIFI-10701 Update MiNiFi docker base images to 
eclipse-temurin
709110da35 is described below

commit 709110da35f4f2cc91a916d0663742c594cba126
Author: Ferenc Kis 
AuthorDate: Thu Oct 27 10:10:46 2022 +0200

NIFI-10701 Update MiNiFi docker base images to eclipse-temurin

This closes 6587.

Signed-off-by: Kevin Doran 
---
 .../minifi-c2-docker/dockerhub/DockerBuild.sh  | 20 ++-
 .../minifi-c2-docker/dockerhub/DockerImage.txt |  2 +-
 .../minifi-c2-docker/dockerhub/DockerRun.sh|  6 +-
 .../minifi-c2-docker/dockerhub/Dockerfile  | 14 +++--
 .../minifi-c2-docker/dockermaven/Dockerfile| 11 ++--
 minifi/minifi-docker/dockerhub/DockerBuild.sh  | 20 ++-
 minifi/minifi-docker/dockerhub/DockerImage.txt |  2 +-
 minifi/minifi-docker/dockerhub/DockerRun.sh|  4 +-
 minifi/minifi-docker/dockerhub/Dockerfile  | 15 ++---
 minifi/minifi-docker/dockerhub/README.md   | 13 ++---
 .../minifi-docker/dockerhub_ARM64/DockerBuild.sh   | 31 --
 .../minifi-docker/dockerhub_ARM64/DockerImage.txt  | 16 --
 minifi/minifi-docker/dockerhub_ARM64/DockerRun.sh  | 19 ---
 minifi/minifi-docker/dockerhub_ARM64/Dockerfile| 54 --
 minifi/minifi-docker/dockerhub_ARM64/README.md | 66 --
 minifi/minifi-docker/dockerhub_ARM64/sh/start.sh   | 26 -
 minifi/minifi-docker/dockermaven/Dockerfile| 11 ++--
 minifi/minifi-docker/pom.xml   |  4 +-
 .../src/test/resources/Dockerfile.minifi.test  |  3 +-
 .../src/test/resources/Dockerfile.minific2.test|  3 +-
 .../resources/docker-compose-c2-hierarchical.yml   |  6 +-
 .../test/resources/docker-compose-c2-protocol.yml  |  6 +-
 .../resources/docker-compose-v1-standalone.yml |  2 +-
 .../src/test/resources/tailFileServer.py   |  7 +--
 24 files changed, 67 insertions(+), 294 deletions(-)

diff --git a/minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerBuild.sh 
b/minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerBuild.sh
index 7a64a3d2fc..7b5d6853bd 100755
--- a/minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerBuild.sh
+++ b/minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerBuild.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 # 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.
@@ -13,19 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#!/bin/sh
-
-DOCKER_UID=1000
-if [ -n "$1" ]; then
-  DOCKER_UID="$1"
-fi
-
-DOCKER_GID=50
-if [ -n "$2" ]; then
-  DOCKER_GID="$2"
-fi
+DOCKER_UID="${1:-1000}"
+DOCKER_GID="${2:-1000}"
 
-DOCKER_IMAGE="$(egrep -v '(^#|^\s*$|^\s*\t*#)' DockerImage.txt)"
-MINIFI_C2_IMAGE_VERSION="$(echo $DOCKER_IMAGE | cut -d : -f 2)"
+DOCKER_IMAGE="$(grep -Ev '(^#|^\s*$|^\s*\t*#)' DockerImage.txt)"
+MINIFI_C2_IMAGE_VERSION="$(echo "$DOCKER_IMAGE" | cut -d : -f 2)"
 echo "Building MiNiFi C2 Server Image: '$DOCKER_IMAGE' Version: 
$MINIFI_C2_IMAGE_VERSION"
-docker build --build-arg UID="$DOCKER_UID" --build-arg GID="$DOCKER_GID" 
--build-arg MINIFI_C2_VERSION="$MINIFI_C2_IMAGE_VERSION" -t $DOCKER_IMAGE .
+docker build --build-arg UID="$DOCKER_UID" --build-arg GID="$DOCKER_GID" 
--build-arg MINIFI_C2_VERSION="$MINIFI_C2_IMAGE_VERSION" -t "$DOCKER_IMAGE" .
diff --git a/minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerImage.txt 
b/minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerImage.txt
index 806ff45025..88019ea3b4 100644
--- a/minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerImage.txt
+++ b/minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerImage.txt
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apache/nifi-minifi-c2:0.6.0
+apache/nifi-minifi-c2:1.19.0
diff --git a/minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerRun.sh 
b/minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerRun.sh
index a491927084..24c9cfb1cd 100755
--- a/minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerRun.sh
+++ b/minifi/minifi-c2/minifi-c2-docker/dockerhub/DockerRun.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 # 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.
@@ -13,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # 

[nifi] branch main updated: NIFI-10295 Upgraded GRPC from 1.34.0 to 1.48.0

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new 4e49a55e93 NIFI-10295 Upgraded GRPC from 1.34.0 to 1.48.0
4e49a55e93 is described below

commit 4e49a55e93cd1f5013c4c73146e53672c2d69a33
Author: exceptionfactory 
AuthorDate: Thu Jul 28 14:30:49 2022 -0500

NIFI-10295 Upgraded GRPC from 1.34.0 to 1.48.0

- Upgraded Protobuf from 3.14.0 to 3.21.4
- Removed netty-tcnative-boringssl-static as not necessary following 
NIFI-9897

This closes #6255.

Signed-off-by: Kevin Doran 
---
 nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/pom.xml | 5 -
 nifi-nar-bundles/nifi-grpc-bundle/pom.xml  | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/pom.xml 
b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/pom.xml
index 918045023b..28443a19a9 100644
--- a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/pom.xml
@@ -63,11 +63,6 @@ language governing permissions and limitations under the 
License. -->
 grpc-stub
 ${grpc.version}
 
-
-io.netty
-netty-tcnative-boringssl-static
-2.0.35.Final
-
 
 org.apache.nifi
 nifi-mock
diff --git a/nifi-nar-bundles/nifi-grpc-bundle/pom.xml 
b/nifi-nar-bundles/nifi-grpc-bundle/pom.xml
index 3202af4367..81a1a62423 100644
--- a/nifi-nar-bundles/nifi-grpc-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-grpc-bundle/pom.xml
@@ -32,8 +32,8 @@
 
 
 
-1.34.0
-3.14.0
+1.48.0
+3.21.4
 
 
 

[nifi-maven] branch main updated: NIFI-10253 Correctly process interface hierarchy for controller service APIs (#20)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


The following commit(s) were added to refs/heads/main by this push:
 new bc5e6d9  NIFI-10253 Correctly process interface hierarchy for 
controller service APIs (#20)
bc5e6d9 is described below

commit bc5e6d9f1a76d63e1cad3762da38432387877167
Author: Bryan Bende 
AuthorDate: Wed Jul 20 14:47:59 2022 -0400

NIFI-10253 Correctly process interface hierarchy for controller service 
APIs (#20)

 Signed-off-by: Kevin Doran 
---
 .../extraction/ExtensionDefinitionFactory.java | 53 --
 .../extraction/StandardServiceAPIDefinition.java   | 24 ++
 2 files changed, 64 insertions(+), 13 deletions(-)

diff --git 
a/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionDefinitionFactory.java
 
b/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionDefinitionFactory.java
index 5e51614..1f2f037 100644
--- 
a/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionDefinitionFactory.java
+++ 
b/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionDefinitionFactory.java
@@ -88,19 +88,18 @@ public class ExtensionDefinitionFactory {
 }
 
 private void addProvidedServiceAPIs(final Class controllerServiceClass, 
final Class extensionClass, final Set serviceApis) {
-if (extensionClass.getInterfaces() != null) {
-for (final Class implementedInterface : 
extensionClass.getInterfaces()) {
-if 
(controllerServiceClass.isAssignableFrom(implementedInterface) && 
!controllerServiceClass.equals(implementedInterface)) {
-final ClassLoader interfaceClassLoader = 
implementedInterface.getClassLoader();
-if (interfaceClassLoader instanceof ExtensionClassLoader) {
-final Artifact interfaceNarArtifact = 
((ExtensionClassLoader) interfaceClassLoader).getNarArtifact();
-
-final ServiceAPIDefinition serviceDefinition = new 
StandardServiceAPIDefinition(implementedInterface.getName(),
-interfaceNarArtifact.getGroupId(), 
interfaceNarArtifact.getArtifactId(), interfaceNarArtifact.getBaseVersion());
-
-serviceApis.add(serviceDefinition);
-}
-}
+final Class[] extensionInterfaces = extensionClass.getInterfaces();
+if (extensionInterfaces == null) {
+return;
+}
+
+for (final Class immediateInterface : extensionInterfaces) {
+final Set> interfaceHierarchy = new HashSet<>();
+interfaceHierarchy.add(immediateInterface);
+getInterfaceHierarchy(immediateInterface, interfaceHierarchy);
+
+for (final Class implementedInterface : interfaceHierarchy) {
+processImplementedInterface(implementedInterface, 
controllerServiceClass, serviceApis);
 }
 }
 
@@ -109,6 +108,34 @@ public class ExtensionDefinitionFactory {
 }
 }
 
+private void getInterfaceHierarchy(final Class implementedInterface, 
final Set> interfaceHierarchy) {
+final Class[] parentInterfaces = 
implementedInterface.getInterfaces();
+if (parentInterfaces == null) {
+return;
+}
+
+for (final Class parentInterface : parentInterfaces) {
+if (!interfaceHierarchy.contains(parentInterface)) {
+interfaceHierarchy.add(parentInterface);
+getInterfaceHierarchy(parentInterface, interfaceHierarchy);
+}
+}
+}
+
+private void processImplementedInterface(final Class 
implementedInterface, final Class controllerServiceClass, final 
Set serviceApis) {
+if (controllerServiceClass.isAssignableFrom(implementedInterface) && 
!controllerServiceClass.equals(implementedInterface)) {
+final ClassLoader interfaceClassLoader = 
implementedInterface.getClassLoader();
+if (interfaceClassLoader instanceof ExtensionClassLoader) {
+final Artifact interfaceNarArtifact = ((ExtensionClassLoader) 
interfaceClassLoader).getNarArtifact();
+
+final ServiceAPIDefinition serviceDefinition = new 
StandardServiceAPIDefinition(implementedInterface.getName(),
+interfaceNarArtifact.getGroupId(), 
interfaceNarArtifact.getArtifactId(), interfaceNarArtifact.getBaseVersion());
+
+serviceApis.add(serviceDefinition);
+}
+}
+}
+
 private Set discoverClassNames(final String extensionType) throws 
IOException {
 final Set classNames = new HashSet<>();
 
diff --git 
a/src/main/java/org/apache/nifi/extension/definition/extraction/StandardServiceAPIDefinition.java
 
b/src/main/java/org/apache/nifi/extension/definition/extraction

[nifi] branch main updated: NIFI-10249 Enabled Parallel Builds in GitHub Workflow

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new 8185ad0598 NIFI-10249 Enabled Parallel Builds in GitHub Workflow
8185ad0598 is described below

commit 8185ad05986d4b2c24cb892adce0422031cb1d06
Author: exceptionfactory 
AuthorDate: Mon Jul 18 14:15:20 2022 -0500

NIFI-10249 Enabled Parallel Builds in GitHub Workflow

- Upgraded maven-enforcer-plugin from 3.0.0 to 3.1.0
- Upgraded maven-dependency-plugin from 3.2.0 to 3.3.0
- Upgraded checkstyle from 9.2.1 to 9.3
- Upgraded buildnumber-maven-plugin from 1.4 to 3.0.0

This closes #6222.

Signed-off-by: Kevin Doran 
---
 .github/workflows/ci-workflow.yml | 25 -
 pom.xml   | 14 --
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/ci-workflow.yml 
b/.github/workflows/ci-workflow.yml
index 7511137136..abf17320d4 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -33,6 +33,7 @@ env:
 -nsu
 -ntp
 -ff
+--threads 1C
   MAVEN_BUILD_PROFILES: >-
 -P include-grpc
 -P skip-nifi-bin-assembly
@@ -57,12 +58,18 @@ jobs:
 steps:
   - name: Checkout Code
 uses: actions/checkout@v3
+  - name: Cache Maven Modules
+uses: actions/cache@v3
+with:
+  path: |
+~/.m2/repository
+  # Cache Maven modules using a cache key different from setup-java 
steps
+  key: ${{ runner.os }}-maven-static-analysis-${{ 
hashFiles('**/pom.xml') }}
   - name: Set up Java 17
 uses: actions/setup-java@v3
 with:
   distribution: 'zulu'
   java-version: '17'
-  cache: 'maven'
   - name: Maven Build
 run: >
   mvn validate
@@ -91,9 +98,7 @@ jobs:
   path: |
 ~/.npm
 **/node_modules
-  key: ${{ runner.os }}-npm16-${{ hashFiles('**/package-lock.json') }}
-  restore-keys: |
-${{ runner.os }}-npm16-
+  key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
   - name: Set up Java 17
 uses: actions/setup-java@v3
 with:
@@ -148,9 +153,7 @@ jobs:
   path: |
 ~/.npm
 **/node_modules
-  key: ${{ runner.os }}-npm16-${{ hashFiles('**/package-lock.json') }}
-  restore-keys: |
-${{ runner.os }}-npm16-
+  key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
   - name: Set up Java 11
 uses: actions/setup-java@v3
 with:
@@ -205,9 +208,7 @@ jobs:
   path: |
 ~/.npm
 **/node_modules
-  key: ${{ runner.os }}-npm16-${{ hashFiles('**/package-lock.json') }}
-  restore-keys: |
-${{ runner.os }}-npm16-
+  key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
   - name: Set up Java 8
 uses: actions/setup-java@v3
 with:
@@ -268,9 +269,7 @@ jobs:
   path: |
 ${{ steps.npm-cache-directory.outputs.directory }}
 **/node_modules
-  key: ${{ runner.os }}-npm16-${{ hashFiles('**/package-lock.json') }}
-  restore-keys: |
-${{ runner.os }}-npm16-
+  key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
   - name: Set up Java 8
 uses: actions/setup-java@v3
 with:
diff --git a/pom.xml b/pom.xml
index e94680a5d0..d390a7db1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -709,7 +709,7 @@
 
 org.codehaus.mojo
 buildnumber-maven-plugin
-1.4
+3.0.0
 
 
 org.antlr
@@ -724,14 +724,14 @@
 
 com.puppycrawl.tools
 checkstyle
-9.2.1
+9.3
 
 
 
 
 org.apache.maven.plugins
 maven-dependency-plugin
-3.2.0
+3.3.0
 
 
 org.apache.rat
@@ -797,7 +797,7 @@
 
 org.apache.maven.plugins
 maven-enforcer-plugin
-3.0.0
+3.1.0
 
 
 enforce-maven-version
@@ -975,12 +975,6 @@
 
 
 
-
 contrib-check
 
 

[nifi] branch main updated: NIFI-10162 Reorganized InvokeHTTP Properties

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new 7a47c8cfbd NIFI-10162 Reorganized InvokeHTTP Properties
7a47c8cfbd is described below

commit 7a47c8cfbd458ab037275762c385d50372c130a3
Author: exceptionfactory 
AuthorDate: Mon Jun 27 17:00:59 2022 -0500

NIFI-10162 Reorganized InvokeHTTP Properties

- Corrected handling of documentation for allowable values

NIFI-10162 Updated Multipart Form-Data Name description

This closes #6163.

Signed-off-by: Kevin Doran 
---
 .../html/HtmlDocumentationWriter.java  |  15 +-
 .../nifi/processors/standard/InvokeHTTP.java   | 920 ++---
 .../nifi/processors/standard/http/HttpHeader.java  |  44 +
 .../nifi/processors/standard/http/HttpMethod.java  |  46 ++
 .../nifi/processors/standard/InvokeHTTPTest.java   | 380 -
 5 files changed, 713 insertions(+), 692 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
index c086cc2f63..4659fe07a0 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
@@ -608,7 +608,7 @@ public class HtmlDocumentationWriter implements 
DocumentationWriter {
 
 for (final PropertyDependency dependency : dependencies) {
 final Set dependentValues = 
dependency.getDependentValues();
-final String prefix = (capitalizeThe ? "The" : "the") 
+ " <" + dependency.getPropertyDisplayName() + "> Property ";
+final String prefix = (capitalizeThe ? "The" : "the") 
+ " [" + dependency.getPropertyDisplayName() + "] Property ";
 String suffix = "";
 if (dependentValues == null) {
 suffix = "has a value specified.";
@@ -638,10 +638,15 @@ public class HtmlDocumentationWriter implements 
DocumentationWriter {
 final StringBuilder sb = new StringBuilder("is 
set to one of the following values: ");
 
 for (final String dependentValue : 
dependentValues) {
-for (AllowableValue av : 
dependencyProperty.getAllowableValues()) {
-if 
(dependentValue.equals(av.getValue())) {
-
sb.append("\"").append(av.getDisplayName()).append("\", ");
-break;
+final List allowableValues 
= dependencyProperty.getAllowableValues();
+if (allowableValues == null) {
+
sb.append("[").append(dependentValue).append("], ");
+} else {
+for (AllowableValue av : 
allowableValues) {
+if 
(dependentValue.equals(av.getValue())) {
+
sb.append("[").append(av.getDisplayName()).append("], ");
+break;
+}
 }
 }
 }
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
index 49fffdc48e..4f25e44aec 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
@@ -44,6 +44,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
@@ -93,6 +94,7 @@ import org.apache.nifi.components

[nifi] branch main updated: NIFI-10153 Refactored DocGeneratorTest and removed binary test files

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new c1c1d0da82 NIFI-10153 Refactored DocGeneratorTest and removed binary 
test files
c1c1d0da82 is described below

commit c1c1d0da8261004559029c11c59fb9b019df27a2
Author: exceptionfactory 
AuthorDate: Wed Jun 22 10:57:57 2022 -0500

NIFI-10153 Refactored DocGeneratorTest and removed binary test files

This closes #6146

Signed-off-by: Kevin Doran 
---
 .../nifi/documentation/DocGeneratorTest.java   | 152 ++---
 .../src/test/resources/conf/nifi.properties| 125 -
 .../src/test/resources/lib/example.nar | Bin 721040 -> 0 bytes
 .../src/test/resources/lib/jetty.nar   | Bin 4638519 -> 0 bytes
 .../src/test/resources/lib/nifi-framework-nar.nar  | Bin 406 -> 0 bytes
 .../src/test/resources/lib/nifiserver-test-nar.nar | Bin 298794 -> 0 bytes
 6 files changed, 69 insertions(+), 208 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/DocGeneratorTest.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/DocGeneratorTest.java
index 749d938820..617fa7e39c 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/DocGeneratorTest.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/DocGeneratorTest.java
@@ -19,101 +19,87 @@ package org.apache.nifi.documentation;
 import org.apache.commons.io.FileUtils;
 import org.apache.nifi.bundle.Bundle;
 import org.apache.nifi.bundle.BundleCoordinate;
-import org.apache.nifi.nar.ExtensionDiscoveringManager;
+import org.apache.nifi.bundle.BundleDetails;
+import org.apache.nifi.documentation.example.ProcessorWithLogger;
+import org.apache.nifi.nar.ExtensionDefinition;
+import org.apache.nifi.nar.ExtensionManager;
 import org.apache.nifi.nar.ExtensionMapping;
-import org.apache.nifi.nar.NarClassLoadersHolder;
-import org.apache.nifi.nar.NarUnpacker;
-import org.apache.nifi.nar.StandardExtensionDiscoveringManager;
-import org.apache.nifi.nar.SystemBundle;
-import org.apache.nifi.nar.NarUnpackMode;
+import org.apache.nifi.processor.Processor;
 import org.apache.nifi.util.NiFiProperties;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.io.TempDir;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.io.BufferedInputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Properties;
 import java.util.Set;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
 public class DocGeneratorTest {
+private static final Class PROCESSOR_CLASS = 
ProcessorWithLogger.class;
+
+private static final String[] HTML_EXTENSIONS = new String[]{"html"};
+
+private static final boolean RECURSIVE_ENABLED = true;
+
+@Mock
+ExtensionManager extensionManager;
 
 @Test
-public void testProcessorLoadsNarResources() throws IOException, 
ClassNotFoundException {
-TemporaryFolder temporaryFolder = new TemporaryFolder();
-temporaryFolder.create();
-
-NiFiProperties properties = 
loadSpecifiedProperties("/conf/nifi.properties",
-NiFiProperties.COMPONENT_DOCS_DIRECTORY,
-temporaryFolder.getRoot().getAbsolutePath());
-
-final Bundle systemBundle = SystemBundle.create(properties);
-final ExtensionMapping mapping = NarUnpacker.unpackNars(properties, 
systemBundle, NarUnpackMode.UNPACK_INDIVIDUAL_JARS);
-
-
NarClassLoadersHolder.getInstance().init(properties.getFrameworkWorkingDirectory(),
 properties.getExtensionsWorkingDirectory());
-
-final ExtensionDiscoveringManager extensionManager = new 
StandardExtensionDiscoveringManager();
-extensionManager.discoverExtensions(systemBundle, 
NarClassLoadersHolder.getInstance().getBundles());
-
-DocGenerator.generate(properties, extensionManager, mapping);
-
-   

[nifi-maven] annotated tag rel/nifi-nar-maven-plugin-1.3.4 updated (c4d9563 -> c9ccf14)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to annotated tag rel/nifi-nar-maven-plugin-1.3.4
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


*** WARNING: tag rel/nifi-nar-maven-plugin-1.3.4 was modified! ***

from c4d9563  (commit)
  to c9ccf14  (tag)
 tagging c4d9563bff2b5c2120e7f1e181343e2c01cc0422 (commit)
 replaces rel/nifi-nar-maven-plugin-1.3.3
  by Kevin Doran
  on Mon Jun 20 12:54:57 2022 -0400

- Log -
NIFI-10131 signed release tag for approved release of NiFi NAR Maven Plugin 
1.3.4
-BEGIN PGP SIGNATURE-

iQIzBAABCgAdFiEEwJuoka7UW4wsIxr+H7ZqkfcbYgcFAmKwpmEACgkQH7Zqkfcb
YgeQaA//Q6vF9+SpkWDr8AVpK2trthRv5RGJqcyirQwszXu3PQD2mQqrzYzRWopq
Z2MoeEx1P62L+n4VtG29dCd6ezHhXwA06zHrn8HB5h1RtvE+iPbLNO/LioLfJSHt
aeYkc3aA0/IgscH8n4Aq+9bEhICrt4Nd+A5HXKEeuV3ntMHXghv7wUrIB9eLSWVU
ntR0jAOJZ1vDfjiAlyVZOq4qtRS/lz7yMEKKNa5gTlLjZJ6U7rMAi4Oud+TMIx54
hmmjIAuD7R5rHPV5WGfdRHX4KCioe0PKJ3IiaKrBDaxXimagzUNWah6xlMIHQ/9C
znBBZqN9LvsxyapDmPkjzZ/ZavTyByiCecYvqsdbJj1f/EuhtwJeo81flZXuCVQY
oOOc9iR/SKDHqPykAsSAf8fe9nQgBdnG1ZJmeEZ+3fTUzYCvCZkvx/h/O+nh+pc8
S3vLbamcfk64Hb4AXkkOA+syO93oBMf8/qOMhZnOgk7KngrXcwCPptiEeYiCyg/8
n9nR4RSg9GK+dcONEKpShLQYp1+eNa9CR/Q+gYUmzIumfoQ+CRzAA79fjExbIPdl
ALY6yT9E6HoXfbrCfza10YlXIJxgpaUsLTYEsW/kpxjbJ2ycdDOJ+VJAUaYDW5ug
KBVQ1ypFw8R/v6EseIhKkwLOVTkeCxoWaz3NkjLc16QKHl2Xo88=
=2GXT
-END PGP SIGNATURE-
---


No new revisions were added by this update.

Summary of changes:

[nifi-maven] 01/01: Merge branch 'NIFI-10131-RC1'

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git

commit eefaa865592ab97290f48767c0a2d0bdb48b78e0
Merge: b0b02bc d707f03
Author: Kevin Doran 
AuthorDate: Mon Jun 20 12:49:32 2022 -0400

Merge branch 'NIFI-10131-RC1'

 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[nifi-maven] branch main updated (b0b02bc -> eefaa86)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


from b0b02bc  Merge pull request #19 from 
kevdoran/NIFI-10131-update-year-in-notice-file
 add c4d9563  NIFI-10131-RC1 prepare release nifi-nar-maven-plugin-1.3.4-RC1
 add d707f03  NIFI-10131-RC1 prepare for next development iteration
 new eefaa86  Merge branch 'NIFI-10131-RC1'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

svn commit: r55226 - /release/nifi/nifi-nar-maven-plugin-1.3.3/

[kdoran]

Author: kdoran
Date: Mon Jun 20 16:45:30 2022
New Revision: 55226

Log:
NIFI-10131 Removing old release dir

Removed:
release/nifi/nifi-nar-maven-plugin-1.3.3/

svn commit: r55225 - /dev/nifi/nifi-nar-maven-plugin-1.3.4/ /release/nifi/nifi-nar-maven-plugin-1.3.4/

[kdoran]

Author: kdoran
Date: Mon Jun 20 16:40:19 2022
New Revision: 55225

Log:
NIFI-10131

Added:
release/nifi/nifi-nar-maven-plugin-1.3.4/
  - copied from r55224, dev/nifi/nifi-nar-maven-plugin-1.3.4/
Removed:
dev/nifi/nifi-nar-maven-plugin-1.3.4/

[nifi-maven] annotated tag nifi-nar-maven-plugin-1.3.4-RC1 updated (c4d9563 -> 6f7ab62)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to annotated tag nifi-nar-maven-plugin-1.3.4-RC1
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


*** WARNING: tag nifi-nar-maven-plugin-1.3.4-RC1 was modified! ***

from c4d9563  (commit)
  to 6f7ab62  (tag)
 tagging c4d9563bff2b5c2120e7f1e181343e2c01cc0422 (commit)
 replaces rel/nifi-nar-maven-plugin-1.3.3
  by Kevin Doran
  on Thu Jun 16 16:22:00 2022 -0400

- Log -
NIFI-10131-RC1 copy for tag nifi-nar-maven-plugin-1.3.4-RC1
---


No new revisions were added by this update.

Summary of changes:

svn commit: r55168 - /dev/nifi/nifi-nar-maven-plugin-1.3.4/

[kdoran]

Author: kdoran
Date: Thu Jun 16 20:47:18 2022
New Revision: 55168

Log:
NIFI-10131 Staging artifacts for nifi-nar-maven-plugin-1.3.4-RC1

Added:
dev/nifi/nifi-nar-maven-plugin-1.3.4/

dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip
   (with props)

dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.asc

dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.sha256

dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.sha512

Added: 
dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip
==
Binary file - no diff available.

Propchange: 
dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.asc
==
--- 
dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.asc
 (added)
+++ 
dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.asc
 Thu Jun 16 20:47:18 2022
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCgAdFiEEwJuoka7UW4wsIxr+H7ZqkfcbYgcFAmKrlCoACgkQH7Zqkfcb
+YgemlhAAmqpezgCnYE+Xb6k6wBMX+4qWlzjiTBUIgQnzq/kuCp+ug/VthT213Qo+
+ACV5mYxDWaj/NpQK4t1mLT4/dp4zreriljW2grVI4O/R5AULgnZyaI68jNyj9Msf
+1LyegLrcV94ZXLc7vYUDHl2CNYF9osxsvFnUgg+UjI2Ay6LnRWvTYoXvXKr2lDcZ
+x0Qyi2of/vd5N4xvCgjb19X4RPiApR0KwgloLllV91GGlGwEfjlRhafWzPYOFh6r
+XChZwD8jUnq5cs0CkJIwrOnuGm4qz7oane5QUWj8MhoiBQ288eUl3QVV9iQBz4jV
+D+35pcO/1LUnjTbqR9MRyeNUj6QWNcIWCgAEsU7zeIJClvCn10S9KPYcejUJW4xb
+J7i+O27w8pzFXgQ4prwaVD5xgMX9Zcoei43ey7OdPwB1idoEbhON6RBcXveRUOxp
+/lzz8NwSGSQCsY2xvuZyT5NAItZqXxQVvY3qUM33hhKJMiMPTLfPkI6uc2rUzgeP
+uZj1ZkdQP6etxK29GGJyiDnO48dkOcKBJ6GYEqQ7Z64epr7lTH5h6BtmhN0VYs5e
+ArTjFb7cuuVglXTX2806Hvqgo5izuT5YSGKZIPWiB2rUDCMk3onIlNRoeH6ttXMG
+cCplGlTuZ1xuRKUgXmPmNQ61M0igPSoYNAgAbSAqmTJc9oWj/oE=
+=P7VH
+-END PGP SIGNATURE-

Added: 
dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.sha256
==
--- 
dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.sha256
 (added)
+++ 
dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.sha256
 Thu Jun 16 20:47:18 2022
@@ -0,0 +1 @@
+acee55a767b9c90c8884e8c6e5fe936088243f778dc7e1de6f281cd4c8a85cab

Added: 
dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.sha512
==
--- 
dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.sha512
 (added)
+++ 
dev/nifi/nifi-nar-maven-plugin-1.3.4/nifi-nar-maven-plugin-1.3.4-source-release.zip.sha512
 Thu Jun 16 20:47:18 2022
@@ -0,0 +1 @@
+267cc157117d179517257f47c8d92f3dc5e594b230bb019ccc6e2cb2884b450af56603214fa651bc33aceb3bf0bdb9369aa779672cb3f6f0efd2bacb166f9051

[nifi-maven] 01/02: NIFI-10131-RC1 prepare release nifi-nar-maven-plugin-1.3.4-RC1

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch NIFI-10131-RC1
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git

commit c4d9563bff2b5c2120e7f1e181343e2c01cc0422
Author: Kevin Doran 
AuthorDate: Thu Jun 16 16:21:56 2022 -0400

NIFI-10131-RC1 prepare release nifi-nar-maven-plugin-1.3.4-RC1
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index aa7c933..10b9e4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.nifi
 nifi-nar-maven-plugin
-1.3.4-SNAPSHOT
+1.3.4
 maven-plugin
 Apache NiFi Nar Maven Plugin
 http://nifi.apache.org
@@ -67,7 +67,7 @@
 scm:git:git://git.apache.org/nifi-maven.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/nifi-maven.git
 https://git-wip-us.apache.org/repos/asf?p=nifi-maven.git
-HEAD
+nifi-nar-maven-plugin-1.3.4-RC1
 
 
 JIRA
@@ -79,7 +79,7 @@
 3.1.0
 UTF-8
 
UTF-8
-
2022-02-17T22:08:13Z
+
2022-06-16T20:21:48Z
 2014
 
 

[nifi-maven] branch NIFI-10131-RC1 created (now d707f03)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to branch NIFI-10131-RC1
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


  at d707f03  NIFI-10131-RC1 prepare for next development iteration

This branch includes the following new commits:

 new c4d9563  NIFI-10131-RC1 prepare release nifi-nar-maven-plugin-1.3.4-RC1
 new d707f03  NIFI-10131-RC1 prepare for next development iteration

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[nifi-maven] 02/02: NIFI-10131-RC1 prepare for next development iteration

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch NIFI-10131-RC1
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git

commit d707f0391726e405c5dd347cce3a51bdd6e1bd81
Author: Kevin Doran 
AuthorDate: Thu Jun 16 16:22:00 2022 -0400

NIFI-10131-RC1 prepare for next development iteration
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 10b9e4a..d64ad31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.nifi
 nifi-nar-maven-plugin
-1.3.4
+1.3.5-SNAPSHOT
 maven-plugin
 Apache NiFi Nar Maven Plugin
 http://nifi.apache.org
@@ -67,7 +67,7 @@
 scm:git:git://git.apache.org/nifi-maven.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/nifi-maven.git
 https://git-wip-us.apache.org/repos/asf?p=nifi-maven.git
-nifi-nar-maven-plugin-1.3.4-RC1
+HEAD
 
 
 JIRA
@@ -79,7 +79,7 @@
 3.1.0
 UTF-8
 
UTF-8
-
2022-06-16T20:21:48Z
+
2022-06-16T20:22:00Z
 2014
 
 

[nifi-maven] branch main updated: NIFI-10011 Recursively look for provided API implementations

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


The following commit(s) were added to refs/heads/main by this push:
 new 03d924c  NIFI-10011 Recursively look for provided API implementations
03d924c is described below

commit 03d924c1028bbb10792f045fe8cb0f5c670f36ae
Author: Bryan Bende 
AuthorDate: Tue May 10 13:57:35 2022 -0400

NIFI-10011 Recursively look for provided API implementations
---
 .../extraction/ExtensionDefinitionFactory.java | 26 ++
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git 
a/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionDefinitionFactory.java
 
b/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionDefinitionFactory.java
index d632d19..5e51614 100644
--- 
a/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionDefinitionFactory.java
+++ 
b/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionDefinitionFactory.java
@@ -83,22 +83,30 @@ public class ExtensionDefinitionFactory {
 
 final Set serviceApis = new HashSet<>();
 final Class controllerServiceClass = 
Class.forName("org.apache.nifi.controller.ControllerService", false, 
extensionClassLoader);
+addProvidedServiceAPIs(controllerServiceClass, extensionClass, 
serviceApis);
+return serviceApis;
+}
 
-for (final Class implementedInterface : 
extensionClass.getInterfaces()) {
-if (controllerServiceClass.isAssignableFrom(implementedInterface)) 
{
-final ClassLoader interfaceClassLoader = 
implementedInterface.getClassLoader();
-if (interfaceClassLoader instanceof ExtensionClassLoader) {
-final Artifact interfaceNarArtifact = 
((ExtensionClassLoader) interfaceClassLoader).getNarArtifact();
+private void addProvidedServiceAPIs(final Class controllerServiceClass, 
final Class extensionClass, final Set serviceApis) {
+if (extensionClass.getInterfaces() != null) {
+for (final Class implementedInterface : 
extensionClass.getInterfaces()) {
+if 
(controllerServiceClass.isAssignableFrom(implementedInterface) && 
!controllerServiceClass.equals(implementedInterface)) {
+final ClassLoader interfaceClassLoader = 
implementedInterface.getClassLoader();
+if (interfaceClassLoader instanceof ExtensionClassLoader) {
+final Artifact interfaceNarArtifact = 
((ExtensionClassLoader) interfaceClassLoader).getNarArtifact();
 
-final ServiceAPIDefinition serviceDefinition = new 
StandardServiceAPIDefinition(implementedInterface.getName(),
-interfaceNarArtifact.getGroupId(), 
interfaceNarArtifact.getArtifactId(), interfaceNarArtifact.getBaseVersion());
+final ServiceAPIDefinition serviceDefinition = new 
StandardServiceAPIDefinition(implementedInterface.getName(),
+interfaceNarArtifact.getGroupId(), 
interfaceNarArtifact.getArtifactId(), interfaceNarArtifact.getBaseVersion());
 
-serviceApis.add(serviceDefinition);
+serviceApis.add(serviceDefinition);
+}
 }
 }
 }
 
-return serviceApis;
+if (extensionClass.getSuperclass() != null) {
+addProvidedServiceAPIs(controllerServiceClass, 
extensionClass.getSuperclass(), serviceApis);
+}
 }
 
 private Set discoverClassNames(final String extensionType) throws 
IOException {

[nifi-maven] 01/02: [NIFI-9856] make build reproducible

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git

commit 015de63ba3718369ff99323f3b4904471d9b7f72
Author: Hervé Boutemy 
AuthorDate: Thu Mar 31 19:03:37 2022 +0200

[NIFI-9856] make build reproducible
---
 pom.xml | 40 +---
 1 file changed, 9 insertions(+), 31 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae660fd..4dd942c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
 
 org.apache
 apache
-17
+25
 
 
 org.apache.nifi
@@ -74,11 +74,12 @@
 https://issues.apache.org/jira/browse/NIFI
 
 
-1.7
-1.7
+1.8
+1.8
 3.1.0
 UTF-8
 
UTF-8
+
2022-02-17T22:08:13Z
 2014
 
 
@@ -95,11 +96,6 @@
 true
 
 
-
-org.apache.maven.plugins
-maven-war-plugin
-2.5
-
 
 org.apache.maven.plugins
 maven-dependency-plugin
@@ -122,12 +118,12 @@
 
 org.apache.maven.plugins
 maven-source-plugin
-2.4
+3.2.1
 
 
 org.apache.maven.plugins
 maven-jar-plugin
-2.5
+3.2.2
 
 
 org.apache.maven.plugins
@@ -146,9 +142,9 @@
 
 org.apache.maven.plugins
 maven-release-plugin
-2.5.1
+3.0.0-M5
 
-true
+false
 apache-release
 true
 deploy
@@ -168,16 +164,6 @@
 
 
 
-
-org.codehaus.mojo
-rpm-maven-plugin
-2.1.1
-
-
-org.antlr
-antlr3-maven-plugin
-3.5.2
-
 
 org.apache.maven.plugins
 maven-checkstyle-plugin
@@ -360,14 +346,6 @@
 
 
 
-
-org.apache.maven.plugins
-maven-compiler-plugin
-
-8
-8
-
-
 
 
 
@@ -402,7 +380,7 @@
 just to simplify the dependencies list. -->
 org.apache.maven.plugins
 maven-jar-plugin
-2.5
+3.2.2
 
 
 org.apache.maven.plugin-tools

[nifi-maven] branch main updated (1285f4b -> 8a50344)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git


from 1285f4b  Merge branch 'nifi-maven-1.3.3-rc1' into main
 new 015de63  [NIFI-9856] make build reproducible
 new 8a50344  [NIFI-9857] make output reproducible

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml| 67 --
 src/main/java/org/apache/nifi/NarMojo.java | 41 ++
 2 files changed, 59 insertions(+), 49 deletions(-)

[nifi] branch main updated: NIFI-9538: Add C2 heartbeat capability to minifi-c2-service

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new b5e61109f6 NIFI-9538: Add C2 heartbeat capability to minifi-c2-service
b5e61109f6 is described below

commit b5e61109f6d5d7331d7cd0c7027ad9250c347852
Author: Matthew Burgess 
AuthorDate: Wed Feb 9 13:49:23 2022 -0500

NIFI-9538: Add C2 heartbeat capability to minifi-c2-service

- Added content hash code to avoid repeatedly updating with the same flow
- Gracefully handle agent classes and provide update URL to /config
- Fixed JDK 8 build issue with ConfigService

This closes #5755.

Signed-off-by: Kevin Doran 
---
 .../apache/nifi/minifi/c2/api/Configuration.java   |   8 +
 minifi/minifi-c2/minifi-c2-assembly/pom.xml|   2 +-
 .../src/main/resources/conf/authorizations.yaml|  28 
 .../FileSystemWritableConfiguration.java   |  11 ++
 .../c2/cache/s3/S3WritableConfiguration.java   |   8 +-
 .../minifi-c2-provider-nifi-rest/pom.xml   |   7 +-
 minifi/minifi-c2/minifi-c2-service/pom.xml |  22 ++-
 .../minifi/c2/configuration/C2ResourceConfig.java  |   3 +
 .../C2JsonProvider.java}   |  32 ++--
 .../C2JsonProviderFeature.java}|  23 ++-
 .../nifi/minifi/c2/service/C2ProtocolContext.java  |  96 +++
 .../C2ProtocolService.java}|  21 +--
 .../nifi/minifi/c2/service/ConfigService.java  | 182 +++--
 .../minifi/c2/service/SimpleC2ProtocolService.java | 127 ++
 minifi/pom.xml |   2 +-
 15 files changed, 513 insertions(+), 59 deletions(-)

diff --git 
a/minifi/minifi-c2/minifi-c2-api/src/main/java/org/apache/nifi/minifi/c2/api/Configuration.java
 
b/minifi/minifi-c2/minifi-c2-api/src/main/java/org/apache/nifi/minifi/c2/api/Configuration.java
index 90fbdba346..3f78b52269 100644
--- 
a/minifi/minifi-c2/minifi-c2-api/src/main/java/org/apache/nifi/minifi/c2/api/Configuration.java
+++ 
b/minifi/minifi-c2/minifi-c2-api/src/main/java/org/apache/nifi/minifi/c2/api/Configuration.java
@@ -18,6 +18,7 @@
 package org.apache.nifi.minifi.c2.api;
 
 import java.io.InputStream;
+import java.net.URL;
 
 /**
  * Represents a MiNiFi configuration of a given version, format matches the 
format of the ConfigurationProvider
@@ -44,4 +45,11 @@ public interface Configuration {
  * @return an input stream to read the configuration with
  */
 InputStream getInputStream() throws ConfigurationProviderException;
+
+/**
+ * Gets the URL of the resource
+ *
+ * @return the URL of the resource
+ */
+URL getURL() throws ConfigurationProviderException;
 }
diff --git a/minifi/minifi-c2/minifi-c2-assembly/pom.xml 
b/minifi/minifi-c2/minifi-c2-assembly/pom.xml
index ba2553e395..148a6efe7b 100644
--- a/minifi/minifi-c2/minifi-c2-assembly/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-assembly/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
 pom
 This is the assembly of Apache MiNiFi's - Command And Control 
Server
 
-10080
+10090
 
 false
 
./conf/keystore.jks
diff --git 
a/minifi/minifi-c2/minifi-c2-assembly/src/main/resources/conf/authorizations.yaml
 
b/minifi/minifi-c2/minifi-c2-assembly/src/main/resources/conf/authorizations.yaml
index 5669451940..14386e5c17 100644
--- 
a/minifi/minifi-c2/minifi-c2-assembly/src/main/resources/conf/authorizations.yaml
+++ 
b/minifi/minifi-c2/minifi-c2-assembly/src/main/resources/conf/authorizations.yaml
@@ -37,3 +37,31 @@ Paths:
 # Default authorization lets anonymous pull any config.  Remove below to 
change that.
 - Authorization: ROLE_ANONYMOUS
   Action: allow
+
+  /c2/config/heartbeat:
+Default Action: deny
+Actions:
+  - Authorization: CLASS_RASPI_3
+Query Parameters:
+  class: raspi3
+Action: allow
+  - Authorization: ROLE_SUPERUSER
+Action: allow
+
+  # Default authorization lets anonymous pull any config.  Remove below to 
change that.
+  - Authorization: ROLE_ANONYMOUS
+Action: allow
+
+  /c2/config/acknowledge:
+Default Action: deny
+Actions:
+  - Authorization: CLASS_RASPI_3
+Query Parameters:
+  class: raspi3
+Action: allow
+  - Authorization: ROLE_SUPERUSER
+Action: allow
+
+  # Default authorization lets anonymous pull any config.  Remove below to 
change that.
+  - Authorization: ROLE_ANONYMOUS
+Action: allow
diff --git 
a/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-filesystem/src/main/java/org/apache/nifi/minifi/c2/cache/filesystem/FileSystemWritableConfiguration.java
 
b/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-filesystem/src/main/java/org/apache/nifi/minifi/c2/cache/filesystem

[nifi] branch main updated: NIFI-10069 Updated multiple components to support Sensitive Dynamic Properties

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new 45cc3cefe5 NIFI-10069 Updated multiple components to support Sensitive 
Dynamic Properties
45cc3cefe5 is described below

commit 45cc3cefe5f94915d8665d962e1d6b326c8cca99
Author: exceptionfactory 
AuthorDate: Tue May 31 11:00:29 2022 -0500

NIFI-10069 Updated multiple components to support Sensitive Dynamic 
Properties

- ExecuteScript
- ExecuteStreamCommand
- InvokeScriptedProcessor
- HikariCPConnectionPool

This closes #6085.

Signed-off-by: Kevin Doran 
---
 .../nifi/processors/script/ExecuteScript.java  |  6 +-
 .../processors/script/InvokeScriptedProcessor.java | 10 ++-
 .../processors/standard/ExecuteStreamCommand.java  | 92 ++
 .../apache/nifi/dbcp/HikariCPConnectionPool.java   |  2 +
 4 files changed, 53 insertions(+), 57 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java
 
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java
index 8d64dcf4e9..24c946474d 100644
--- 
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java
+++ 
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/ExecuteScript.java
@@ -23,6 +23,7 @@ import 
org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
 import org.apache.nifi.annotation.behavior.Restricted;
 import org.apache.nifi.annotation.behavior.Restriction;
 import org.apache.nifi.annotation.behavior.Stateful;
+import org.apache.nifi.annotation.behavior.SupportsSensitiveDynamicProperties;
 import org.apache.nifi.annotation.documentation.CapabilityDescription;
 import org.apache.nifi.annotation.documentation.SeeAlso;
 import org.apache.nifi.annotation.documentation.Tags;
@@ -68,9 +69,10 @@ import java.util.Set;
 + "handling the incoming flow file (transfer to SUCCESS or remove, 
e.g.) as well as any flow files created by "
 + "the script. If the handling is incomplete or incorrect, the session 
will be rolled back. Experimental: "
 + "Impact of sustained usage not yet verified.")
+@SupportsSensitiveDynamicProperties
 @DynamicProperty(
-name = "A script engine property to update",
-value = "The value to set it to",
+name = "Script Engine Binding property",
+value = "Binding property value passed to Script Runner",
 expressionLanguageScope = ExpressionLanguageScope.FLOWFILE_ATTRIBUTES,
 description = "Updates a script engine property specified by the 
Dynamic Property's key with the value "
 + "specified by the Dynamic Property's value")
diff --git 
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java
 
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java
index 8c89233d88..d5172be8a7 100644
--- 
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java
+++ 
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java
@@ -22,6 +22,7 @@ import org.apache.nifi.annotation.behavior.DynamicProperty;
 import org.apache.nifi.annotation.behavior.Restricted;
 import org.apache.nifi.annotation.behavior.Restriction;
 import org.apache.nifi.annotation.behavior.Stateful;
+import org.apache.nifi.annotation.behavior.SupportsSensitiveDynamicProperties;
 import org.apache.nifi.annotation.documentation.CapabilityDescription;
 import org.apache.nifi.annotation.documentation.SeeAlso;
 import org.apache.nifi.annotation.documentation.Tags;
@@ -76,7 +77,8 @@ import java.util.concurrent.atomic.AtomicReference;
 + "public void onStopped(ProcessContext context) methods to be invoked 
when the parent InvokeScriptedProcessor is scheduled or stopped, respectively.  
"
 + "NOTE: The script will be loaded when the processor is populated 
with property values, see the Restrictions section for more security 
implications.  "
 + "Experimental: Impact of sustained usage not yet verified.")
-@DynamicProperty(name = "A script engine property to update", value = "The 
value to set it to",
+@SupportsSensitiveDynamicProperties
+@DynamicProperty(name = "Script Engine Binding pro

[nifi] branch main updated: NIFI-9967: Added FlowSerializationStrategy to determine which flow formats (XML,JSON) to save

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new bd1e033d55 NIFI-9967: Added FlowSerializationStrategy to determine 
which flow formats (XML,JSON) to save
bd1e033d55 is described below

commit bd1e033d55e5bf7b3778bb8f8d0999f2b32f99bb
Author: Matthew Burgess 
AuthorDate: Wed Apr 27 13:37:31 2022 -0400

NIFI-9967: Added FlowSerializationStrategy to determine which flow formats 
(XML,JSON) to save

This closes #6001.

Signed-off-by: Kevin Doran 
---
 .../nifi/controller/FlowSerializationStrategy.java | 31 ++
 .../nifi/controller/StandardFlowService.java   | 14 ++
 .../persistence/StandardFlowConfigurationDAO.java  | 13 ++---
 .../spring/StandardFlowServiceFactoryBean.java |  4 ++-
 .../nifi/controller/StandardFlowServiceTest.java   |  3 ++-
 .../nifi/integration/FrameworkIntegrationTest.java |  3 ++-
 .../apache/nifi/headless/HeadlessNiFiServer.java   |  4 ++-
 7 files changed, 60 insertions(+), 12 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSerializationStrategy.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSerializationStrategy.java
new file mode 100644
index 00..d5e0f162e0
--- /dev/null
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowSerializationStrategy.java
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+package org.apache.nifi.controller;
+
+public enum FlowSerializationStrategy {
+WRITE_XML_ONLY,
+WRITE_JSON_ONLY,
+WRITE_XML_AND_JSON;
+
+public boolean writesJson() {
+return this == WRITE_JSON_ONLY || this == WRITE_XML_AND_JSON;
+}
+
+public boolean writesXml() {
+return this == WRITE_XML_ONLY || this == WRITE_XML_AND_JSON;
+}
+}
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
index 6d18032e03..c3eb799f5e 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
@@ -159,9 +159,11 @@ public class StandardFlowService implements FlowService, 
ProtocolHandler {
 final NiFiProperties nifiProperties,
 final PropertyEncryptor encryptor,
 final RevisionManager revisionManager,
-final Authorizer authorizer) throws IOException {
+final Authorizer authorizer,
+final FlowSerializationStrategy serializationStrategy) throws 
IOException {
 
-return new StandardFlowService(controller, nifiProperties, null, 
encryptor, false, null, revisionManager, authorizer);
+return new StandardFlowService(controller, nifiProperties, null, 
encryptor, false, null, revisionManager, authorizer,
+serializationStrategy);
 }
 
 public static StandardFlowService createClusteredInstance(
@@ -173,7 +175,8 @@ public class StandardFlowService implements FlowService, 
ProtocolHandler {
 final RevisionManager revisionManager,
 final Authorizer authorizer) throws IOException {
 
-return new StandardFlowService(controller, nifiProperties, 
senderListener, encryptor, true, coordinator, revisionManager, authorizer);
+return new StandardFlowService(controller, nifiProperties, 
senderListener, encryptor, true, coordinator, revisionManager, authorizer,
+FlowSerializationStrategy.WRITE_XML_AND_JSON);
 }
 
 private StandardFlowService(
@@ -18

[nifi] branch main updated: NIFI-9888 Fix Azure header datetime format

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new 83a9e965d2 NIFI-9888 Fix Azure header datetime format
83a9e965d2 is described below

commit 83a9e965d285d77e7f85bd0df7d18e774d20d845
Author: Malthe Borch 
AuthorDate: Thu Apr 7 07:15:09 2022 +

NIFI-9888 Fix Azure header datetime format

This fixes the occasional "403 Forbidden" bug that we have seen, simply 
because
the signature ends up being invalid due to an invalid datetime format used.

Issue: NIFI-9888
Reference: https://stackoverflow.com/a/51636763/647151

Use statically defined formatter and explain why

This closes #5943.

Signed-off-by: Kevin Doran 
---
 .../azure/loganalytics/AbstractAzureLogAnalyticsReportingTask.java   | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AbstractAzureLogAnalyticsReportingTask.java
 
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AbstractAzureLogAnalyticsReportingTask.java
index 1017ee54ea..056d05d2a8 100644
--- 
a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AbstractAzureLogAnalyticsReportingTask.java
+++ 
b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AbstractAzureLogAnalyticsReportingTask.java
@@ -50,6 +50,9 @@ public abstract class AbstractAzureLogAnalyticsReportingTask 
extends AbstractRep
 
 private static final Charset UTF8 = Charset.forName("UTF-8");
 private static final String HMAC_SHA256_ALG = "HmacSHA256";
+
+// DateTimeFormatter.RFC_1123_DATE_TIME does not work in every case, such 
as when a
+// two-digit day of month is always required, so we are defining our own 
formatter here.
 private static final DateTimeFormatter RFC_1123_DATE_TIME = 
DateTimeFormatter
 .ofPattern("EEE, dd MMM  HH:mm:ss O");
 
@@ -136,7 +139,7 @@ public abstract class 
AbstractAzureLogAnalyticsReportingTask extends AbstractRep
 
 final int bodyLength = rawJson.getBytes(UTF8).length;
 final ZonedDateTime zNow = ZonedDateTime.now(ZoneOffset.UTC);
-final String nowRfc1123 = 
zNow.format(DateTimeFormatter.RFC_1123_DATE_TIME);
+final String nowRfc1123 = zNow.format(RFC_1123_DATE_TIME);
 final String nowISO8601 = zNow.format(DateTimeFormatter.ISO_DATE_TIME);
 final String createAuthorization = createAuthorization(workspaceId, 
linuxPrimaryKey, bodyLength, nowRfc1123);
 request.addHeader("Authorization", createAuthorization);

[nifi] branch main updated: NIFI-9845 Fix NiFi Registry database ITs

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new 3c10910  NIFI-9845 Fix NiFi Registry database ITs
3c10910 is described below

commit 3c10910fe266ca8274ef8d14ad2423e5bef6c7be
Author: Bryan Bende 
AuthorDate: Tue Mar 29 11:44:59 2022 -0400

NIFI-9845 Fix NiFi Registry database ITs

- remove unsupported DB test containers, update admin guide

This closes #5914.

Signed-off-by: Kevin Doran 
---
 .../src/main/asciidoc/administration-guide.adoc|  2 +-
 .../nifi-registry-core/nifi-registry-test/pom.xml  | 10 --
 .../nifi/registry/db/MySql6DataSourceFactory.java  | 37 --
 .../nifi/registry/db/MySql7DataSourceFactory.java  | 37 --
 ...ctory.java => Postgres14DataSourceFactory.java} |  6 ++--
 nifi-registry/nifi-registry-core/pom.xml   | 35 +++-
 nifi-registry/pom.xml  | 26 +++
 7 files changed, 41 insertions(+), 112 deletions(-)

diff --git 
a/nifi-registry/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
 
b/nifi-registry/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
index 7609c40..f8c6f88 100644
--- 
a/nifi-registry/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
+++ 
b/nifi-registry/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
@@ -1131,7 +1131,7 @@ providing 2 total locations, including 
`nifi.registry.extension.dir.1`.
 
 The metadata database maintains the knowledge of which buckets exist, which 
versioned items belong to which buckets, as well as the version history for 
each item.
 
-Currently, NiFi Registry supports using H2, Postgres (9.x, 10.x), and MySQL 
(5.6, 5.7, 8.0) for the relational database engine.
+Currently, NiFi Registry supports using H2, Postgres (10.x - 13.x), and MySQL 
(8.0) for the relational database engine.
 
 NOTE: NiFi Registry 0.1.0 only supports H2.
 
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml 
b/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
index 0354b71..65cbe5a 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
@@ -40,29 +40,19 @@
 
 org.testcontainers
 testcontainers
-${testcontainers.version}
 compile
 
 
 org.testcontainers
 mysql
-${testcontainers.version}
-
-
-org.slf4j
-jcl-over-slf4j
-
-
 
 
 org.testcontainers
 mariadb
-${testcontainers.version}
 
 
 org.testcontainers
 postgresql
-${testcontainers.version}
 
 
 mysql
diff --git 
a/nifi-registry/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/MySql6DataSourceFactory.java
 
b/nifi-registry/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/MySql6DataSourceFactory.java
deleted file mode 100644
index 69fc987..000
--- 
a/nifi-registry/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/MySql6DataSourceFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.
- */
-package org.apache.nifi.registry.db;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.testcontainers.containers.MySQLContainer;
-
-@Configuration
-@Profile("mysql-56")
-public class MySql6DataSourceFactory extends MySqlDataSourceFactory {
-
-private static final MySQLContainer MYSQL_CONTAINER = new 
MySqlCustomContainer("mysql:5.6");
-
-static {
-MYSQL_CONTAINER.start();
-}
-
-@Override
-protected MySQLC

[nifi] branch main updated (d2e90dd -> c91f543)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git.


from d2e90dd  NIFI-9751 - Poll as needed during system-tests to ensure 
expected state
 add c91f543  NIFI-9425: Added auto-load NAR capability to MiNiFi

No new revisions were added by this update.

Summary of changes:
 .../main/assembly/dependencies-windows-service.xml |  9 +
 .../src/main/assembly/dependencies.xml |  9 +
 .../minifi/bootstrap/util/ConfigTransformer.java   |  1 +
 .../minifi-framework-nar/pom.xml   | 32 +--
 .../minifi-framework/minifi-framework-core/pom.xml |  5 ---
 .../main/java/org/apache/nifi/minifi/MiNiFi.java   |  2 +-
 .../minifi-framework/minifi-server/pom.xml | 15 
 .../apache/nifi/minifi/StandardMiNiFiServer.java   |  6 ++-
 .../minifi-server-nar/pom.xml  | 15 
 .../minifi-framework-bundle/pom.xml|  5 +++
 .../java/org/apache/nifi/nar/NarAutoLoader.java| 12 --
 .../apache/nifi/headless/HeadlessNiFiServer.java   | 45 +++---
 12 files changed, 129 insertions(+), 27 deletions(-)

[nifi] branch main updated: NIFI-9638 Refactored Google Guava references

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new 43748a5  NIFI-9638 Refactored Google Guava references
43748a5 is described below

commit 43748a5523dd5fbf020f8023c7dcf8406dcb4971
Author: exceptionfactory 
AuthorDate: Mon Jan 31 20:06:56 2022 -0600

NIFI-9638 Refactored Google Guava references

- Refactored nifi-framework and nifi-standard modules
- Replaced Google Cache with Caffeine Cache
- Replaced Google collections classes with standard Java collections

This closes #5730.

Signed-off-by: Kevin Doran 
---
 .../http/endpoints/ControllerEndpointMerger.java   |   6 +-
 .../nifi/cluster/manager/BulletinMerger.java   |   3 +-
 .../components/monitor/LongRunningTaskMonitor.java |   3 -
 .../org/apache/nifi/controller/SnippetManager.java |   7 +-
 .../leader/election/CuratorACLProviderFactory.java |   6 +-
 .../partition/CorrelationAttributePartitioner.java |  21 +-
 .../analytics/ConnectionStatusAnalytics.java   |   3 +-
 .../history/JsonNodeStatusHistoryDumpFactory.java  |   6 +-
 .../flow/mapping/NiFiRegistryFlowMapperTest.java   |  62 ++--
 .../apache/nifi/web/server/HostHeaderHandler.java  |   3 +-
 .../org/apache/nifi/web/server/JettyServer.java|   8 +-
 .../apache/nifi/web/StandardNiFiServiceFacade.java |   7 +-
 .../apache/nifi/web/api/ApplicationResource.java   |   8 +-
 .../nifi/web/StandardNiFiServiceFacadeTest.java|  15 +-
 .../apache/nifi/web/api/TestVersionsResource.java  |   6 +-
 .../nifi-web/nifi-web-security/pom.xml |   4 -
 .../web/security/logout/LogoutRequestManager.java  |   6 +-
 .../apache/nifi/web/security/oidc/OidcService.java |  42 +--
 .../saml/impl/StandardSAMLStateManager.java|  35 +-
 .../x509/ocsp/OcspCertificateValidator.java|  40 +--
 .../ocsp/OcspCertificateValidatorGroovyTest.groovy | 391 -
 .../x509/ocsp/OcspCertificateValidatorTest.java|  48 ---
 nifi-nar-bundles/nifi-framework-bundle/pom.xml |   5 -
 .../nifi-standard-processors/pom.xml   |  10 -
 .../processors/standard/CalculateRecordStats.java  |   3 +-
 .../nifi/processors/standard/LogAttribute.java |   7 +-
 .../apache/nifi/processors/standard/RouteText.java |   7 +-
 .../nifi/processors/standard/TransformXml.java |  15 +-
 .../standard/db/impl/MySQLDatabaseAdapter.java |  25 +-
 .../db/impl/PostgreSQLDatabaseAdapter.java |  25 +-
 .../standard/servlets/ListenHTTPServlet.java   |  17 +-
 .../nifi/processors/standard/util/FTPTransfer.java |   2 -
 .../processors/standard/TestAttributesToCSV.java   |   4 +-
 .../nifi/processors/standard/TestLogAttribute.java |  21 +-
 .../nifi/processors/standard/TestRouteText.java|   8 +-
 nifi-nar-bundles/nifi-standard-bundle/pom.xml  |   5 -
 .../hortonworks/HortonworksSchemaRegistry.java |   6 +-
 .../nifi-record-serialization-services/pom.xml |   5 -
 .../org/apache/nifi/avro/AvroRecordReader.java |   4 +-
 .../java/org/apache/nifi/csv/CSVRecordReader.java  |   5 +-
 .../nifi/schema/inference/VolatileSchemaCache.java |   2 -
 .../apache/nifi/csv/ITApacheCSVRecordReader.java   |   3 -
 .../schema/inference/TestFieldTypeInference.java   |  16 +-
 43 files changed, 212 insertions(+), 713 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ControllerEndpointMerger.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ControllerEndpointMerger.java
index 804d59d..1ce7de9 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ControllerEndpointMerger.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ControllerEndpointMerger.java
@@ -16,7 +16,6 @@
  */
 package org.apache.nifi.cluster.coordination.http.endpoints;
 
-import com.google.common.collect.Sets;
 import org.apache.nifi.cluster.manager.NodeResponse;
 import org.apache.nifi.cluster.manager.PortEntityMerger;
 import org.apache.nifi.cluster.protocol.NodeIdentifier;
@@ -27,6 +26,7 @@ import org.apache.nifi.web.api.entity.ControllerEntity;
 import java.net.URI;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
@@ -88,8 +88,8 @@ public class ControllerEndpointMerger extends 
AbstractSingleDTOEndpoint clientInputPorts = 
Sets.newHashSet(clientDto.getInputPorts());
-final Set clientOutputPorts = 
Sets.newHashSet(clientDto.getOutputPorts

[nifi] branch main updated: NIFI-7865 amqp$header is splitted in the wrong way for ", " and "}"

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new e603b017 NIFI-7865 amqp$header is splitted in the wrong way for "," 
and "}"
e603b017 is described below

commit e603b0179bf46ef26bbf4713ae68553b19d4c485
Author: sedadgn 
AuthorDate: Thu Oct 14 13:24:35 2021 +0200

NIFI-7865 amqp$header is splitted in the wrong way for "," and "}"

This PR introduces 2 new properties for the ConsumeAMQP processor
And one new property for PublishAMQP

This allows to configure the processors to use escaping for commas and to 
consistently not use curly braces in the amqp$header attribute.

The default values ensure backwards compatibility.

This closes #5458.

Signed-off-by: Kevin Doran 
---
 .../nifi/processor/util/StandardValidators.java|  20 +++
 .../apache/nifi/amqp/processors/ConsumeAMQP.java   |  54 +++-
 .../apache/nifi/amqp/processors/PublishAMQP.java   |  28 ++--
 .../nifi/amqp/processors/ConsumeAMQPTest.java  | 144 +
 .../nifi/amqp/processors/PublishAMQPTest.java  |  49 +++
 5 files changed, 283 insertions(+), 12 deletions(-)

diff --git 
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/processor/util/StandardValidators.java
 
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/processor/util/StandardValidators.java
index 1dad5d4..7c2276a 100644
--- 
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/processor/util/StandardValidators.java
+++ 
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/processor/util/StandardValidators.java
@@ -375,6 +375,25 @@ public class StandardValidators {
 }
 };
 
+public static final Validator SINGLE_CHAR_VALIDATOR = (subject, input, 
context) -> {
+if (input == null) {
+return new ValidationResult.Builder()
+.input(input)
+.subject(subject)
+.valid(false)
+.explanation("Input is null for this property")
+.build();
+}
+if (input.length() != 1) {
+return new ValidationResult.Builder()
+.input(input)
+.subject(subject)
+.valid(false)
+.explanation("Value must be exactly 1 character but was " 
+ input.length() + " in length")
+.build();
+}
+return new 
ValidationResult.Builder().input(input).subject(subject).valid(true).build();
+};
 /**
  * URL Validator that does not allow the Expression Language to be used
  */
@@ -980,4 +999,5 @@ public class StandardValidators {
 return new 
ValidationResult.Builder().subject(subject).input(value).explanation(reason).valid(reason
 == null).build();
 }
 }
+
 }
diff --git 
a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/ConsumeAMQP.java
 
b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/ConsumeAMQP.java
index 7a1885c..734d3ef 100644
--- 
a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/ConsumeAMQP.java
+++ 
b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/ConsumeAMQP.java
@@ -98,6 +98,24 @@ public class ConsumeAMQP extends 
AbstractAMQPProcessor {
 .defaultValue("10")
 .required(true)
 .build();
+public static final PropertyDescriptor HEADER_SEPARATOR = new 
PropertyDescriptor.Builder()
+   .name("header.separator")
+   .displayName("Header Separator")
+   .description("The character that is used to separate key-value for 
header in String. The value must only one character."
+   + "Otherwise you will get an error message")
+   .addValidator(StandardValidators.SINGLE_CHAR_VALIDATOR)
+   .defaultValue(",")
+   .required(false)
+   .build();
+static final PropertyDescriptor REMOVE_CURLY_BRACES = new 
PropertyDescriptor.Builder()
+.name("remove.curly.braces")
+.displayName("Remove Curly Braces")
+.description("If true Remove Curly Braces, Curly Braces in the header 
will be automatically remove.")
+.addValidator(StandardValidators.BOOLEAN_VALIDATOR)
+.defaultValue("False")
+.allowableValues("True", "False")
+.required(false)
+.build();
 
 public static final Relationship REL_SUCCESS = new Relationship.Builder()
 .name("success")
@@ -112,6 +130,8 @@ public class ConsumeAMQP extends 
Ab

[nifi] branch main updated: NIFI-8779 correctly pass MIRROR_BASE_URL from DockerBuild to Dockerfile; address shellcheck issues with Docker-related scripts

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new 6259269  NIFI-8779 correctly pass MIRROR_BASE_URL from DockerBuild to 
Dockerfile; address shellcheck issues with Docker-related scripts
6259269 is described below

commit 6259269f73a486b7d834d701e44362880b8a6a85
Author: Chris Sampson 
AuthorDate: Tue Jul 13 09:29:23 2021 +0100

NIFI-8779 correctly pass MIRROR_BASE_URL from DockerBuild to Dockerfile; 
address shellcheck issues with Docker-related scripts

Allow override of DISTRO_PATH for NiFi dockerhub build to enable image 
creation from the Apache Dev server during Release Candidate voting

Rationalise nifi-docker builds and integration-tests (remove duplicate 
script directories)

This closes #5213.

Signed-off-by: Kevin Doran 
---
 nifi-docker/dockerhub/.dockerignore|   6 +-
 nifi-docker/dockerhub/DockerBuild.sh   |  32 +++--
 nifi-docker/dockerhub/DockerRun.sh |  14 ++-
 nifi-docker/dockerhub/Dockerfile   |   5 +-
 nifi-docker/dockerhub/pom.xml  |  17 ++-
 .../{dockerhub => dockermaven}/.dockerignore   |  14 ++-
 nifi-docker/dockermaven/Dockerfile |   3 +-
 nifi-docker/dockermaven/integration-test.sh|  31 +++--
 nifi-docker/dockermaven/pom.xml|  27 -
 nifi-docker/dockermaven/sh/common.sh   |  36 --
 nifi-docker/dockermaven/sh/secure.sh   |  81 -
 nifi-docker/dockermaven/sh/start.sh| 134 -
 nifi-docker/dockermaven/sh/toolkit.sh  |  32 -
 .../sh/update_cluster_state_management.sh  |  31 -
 .../dockermaven/sh/update_login_providers.sh   |  47 
 nifi-docker/pom.xml|   4 +-
 16 files changed, 102 insertions(+), 412 deletions(-)

diff --git a/nifi-docker/dockerhub/.dockerignore 
b/nifi-docker/dockerhub/.dockerignore
index 30a2650..0058a31 100644
--- a/nifi-docker/dockerhub/.dockerignore
+++ b/nifi-docker/dockerhub/.dockerignore
@@ -16,4 +16,8 @@
 # Place files you want to exclude from the docker build here similar to 
.gitignore https://docs.docker.com/engine/reference/builder/#dockerignore-file
 DockerBuild.sh
 DockerRun.sh
-DockerImage.txt
\ No newline at end of file
+DockerImage.txt
+
+target/
+*.iml
+pom.xml
diff --git a/nifi-docker/dockerhub/DockerBuild.sh 
b/nifi-docker/dockerhub/DockerBuild.sh
index 2285aac..09806b0 100755
--- a/nifi-docker/dockerhub/DockerBuild.sh
+++ b/nifi-docker/dockerhub/DockerBuild.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 # 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.
@@ -13,24 +15,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#!/bin/bash
-
-DOCKER_UID=1000
-if [ -n "$1" ]; then
-  DOCKER_UID="$1"
-fi
+set -e
+set -o pipefail
 
-DOCKER_GID=1000
-if [ -n "$2" ]; then
-  DOCKER_GID="$2"
-fi
+DOCKER_UID="${1:-1000}"
+DOCKER_GID="${2:-1000}"
+MIRROR="${3:-https://archive.apache.org/dist};
+BASE="${4:-${MIRROR}}"
+DISTRO_PATH="${5:-}"
 
-MIRROR=https://archive.apache.org/dist
-if [ -n "$3" ]; then
-  MIRROR="$3"
+DOCKER_IMAGE="$(grep -Ev '(^#|^\s*$|^\s*\t*#)' DockerImage.txt)"
+NIFI_IMAGE_VERSION="$(echo "${DOCKER_IMAGE}" | cut -d : -f 2)"
+if [ -z "${DISTRO_PATH}" ]; then
+  DISTRO_PATH="${NIFI_VERSION}"
 fi
 
-DOCKER_IMAGE="$(egrep -v '(^#|^\s*$|^\s*\t*#)' DockerImage.txt)"
-NIFI_IMAGE_VERSION="$(echo $DOCKER_IMAGE | cut -d : -f 2)"
-echo "Building NiFi Image: '$DOCKER_IMAGE' Version: $NIFI_IMAGE_VERSION 
Mirror: $MIRROR"
-docker build --build-arg UID="$DOCKER_UID" --build-arg GID="$DOCKER_GID" 
--build-arg NIFI_VERSION="$NIFI_IMAGE_VERSION" --build-arg MIRROR="$MIRROR" -t 
$DOCKER_IMAGE .
+echo "Building NiFi Image: '${DOCKER_IMAGE}' Version: '${NIFI_IMAGE_VERSION}' 
Mirror: '${MIRROR}' Base: '${BASE} Path: '${DISTRO_PATH}' User/Group: 
'${DOCKER_UID}/${DOCKER_GID}'"
+docker build --build-arg UID="${DOCKER_UID}" --build-arg GID="${DOCKER_GID}" 
--build-arg NIFI_VERSION="${NIFI_IMAGE_VERSION}" --build-arg 
MIRROR_BASE_URL="${MIRROR}" --build-arg BASE_URL="${BASE}" --build-arg 
DISTRO_PATH="${DISTRO_PATH}" -t "${DOCKER_IMAGE}" .
diff --git a/nifi-docker/dockerhub/DockerRun.sh 
b/nifi-docker/dockerhub/DockerRun.sh
index d25551d..97d0092 10

[nifi] branch main updated: NIFI-5573 Allow overriding of nifi-env.sh

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new 49d10db  NIFI-5573 Allow overriding of nifi-env.sh
49d10db is described below

commit 49d10dbcbd584075f9cfb0d04772fb553277c7da
Author: Lars Francke 
AuthorDate: Tue Sep 4 15:30:42 2018 +0200

NIFI-5573 Allow overriding of nifi-env.sh

This closes #2985.

Signed-off-by: Kevin Doran 
---
 .../src/main/resources/bin/nifi-env.sh | 37 ++
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi-env.sh
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi-env.sh
index 5889d49..4922351 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi-env.sh
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi-env.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 #
 #Licensed to the Apache Software Foundation (ASF) under one or more
 #contributor license agreements.  See the NOTICE file distributed with
@@ -16,16 +16,39 @@
 #limitations under the License.
 #
 
+# By default this file will unconditionally override whatever environment 
variables you have set
+# and set them to defaults defined here.
+# If you want to define your own versions outside of this script please set 
the environment variable
+# NIFI_OVERRIDE_NIFIENV to "true". That will then use whatever variables you 
used outside of
+# this script.
+
 # The java implementation to use.
 #export JAVA_HOME=/usr/java/jdk1.8.0/
 
-export NIFI_HOME=$(cd "${SCRIPT_DIR}" && cd .. && pwd)
+setOrDefault() {
+  envvar="$1"
+  default="$2"
+
+  res="$default"
+  if [ -n "$envvar" ] && [ "$NIFI_OVERRIDE_NIFIENV" = "true" ]
+  then
+res="$envvar"
+  fi
+
+  echo "$res"
+}
+
+
+NIFI_HOME="$(setOrDefault "$NIFI_HOME" "$(cd "$SCRIPT_DIR" && cd .. && pwd)")"
+export NIFI_HOME
 
 #The directory for the NiFi pid file
-export NIFI_PID_DIR="${NIFI_HOME}/run"
+NIFI_PID_DIR="$(setOrDefault "$NIFI_PID_DIR" "$NIFI_HOME/run")"
+export NIFI_PID_DIR
 
 #The directory for NiFi log files
-export NIFI_LOG_DIR="${NIFI_HOME}/logs"
+NIFI_LOG_DIR="$(setOrDefault "$NIFI_LOG_DIR" "$NIFI_HOME/logs")"
+export NIFI_LOG_DIR
 
 # Set to false to force the use of Keytab controller service in processors
 # that use Kerberos. If true, these processors will allow configuration of 
keytab
@@ -34,8 +57,10 @@ export NIFI_LOG_DIR="${NIFI_HOME}/logs"
 # a multi-tenant environment where management of keytabs should be performed 
only by
 # a user with elevated permissions (i.e., users that have been granted the 
'ACCESS_KEYTAB'
 # restriction).
-export NIFI_ALLOW_EXPLICIT_KEYTAB=true
+NIFI_ALLOW_EXPLICIT_KEYTAB="$(setOrDefault "$NIFI_ALLOW_EXPLICIT_KEYTAB" true)"
+export NIFI_ALLOW_EXPLICIT_KEYTAB
 
 # Set to true to deny access to the Local File System from HDFS Processors
 # This flag forces HDFS Processors to evaluate the File System path during 
scheduling
-export NIFI_HDFS_DENY_LOCAL_FILE_SYSTEM_ACCESS=false
\ No newline at end of file
+NIFI_HDFS_DENY_LOCAL_FILE_SYSTEM_ACCESS="$(setOrDefault 
"$NIFI_HDFS_DENY_LOCAL_FILE_SYSTEM_ACCESS" false)"
+export NIFI_HDFS_DENY_LOCAL_FILE_SYSTEM_ACCESS

[nifi] branch main updated (3fb7640 -> a0655bf)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git.


from 3fb7640  NIFI-8485 Upgraded Jetty to 9.4.40
 add a0655bf  MINIFI-422: Incorporate MiNiFi Java into NiFi

No new revisions were added by this update.

Summary of changes:
 README.md  |   61 +-
 minifi/minifi-assembly/LICENSE |  523 ++
 minifi/minifi-assembly/NOTICE  |  705 
 minifi/minifi-assembly/README.md   |  114 ++
 minifi/minifi-assembly/pom.xml |  378 +
 .../main/assembly/dependencies-windows-service.xml |  180 ++
 .../src/main/assembly/dependencies.xml |  171 ++
 .../src/main/resources/build.properties.template   |   18 +-
 minifi/minifi-bootstrap/pom.xml|  108 ++
 .../nifi/minifi/bootstrap/BootstrapCodec.java  |  122 ++
 .../minifi/bootstrap/ConfigurationFileHolder.java  |   29 +-
 .../nifi/minifi/bootstrap/MiNiFiListener.java  |  141 ++
 .../bootstrap/QueryableStatusAggregator.java   |   28 +-
 .../apache/nifi/minifi/bootstrap/RunMiNiFi.java| 1757 
 .../apache/nifi/minifi/bootstrap/ShutdownHook.java |  123 ++
 .../nifi/minifi/bootstrap/WindowsService.java  |   31 +-
 .../ConfigurationChangeCoordinator.java|  114 ++
 .../ConfigurationChangeException.java  |   31 +-
 .../configuration/ConfigurationChangeListener.java |   38 +
 .../configuration/ConfigurationChangeNotifier.java |   30 +-
 .../configuration/ListenerHandleResult.java|   55 +
 .../differentiators/WholeConfigDifferentiator.java |   90 +
 .../differentiators/interfaces/Differentiator.java |   30 +-
 .../ingestors/AbstractPullChangeIngestor.java  |   61 +
 .../ingestors/FileChangeIngestor.java  |  234 +++
 .../ingestors/PullHttpChangeIngestor.java  |  399 +
 .../ingestors/RestChangeIngestor.java  |  294 
 .../ingestors/interfaces/ChangeIngestor.java   |   31 +-
 .../exception/InvalidCommandException.java |   31 +-
 .../exception/InvalidConfigurationException.java   |   31 +-
 .../bootstrap/status/PeriodicStatusReporter.java   |   81 +
 .../bootstrap/status/reporters/StatusLogger.java   |  135 ++
 .../bootstrap/util/BootstrapTransformer.java   |  102 ++
 .../bootstrap/util/ByteBufferInputStream.java  |   41 +-
 .../minifi/bootstrap/util/ConfigTransformer.java   |  738 
 .../bootstrap/util/ConfigTransformerException.java |   31 +-
 .../minifi/bootstrap/util/LimitingInputStream.java |  107 ++
 .../minifi/bootstrap/util/OrderedProperties.java   |   87 +
 .../bootstrap/util/ParentGroupIdResolver.java  |  101 ++
 .../nifi/minifi/bootstrap/RunMiNiFiTest.java   |  133 ++
 .../ConfigurationChangeCoordinatorTest.java|   84 +
 .../WholeConfigDifferentiatorTest.java |  110 ++
 .../ingestors/FileChangeIngestorTest.java  |  171 ++
 .../ingestors/PullHttpChangeIngestorSSLTest.java   |   85 +
 .../ingestors/PullHttpChangeIngestorTest.java  |   63 +
 .../ingestors/RestChangeIngestorSSLTest.java   |  150 ++
 .../ingestors/RestChangeIngestorTest.java  |   57 +
 .../common/PullHttpChangeIngestorCommonTest.java   |  279 
 .../common/RestChangeIngestorCommonTest.java   |  127 ++
 .../status/reporters/StatusLoggerTest.java |  209 +++
 .../bootstrap/util/ConfigTransformerTest.java  |  786 +
 .../bootstrap/util/OrderedPropertiesTest.java  |   60 +
 .../bootstrap/util/ParentGroupIdResolverTest.java  |  201 +++
 ...InvokeHttpMiNiFiProxyNoPasswordTemplateTest.yml |  302 
 .../InvokeHttpMiNiFiProxyPasswordTemplateTest.yml  |  302 
 .../src/test/resources/MINIFI-216/config.yml   |  106 ++
 .../test/resources/MINIFI-216/configOverrides.yml  |  110 ++
 .../resources/MINIFI-216/nifi.properties.before|  121 ++
 .../src/test/resources/MINIFI-245/config.yml   |  107 ++
 .../resources/MINIFI-245/nifi.properties.before|  121 ++
 .../src/test/resources/MINIFI-277/config.yml   |  107 ++
 .../src/test/resources/MINIFI-277/nifi.properties  |  123 ++
 .../src/test/resources/MINIFI-516/bootstrap.conf   |  132 ++
 .../src/test/resources/MINIFI-516/config.yml   |  102 ++
 .../src/test/resources/MINIFI-537/config.yml   |   43 +
 .../test/resources/SimpleRPGToLogAttributes.yml|  110 ++
 .../bootstrap.conf.configured  |  129 ++
 .../bootstrap.conf.default |  129 ++
 .../bootstrap-provenance-reporting/config.yml  |   97 ++
 .../bootstrap-ssl-ctx/bootstrap.conf.configured|  119 ++
 .../bootstrap.conf.configured.invalid  |  119 ++
 .../bootstrap-ssl-ctx/bootstrap.conf.default   |  119 ++
 .../test/resources/bootstrap-ssl-ctx/config.yml|  107 ++
 .../src/test/resources/config-empty.yml|7 +-
 .../src

[nifi-registry] branch main updated: NIFIREG-427 Updated references to root key instead of master key in Admin Guide

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/main by this push:
 new e6bff3d  NIFIREG-427 Updated references to root key instead of master 
key in Admin Guide
e6bff3d is described below

commit e6bff3dc5929a17ce7da1acdb16ff82d7439dfbc
Author: Andrew Lim 
AuthorDate: Fri Oct 23 15:52:31 2020 -0400

NIFIREG-427 Updated references to root key instead of master key in Admin 
Guide
---
 .../src/main/asciidoc/administration-guide.adoc| 40 +++---
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git 
a/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
 
b/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
index 2510058..0276693 100644
--- 
a/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
+++ 
b/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
@@ -746,21 +746,21 @@ The `encrypt-config` command line tool can be used to 
encrypt NiFi Registry conf
 
 You can use the following command line options with the `encrypt-config` tool:
 
- * `-h`,`--help`  Show usage information (this 
message)
- * `-v`,`--verbose`   Enables verbose mode (off by 
default)
- * `-p`,`--password `   Protect the files using a 
password-derived key. If an argument is not provided to this flag, interactive 
mode will be triggered to prompt the user to enter the password.
- * `-k`,`--key `  Protect the files using a 
raw hexadecimal key. If an argument is not provided to this flag, interactive 
mode will be triggered to prompt the user to enter the key.
- * `--oldPassword ` If the input files are 
already protected using a password-derived key, this specifies the old password 
so that the files can be unprotected before re-protecting.
- * `--oldKey `If the input files are 
already protected using a key, this specifies the raw hexadecimal key so that 
the files can be unprotected before re-protecting.
- * `-b`,`--bootstrapConf `  The _bootstrap.conf_ file 
containing no master key or an existing master key. If a new password/key is 
specified and no output bootstrap.conf file is specified, then this file will 
be overwritten to persist the new master key.
- * `-B`,`--outputBootstrapConf `The destination 
_bootstrap.conf_ file to persist master key. If specified, the input 
_bootstrap.conf_ will not be modified.
- * `-r`,`--nifiRegistryProperties ` The 
_nifi-registry.properties_ file containing unprotected config values, 
overwritten if no output file specified.
- * `-R`,`--outputNifiRegistryProperties `   The destination 
_nifi-registry.properties_ file containing protected config values.
- * `-a`,`--authorizersXml ` The _authorizers.xml_ file 
containing unprotected config values, overwritten if no output file specified.
- * `-A`,`--outputAuthorizersXml `   The destination 
_authorizers.xml_ file containing protected config values.
- * `-i`,`--identityProvidersXml `   The _identity-providers.xml_ 
file containing unprotected config values, overwritten if no output file 
specified.
- * `-I`,`--outputIdentityProvidersXml ` The destination 
_identity-providers.xml_ file containing protected config values.
-
+* `-h`,`--help` Show usage information (this 
message)
+* `-v`,`--verbose`  Sets verbose mode (default 
false)
+* `-p`,`--password `  Protect the files using a 
password-derived key. If an argument is not provided to this flag, interactive 
mode will be triggered to prompt the user to enter the password.
+* `-k`,`--key ` Protect the files using a raw 
hexadecimal key. If an argument is not provided to this flag, interactive mode 
will be triggered to prompt the user to enter the key.
+* `--oldPassword `If the input files are already 
protected using a password-derived key, this specifies the old password so that 
the files can be unprotected before re-protecting.
+* `--oldKey `   If the input files are already 
protected using a key, this specifies the raw hexadecimal key so that the files 
can be unprotected before re-protecting.
+* `-b`,`--bootstrapConf ` The _bootstrap.conf_ file 
containing no root key or an existing root key. If a new password or key is 
specified (using `-p` or `-k`) and no output _bootstrap.conf_ file is 
specified, then this file will be overwritten to persist the new root key.
+* `-B`,`--outputBootstrapConf `   The destination 
_bootstrap.conf_ file to persist root key. If specified, the input

[nifi-registry] branch main updated: NIFIREG-425 Update automated UI tests with correct URL

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/main by this push:
 new c5215c9  NIFIREG-425 Update automated UI tests with correct URL
c5215c9 is described below

commit c5215c9a3bcbd7a50f32645c93622edab7e2e02f
Author: Andrew Lim 
AuthorDate: Fri Oct 16 12:05:31 2020 -0400

NIFIREG-425 Update automated UI tests with correct URL

This closes #307.

Signed-off-by: Kevin Doran 
---
 .../src/test/java/org/apache/nifi/registry/ui/ITCreateBucket.java | 2 +-
 .../java/org/apache/nifi/registry/ui/ITCreateBucketCancel.java| 2 +-
 .../java/org/apache/nifi/registry/ui/ITCreateDuplicateBucket.java | 2 +-
 .../java/org/apache/nifi/registry/ui/ITCreateMultipleBuckets.java | 8 
 .../java/org/apache/nifi/registry/ui/ITDeleteSingleBucket.java| 2 +-
 .../org/apache/nifi/registry/ui/ITDeleteSingleBucketCancel.java   | 2 +-
 .../src/test/java/org/apache/nifi/registry/ui/ITRenameBucket.java | 2 +-
 .../java/org/apache/nifi/registry/ui/ITRenameBucketDuplicate.java | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git 
a/nifi-registry-core/nifi-registry-web-ui/src/test/java/org/apache/nifi/registry/ui/ITCreateBucket.java
 
b/nifi-registry-core/nifi-registry-web-ui/src/test/java/org/apache/nifi/registry/ui/ITCreateBucket.java
index 5768748..31d7315 100644
--- 
a/nifi-registry-core/nifi-registry-web-ui/src/test/java/org/apache/nifi/registry/ui/ITCreateBucket.java
+++ 
b/nifi-registry-core/nifi-registry-web-ui/src/test/java/org/apache/nifi/registry/ui/ITCreateBucket.java
@@ -55,7 +55,7 @@ public class ITCreateBucket {
 @Test
 public void testCreateBucket() throws Exception {
 // go directly to settings by URL
-driver.get(baseUrl + "/administration/workflow");
+driver.get(baseUrl + "/#/administration/workflow");
 
 // wait for administration route to load
 
wait.until(ExpectedConditions.visibilityOfElementLocated(By.cssSelector("[data-automation-id='no-buckets-message']")));
diff --git 
a/nifi-registry-core/nifi-registry-web-ui/src/test/java/org/apache/nifi/registry/ui/ITCreateBucketCancel.java
 
b/nifi-registry-core/nifi-registry-web-ui/src/test/java/org/apache/nifi/registry/ui/ITCreateBucketCancel.java
index 86d17db..f23fdf2 100644
--- 
a/nifi-registry-core/nifi-registry-web-ui/src/test/java/org/apache/nifi/registry/ui/ITCreateBucketCancel.java
+++ 
b/nifi-registry-core/nifi-registry-web-ui/src/test/java/org/apache/nifi/registry/ui/ITCreateBucketCancel.java
@@ -51,7 +51,7 @@ public class ITCreateBucketCancel {
 @Test
 public void testCreateBucketCancel() throws Exception {
 // go directly to settings by URL
-driver.get(baseUrl + "/administration/workflow");
+driver.get(baseUrl + "/#/administration/workflow");
 
 // wait for administration route to load
 
wait.until(ExpectedConditions.visibilityOfElementLocated(By.cssSelector("[data-automation-id='no-buckets-message']")));
diff --git 
a/nifi-registry-core/nifi-registry-web-ui/src/test/java/org/apache/nifi/registry/ui/ITCreateDuplicateBucket.java
 
b/nifi-registry-core/nifi-registry-web-ui/src/test/java/org/apache/nifi/registry/ui/ITCreateDuplicateBucket.java
index 301519a..79de5ae 100644
--- 
a/nifi-registry-core/nifi-registry-web-ui/src/test/java/org/apache/nifi/registry/ui/ITCreateDuplicateBucket.java
+++ 
b/nifi-registry-core/nifi-registry-web-ui/src/test/java/org/apache/nifi/registry/ui/ITCreateDuplicateBucket.java
@@ -56,7 +56,7 @@ public class ITCreateDuplicateBucket {
 @Test
 public void testCreateDuplicateBucket() throws Exception {
 // go directly to settings by URL
-driver.get(baseUrl + "/administration/workflow");
+driver.get(baseUrl + "/#/administration/workflow");
 
 // wait for administration route to load
 
wait.until(ExpectedConditions.visibilityOfElementLocated(By.cssSelector("[data-automation-id='no-buckets-message']")));
diff --git 
a/nifi-registry-core/nifi-registry-web-ui/src/test/java/org/apache/nifi/registry/ui/ITCreateMultipleBuckets.java
 
b/nifi-registry-core/nifi-registry-web-ui/src/test/java/org/apache/nifi/registry/ui/ITCreateMultipleBuckets.java
index 54f54aa..c9011ab 100644
--- 
a/nifi-registry-core/nifi-registry-web-ui/src/test/java/org/apache/nifi/registry/ui/ITCreateMultipleBuckets.java
+++ 
b/nifi-registry-core/nifi-registry-web-ui/src/test/java/org/apache/nifi/registry/ui/ITCreateMultipleBuckets.java
@@ -55,7 +55,7 @@ public class ITCreateMultipleBuckets {
 @Test
 public void testCreateMultipleBuckets() throws Exception {
 // go directly to settings by URL
-driver.get(baseUrl + "/administration/workflow");
+driver.get(baseUrl + &qu

[nifi-registry] branch main updated: NIFIREG-349 Add nifi.registry.bootstrap.sensitive.key to Bootstrap Properties section in Admin Guide

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/main by this push:
 new 6793ab8  NIFIREG-349 Add nifi.registry.bootstrap.sensitive.key to 
Bootstrap Properties section in Admin Guide
6793ab8 is described below

commit 6793ab81858d081e5543d83538a3b6ffbb84502e
Author: Andrew Lim 
AuthorDate: Thu Oct 22 11:33:03 2020 -0400

NIFIREG-349 Add nifi.registry.bootstrap.sensitive.key to Bootstrap 
Properties section in Admin Guide
---
 .../nifi-registry-docs/src/main/asciidoc/administration-guide.adoc | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
 
b/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
index 1941646..2510058 100644
--- 
a/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
+++ 
b/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
@@ -865,6 +865,9 @@ Here, we will address the different properties that are 
made available in the fi
 |`conf.dir`|The `conf` directory to use for NiFi Registry. By default, this is 
set to `./conf`
 |`graceful.shutdown.seconds`|When NiFi Registry is instructed to shutdown, the 
Bootstrap will wait this number of seconds for the process to shutdown cleanly. 
At this amount of time, if the service is still running, the Bootstrap will 
`kill` the process, or terminate it abruptly. By default, this is set to `20`.
 |`java.arg.N`|Any number of JVM arguments can be passed to the NiFi Registry 
JVM when the process is started. These arguments are defined by adding 
properties to _bootstrap.conf_ that begin with `java.arg.`. The rest of the 
property name is not relevant, other than to different property names, and will 
be ignored. The default includes properties for minimum and maximum Java Heap 
size, the garbage collector to use, etc.
+|`nifi.registry.bootstrap.sensitive.key`|The root key (in hexadecimal format) 
for encrypted sensitive configuration values. When NiFi Registry is started, 
this root key is used to decrypt sensitive values from the 
_nifi-registry.properties_ file into memory for later use.
+
+The <> can be used to specify the root key, encrypt 
sensitive values in _nifi-registry.properties_ and update _bootstrap.conf_.
 |
 
 

[nifi-registry] branch main updated (3956e2a -> 146965d)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git.


from 3956e2a  NIFIREG-346 Upgrade JGit to latest 5.x version, and upgrade 
Bouncy Castle to be compatible with latest JGit
 add 146965d  NIFIREG-418 - disable Travis build and update README file

No new revisions were added by this update.

Summary of changes:
 .travis-output-filters | 15 
 .travis.yml| 95 --
 README.md  | 10 --
 3 files changed, 7 insertions(+), 113 deletions(-)
 delete mode 100644 .travis-output-filters
 delete mode 100644 .travis.yml

[nifi-registry] branch main updated (3956e2a -> 146965d)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git.


from 3956e2a  NIFIREG-346 Upgrade JGit to latest 5.x version, and upgrade 
Bouncy Castle to be compatible with latest JGit
 add 146965d  NIFIREG-418 - disable Travis build and update README file

No new revisions were added by this update.

Summary of changes:
 .travis-output-filters | 15 
 .travis.yml| 95 --
 README.md  | 10 --
 3 files changed, 7 insertions(+), 113 deletions(-)
 delete mode 100644 .travis-output-filters
 delete mode 100644 .travis.yml

[nifi-registry] branch main updated: NIFIREG-411 Refactor nifi-registry-client to support other authN mechanisms

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/main by this push:
 new 2ec4f5e  NIFIREG-411 Refactor nifi-registry-client to support other 
authN mechanisms
2ec4f5e is described below

commit 2ec4f5e126c4217a0945c2494ebdab4f91f2a194
Author: Bryan Bende 
AuthorDate: Thu Aug 6 16:56:23 2020 -0400

NIFIREG-411 Refactor nifi-registry-client to support other authN mechanisms

NIFIREG-411 Update CertificateUtils with changes from NiFi and add protocol 
to NiFiRegistryClientConfig

This closes #293.

Signed-off-by: Kevin Doran 
---
 .../apache/nifi/registry/client/AccessClient.java  |  59 +
 .../nifi/registry/client/NiFiRegistryClient.java   |  84 ++
 .../registry/client/NiFiRegistryClientConfig.java  |  17 +-
 .../apache/nifi/registry/client/RequestConfig.java |  32 +++
 .../client/impl/AbstractCRUDJerseyClient.java  |   6 +-
 .../registry/client/impl/AbstractJerseyClient.java |  18 +-
 .../registry/client/impl/JerseyAccessClient.java   |  92 +++
 .../registry/client/impl/JerseyBucketClient.java   |   8 +-
 .../registry/client/impl/JerseyBundleClient.java   |   8 +-
 .../client/impl/JerseyBundleVersionClient.java |  10 +-
 .../client/impl/JerseyExtensionClient.java |   8 +-
 .../client/impl/JerseyExtensionRepoClient.java |   8 +-
 .../registry/client/impl/JerseyFlowClient.java |   8 +-
 .../client/impl/JerseyFlowSnapshotClient.java  |   8 +-
 .../registry/client/impl/JerseyItemsClient.java|   8 +-
 .../client/impl/JerseyNiFiRegistryClient.java  | 138 ++
 .../registry/client/impl/JerseyPoliciesClient.java |   9 +-
 .../registry/client/impl/JerseyTenantsClient.java  |   9 +-
 .../registry/client/impl/JerseyUserClient.java |  11 +-
 .../impl/request/BasicAuthRequestConfig.java   |  55 
 .../impl/request/BearerTokenRequestConfig.java |  45 
 .../impl/request/ProxiedEntityRequestConfig.java   |  62 +
 .../impl/request/TestBasicAuthRequestConfig.java   |  48 
 .../impl/request/TestBearerTokenRequestConfig.java |  43 +++
 .../request/TestProxiedEntityRequestConfig.java|  62 +
 .../registry/security/util/CertificateUtils.java   | 291 +++--
 .../apache/nifi/registry/web/api/SecureLdapIT.java |  62 -
 .../web/api/SecureNiFiRegistryClientIT.java|  13 +-
 28 files changed, 967 insertions(+), 255 deletions(-)

diff --git 
a/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/AccessClient.java
 
b/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/AccessClient.java
new file mode 100644
index 000..23cbcbc
--- /dev/null
+++ 
b/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/AccessClient.java
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+package org.apache.nifi.registry.client;
+
+import java.io.IOException;
+
+/**
+ * Client for interacting with the AccessResource.
+ */
+public interface AccessClient {
+
+/**
+ * Get an access token by authenticating with a username and password 
aginst the configured identity provider.
+ *
+ * @param username the username
+ * @param password the password
+ * @return the access token
+ *
+ * @throws IOException if an I/O error occurs
+ * @throws NiFiRegistryException if an non I/O error occurs
+ */
+String getToken(String username, String password) throws 
NiFiRegistryException, IOException;
+
+/**
+ * Gets an access token via spnego. It is expected that the caller of this 
method has wrapped the call
+ * in a {@code doAs()} using a {@link javax.security.auth.Subject}.
+ *
+ * @return the token
+ *
+ * @throws IOException if an I/O error occurs
+ * @throws NiFiRegistryException if an non I/O error occurs
+ */
+String getTokenFromKerberosTicket() throws NiFiRegistryException, 
IOException;
+
+/**
+ * Performs a logout for the user represented by the given token.
+ *

[nifi-site] branch main updated: NIFI-7692: Update Release Guide to include docker-compose.yml

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-site.git


The following commit(s) were added to refs/heads/main by this push:
 new c1e331a  NIFI-7692: Update Release Guide to include docker-compose.yml
c1e331a is described below

commit c1e331a7e65fdf0d0aec22c677b7508d3763a1de
Author: Kevin Doran 
AuthorDate: Tue Sep 1 13:59:13 2020 -0400

NIFI-7692: Update Release Guide to include docker-compose.yml

This closes #41.

Signed-off-by: Kevin Doran 
---
 src/pages/markdown/release-guide.md | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/pages/markdown/release-guide.md 
b/src/pages/markdown/release-guide.md
index 97b15ac..d6b203b 100644
--- a/src/pages/markdown/release-guide.md
+++ b/src/pages/markdown/release-guide.md
@@ -202,9 +202,10 @@ problems that must be addressed before proceeding.
 ```
 $ mvn install -Pcontrib-check,include-grpc
 ```
-1. Verify and update if necessary to ensure Docker version information points 
to the next release version.  For instance, if version being released is 1.9.0, 
these values should be 1.9.0. This currently consists of two files:
-* [nifi-docker/dockerhub/Dockerfile, Line 25][dockerhub-version], and
-* [nifi-docker/dockerhub/DockerImage.txt, Line 16][dockerimage-version].
+1. Verify and update if necessary to ensure Docker version information points 
to the next release version.  For instance, if version being released is 1.9.0, 
these values should be 1.9.0. This currently consists of three files:
+* [nifi-docker/dockerhub/Dockerfile, Line 25][dockerhub-version],
+* [nifi-docker/dockerhub/DockerImage.txt, Line 16][dockerimage-version] and
+* [nifi-docker/docker-compose/docker-compose.yml, Line 
25][dockercompose-version].
 ### Step 3. Perform the release (RM)
 
 1. Now its time to have maven prepare the release with this command.  
@@ -404,9 +405,10 @@ After the vote is complete and the release is approved, 
these steps complete the
 $ git push asf main
 ```
 
-1. Update Docker version information to point to the next release.  For 
instance, if the next version applied by Maven is 1.3.0-SNAPSHOT, these values 
should be updated to 1.3.0. This currently consists of two files:
-* [nifi-docker/dockerhub/Dockerfile, Line 25][dockerhub-version], and
-* [nifi-docker/dockerhub/DockerImage.txt, Line 16][dockerimage-version].
+1. Update Docker version information to point to the next release.  For 
instance, if the next version applied by Maven is 1.3.0-SNAPSHOT, these values 
should be updated to 1.3.0. This currently consists of three files:
+* [nifi-docker/dockerhub/Dockerfile, Line 25][dockerhub-version],
+* [nifi-docker/dockerhub/DockerImage.txt, Line 16][dockerimage-version] and
+* [nifi-docker/docker-compose/docker-compose.yml, Line 
25][dockercompose-version].
 
 1. Commit and push the dockerhub module updates to the ASF repository:
 ```
@@ -522,6 +524,7 @@ _NOTE: `gpg` will be invoked during this step, which will 
need to prompt you for
 
 [dockerhub-version]: 
https://github.com/apache/nifi/blob/main/nifi-docker/dockerhub/Dockerfile#L24
 [dockerimage-version]: 
https://github.com/apache/nifi/blob/main/nifi-docker/dockerhub/DockerImage.txt#L16
+[dockercompose-version]: 
https://github.com/apache/nifi/blob/main/nifi-docker/docker-compose/docker-compose.yml#L25
 [docker-build]: https://hub.docker.com/r/apache/nifi
 [docker-build-status]: https://hub.docker.com/r/apache/nifi/builds/
 

[nifi-registry] branch main updated: NIFIREG-410 Add integration tests that cover the new Database UserGroupProvider and AccessPolicyProvider

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/main by this push:
 new 85a3243  NIFIREG-410 Add integration tests that cover the new Database 
UserGroupProvider and AccessPolicyProvider
85a3243 is described below

commit 85a3243ca0cfa3244d8852a636fd667715e7412d
Author: Bryan Bende 
AuthorDate: Mon Aug 10 11:19:10 2020 -0400

NIFIREG-410 Add integration tests that cover the new Database 
UserGroupProvider and AccessPolicyProvider

This closes #294.

Signed-off-by: Kevin Doran 
---
 .../nifi/registry/web/api/SecureDatabaseIT.java| 238 +
 .../application-ITSecureDatabase.properties|  36 
 .../resources/conf/secure-database/authorizers.xml |  80 +++
 .../nifi-registry-client.properties|  25 +++
 .../conf/secure-database/nifi-registry.properties  |  33 +++
 .../src/test/resources/db/clearDB.sql  |   2 +
 6 files changed, 414 insertions(+)

diff --git 
a/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/api/SecureDatabaseIT.java
 
b/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/api/SecureDatabaseIT.java
new file mode 100644
index 000..3b7ce60
--- /dev/null
+++ 
b/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/api/SecureDatabaseIT.java
@@ -0,0 +1,238 @@
+/*
+ * 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.
+ */
+package org.apache.nifi.registry.web.api;
+
+import org.apache.nifi.registry.NiFiRegistryTestApiApplication;
+import org.apache.nifi.registry.authorization.AccessPolicy;
+import org.apache.nifi.registry.authorization.User;
+import org.apache.nifi.registry.authorization.UserGroup;
+import org.apache.nifi.registry.bucket.Bucket;
+import org.apache.nifi.registry.client.BucketClient;
+import org.apache.nifi.registry.client.NiFiRegistryClient;
+import org.apache.nifi.registry.client.NiFiRegistryClientConfig;
+import org.apache.nifi.registry.client.PoliciesClient;
+import org.apache.nifi.registry.client.TenantsClient;
+import org.apache.nifi.registry.client.impl.JerseyNiFiRegistryClient;
+import org.apache.nifi.registry.revision.entity.RevisionInfo;
+import org.apache.nifi.registry.security.authorization.RequestAction;
+import 
org.apache.nifi.registry.security.authorization.resource.ResourceFactory;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.jdbc.Sql;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(
+classes = NiFiRegistryTestApiApplication.class,
+webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+properties = "spring.profiles.include=ITSecureDatabase")
+@Import(SecureITClientConfiguration.class)
+@Sql(executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD, scripts = 
{"classpath:db/clearDB.sql"})
+public class SecureDatabaseIT extends IntegrationTestBase {
+
+private static final Logger LOGGER = 
LoggerFactory.getLogger(SecureDatabaseIT.class);
+
+private static final String INITIAL_ADMIN_IDENTITY = "CN=user1, OU=nifi";
+private static final String OTHER_USER_IDENTITY = "CN=user2, OU=nifi";
+
+private NiFiRegistryClient client;
+
+@Before
+public void setup() {
+final String baseUrl = createBaseURL();
+LOGGER.info("Using base url = " + baseUrl);
+
+final NiFiRegistryClientConfig clientConfig = 
createClientConfig(baseUrl);
+Assert.assertN

[nifi-registry] branch main updated: NIFIREG-410 Add integration tests that cover the new Database UserGroupProvider and AccessPolicyProvider

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/main by this push:
 new 85a3243  NIFIREG-410 Add integration tests that cover the new Database 
UserGroupProvider and AccessPolicyProvider
85a3243 is described below

commit 85a3243ca0cfa3244d8852a636fd667715e7412d
Author: Bryan Bende 
AuthorDate: Mon Aug 10 11:19:10 2020 -0400

NIFIREG-410 Add integration tests that cover the new Database 
UserGroupProvider and AccessPolicyProvider

This closes #294.

Signed-off-by: Kevin Doran 
---
 .../nifi/registry/web/api/SecureDatabaseIT.java| 238 +
 .../application-ITSecureDatabase.properties|  36 
 .../resources/conf/secure-database/authorizers.xml |  80 +++
 .../nifi-registry-client.properties|  25 +++
 .../conf/secure-database/nifi-registry.properties  |  33 +++
 .../src/test/resources/db/clearDB.sql  |   2 +
 6 files changed, 414 insertions(+)

diff --git 
a/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/api/SecureDatabaseIT.java
 
b/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/api/SecureDatabaseIT.java
new file mode 100644
index 000..3b7ce60
--- /dev/null
+++ 
b/nifi-registry-core/nifi-registry-web-api/src/test/java/org/apache/nifi/registry/web/api/SecureDatabaseIT.java
@@ -0,0 +1,238 @@
+/*
+ * 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.
+ */
+package org.apache.nifi.registry.web.api;
+
+import org.apache.nifi.registry.NiFiRegistryTestApiApplication;
+import org.apache.nifi.registry.authorization.AccessPolicy;
+import org.apache.nifi.registry.authorization.User;
+import org.apache.nifi.registry.authorization.UserGroup;
+import org.apache.nifi.registry.bucket.Bucket;
+import org.apache.nifi.registry.client.BucketClient;
+import org.apache.nifi.registry.client.NiFiRegistryClient;
+import org.apache.nifi.registry.client.NiFiRegistryClientConfig;
+import org.apache.nifi.registry.client.PoliciesClient;
+import org.apache.nifi.registry.client.TenantsClient;
+import org.apache.nifi.registry.client.impl.JerseyNiFiRegistryClient;
+import org.apache.nifi.registry.revision.entity.RevisionInfo;
+import org.apache.nifi.registry.security.authorization.RequestAction;
+import 
org.apache.nifi.registry.security.authorization.resource.ResourceFactory;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.jdbc.Sql;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(
+classes = NiFiRegistryTestApiApplication.class,
+webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+properties = "spring.profiles.include=ITSecureDatabase")
+@Import(SecureITClientConfiguration.class)
+@Sql(executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD, scripts = 
{"classpath:db/clearDB.sql"})
+public class SecureDatabaseIT extends IntegrationTestBase {
+
+private static final Logger LOGGER = 
LoggerFactory.getLogger(SecureDatabaseIT.class);
+
+private static final String INITIAL_ADMIN_IDENTITY = "CN=user1, OU=nifi";
+private static final String OTHER_USER_IDENTITY = "CN=user2, OU=nifi";
+
+private NiFiRegistryClient client;
+
+@Before
+public void setup() {
+final String baseUrl = createBaseURL();
+LOGGER.info("Using base url = " + baseUrl);
+
+final NiFiRegistryClientConfig clientConfig = 
createClientConfig(baseUrl);
+Assert.assertN

[nifi-registry] branch main updated: NIFIREG-408 Initial commit adding TenantsClient and PoliciesClient

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/main by this push:
 new 4dde23b  NIFIREG-408 Initial commit adding TenantsClient and 
PoliciesClient
4dde23b is described below

commit 4dde23b664fe2595723a90c32632cfe8e285dda8
Author: Bryan Bende 
AuthorDate: Mon Jul 27 13:42:22 2020 -0400

NIFIREG-408 Initial commit adding TenantsClient and PoliciesClient

NIFIREG-408 Separate tenants IT into separate tests for users and groups

This closes #292.

Signed-off-by: Kevin Doran 
---
 .../nifi/registry/client/NiFiRegistryClient.java   |  54 +++
 .../nifi/registry/client/PoliciesClient.java   |  62 
 .../apache/nifi/registry/client/TenantsClient.java | 166 +
 .../client/impl/AbstractCRUDJerseyClient.java  | 111 ++
 .../client/impl/JerseyNiFiRegistryClient.java  |  24 +++
 .../registry/client/impl/JerseyPoliciesClient.java |  65 
 .../registry/client/impl/JerseyTenantsClient.java  | 113 ++
 .../web/api/SecureNiFiRegistryClientIT.java| 149 ++
 8 files changed, 712 insertions(+), 32 deletions(-)

diff --git 
a/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/NiFiRegistryClient.java
 
b/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/NiFiRegistryClient.java
index e141136..a7497a1 100644
--- 
a/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/NiFiRegistryClient.java
+++ 
b/nifi-registry-core/nifi-registry-client/src/main/java/org/apache/nifi/registry/client/NiFiRegistryClient.java
@@ -33,6 +33,8 @@ public interface NiFiRegistryClient extends Closeable {
  */
 BucketClient getBucketClient(String ... proxiedEntity);
 
+
//---
+
 /**
  * @return the client for interacting with flows
  */
@@ -43,6 +45,8 @@ public interface NiFiRegistryClient extends Closeable {
  */
 FlowClient getFlowClient(String ... proxiedEntity);
 
+
//---
+
 /**
  * @return the client for interacting with flows/snapshots
  */
@@ -53,6 +57,8 @@ public interface NiFiRegistryClient extends Closeable {
  */
 FlowSnapshotClient getFlowSnapshotClient(String ... proxiedEntity);
 
+
//---
+
 /**
  * @return the client for interacting with bucket items
  */
@@ -63,6 +69,8 @@ public interface NiFiRegistryClient extends Closeable {
  */
 ItemsClient getItemsClient(String ... proxiedEntity);
 
+
//---
+
 /**
  * @return the client for obtaining information about the current user
  */
@@ -73,6 +81,8 @@ public interface NiFiRegistryClient extends Closeable {
  */
 UserClient getUserClient(String ... proxiedEntity);
 
+
//---
+
 /**
  * @return the client for interacting with extension bundles
  */
@@ -83,6 +93,8 @@ public interface NiFiRegistryClient extends Closeable {
  */
 BundleClient getBundleClient(String ... proxiedEntity);
 
+
//---
+
 /**
  * @return the client for interacting with extension bundle versions
  */
@@ -93,6 +105,8 @@ public interface NiFiRegistryClient extends Closeable {
  */
 BundleVersionClient getBundleVersionClient(String ... proxiedEntity);
 
+
//---
+
 /**
  * @return the client for interacting with the extension repository
  */
@@ -103,6 +117,8 @@ public interface NiFiRegistryClient extends Closeable {
  */
 ExtensionRepoClient getExtensionRepoClient(String ... proxiedEntity);
 
+
//---
+
 /**
  * @return the client for interacting with extensions
  */
@@ -113,6 +129,44 @@ public interface NiFiRegistryClient extends Closeable {
  */
 ExtensionClient getExtensionClient(String ... proxiedEntity);
 
+
//---
+
+/**
+ * Returns client for interacting with tenants.
+ *
+ * @return the client for interacting with tenants
+ */
+TenantsClient getTenantsClient();
+
+/**
+ * Returns client for interacting with tenants

[nifi-registry] branch main updated: NIFIREG-409 Refactoring revision management

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/main by this push:
 new f1757f5  NIFIREG-409 Refactoring revision management
f1757f5 is described below

commit f1757f5ece14ca140f3526164e7ae03cf6c218b1
Author: Bryan Bende 
AuthorDate: Tue Aug 4 13:14:12 2020 -0400

NIFIREG-409 Refactoring revision management

Make RevisionManager responsible for incrementing revisions rather than 
caller.
This creates consistency between the naive and JDBC implementations.

This closes #291.

Signed-off-by: Kevin Doran 
---
 .../{UpdateRevisionTask.java => UpdateResult.java} | 22 +---
 .../registry/revision/api/UpdateRevisionTask.java  |  8 +--
 .../revision/naive/NaiveRevisionManager.java   | 42 +++
 .../revision/standard/StandardUpdateResult.java| 59 ++
 .../entity/StandardRevisableEntityService.java | 50 +++---
 .../revision/jdbc/JdbcRevisionManager.java | 26 --
 .../revision/jdbc/TestJdbcRevisionManager.java | 24 -
 7 files changed, 161 insertions(+), 70 deletions(-)

diff --git 
a/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-api/src/main/java/org/apache/nifi/registry/revision/api/UpdateRevisionTask.java
 
b/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-api/src/main/java/org/apache/nifi/registry/revision/api/UpdateResult.java
similarity index 76%
copy from 
nifi-registry-core/nifi-registry-revision/nifi-registry-revision-api/src/main/java/org/apache/nifi/registry/revision/api/UpdateRevisionTask.java
copy to 
nifi-registry-core/nifi-registry-revision/nifi-registry-revision-api/src/main/java/org/apache/nifi/registry/revision/api/UpdateResult.java
index 3db8f9f..4181460 100644
--- 
a/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-api/src/main/java/org/apache/nifi/registry/revision/api/UpdateRevisionTask.java
+++ 
b/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-api/src/main/java/org/apache/nifi/registry/revision/api/UpdateResult.java
@@ -18,17 +18,27 @@ package org.apache.nifi.registry.revision.api;
 
 /**
  * 
- * A task that is responsible for updating some entities.
+ * The result of an update task.
  * 
  *
  * NOTE: This API is considered a framework level API for the NiFi ecosystem 
and may evolve as
  * the NiFi PMC and committers deem necessary. It is not considered a public 
extension point.
  */
-public interface UpdateRevisionTask {
+public interface UpdateResult {
+
+/**
+ * @return the entity that was updated
+ */
+T getEntity();
+
 /**
- * Updates one or more entities and returns updated Revisions for those 
entities.
- *
- * @return the updated revisions for the entities
+ * @return the id of the entity that was updated
  */
-RevisionUpdate update();
+String getEntityId();
+
+/**
+ * @return the identity of the user that updated the entity
+ */
+String updaterIdentity();
+
 }
diff --git 
a/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-api/src/main/java/org/apache/nifi/registry/revision/api/UpdateRevisionTask.java
 
b/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-api/src/main/java/org/apache/nifi/registry/revision/api/UpdateRevisionTask.java
index 3db8f9f..c9d5748 100644
--- 
a/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-api/src/main/java/org/apache/nifi/registry/revision/api/UpdateRevisionTask.java
+++ 
b/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-api/src/main/java/org/apache/nifi/registry/revision/api/UpdateRevisionTask.java
@@ -18,7 +18,7 @@ package org.apache.nifi.registry.revision.api;
 
 /**
  * 
- * A task that is responsible for updating some entities.
+ * A task that is responsible for updating an entity.
  * 
  *
  * NOTE: This API is considered a framework level API for the NiFi ecosystem 
and may evolve as
@@ -26,9 +26,9 @@ package org.apache.nifi.registry.revision.api;
  */
 public interface UpdateRevisionTask {
 /**
- * Updates one or more entities and returns updated Revisions for those 
entities.
+ * Updates an entity and returns the resulting entity.
  *
- * @return the updated revisions for the entities
+ * @return the update result containing the updated entity
  */
-RevisionUpdate update();
+UpdateResult update();
 }
diff --git 
a/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-common/src/main/java/org/apache/nifi/registry/revision/naive/NaiveRevisionManager.java
 
b/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-common/src/main/java/org/apache/nifi/registry/revision/naive/NaiveRevisionManager.java
index 0d161cd..641a360 100644
--- 
a/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-com

[nifi] branch main updated: NIFI-7332 Added method to log available claim names from the ID provider response when the OIDC Identifying User claim is not found. Revised log message to print available

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
 new 43fb57e  NIFI-7332 Added method to log available claim names from the 
ID provider response when the OIDC Identifying User claim is not found. Revised 
log message to print available claims. Added new 
StandardOidcIdentityProviderGroovyTest file. Updated deprecated methods in 
StandardOidcIdentityProvider. Changed log output to print all available claim 
names from JWTClaimsSet. Added unit test. Added comments in 
getAvailableClaims() method. Fixed typos in NiFi Docs Admin Guide. Added [...]
43fb57e is described below

commit 43fb57e7bb4b3a3a7714578816ab57ece63349c8
Author: mtien 
AuthorDate: Wed May 20 18:14:57 2020 -0700

NIFI-7332 Added method to log available claim names from the ID provider 
response when the OIDC Identifying User claim is not found. Revised log message 
to print available claims.
Added new StandardOidcIdentityProviderGroovyTest file.
Updated deprecated methods in StandardOidcIdentityProvider. Changed log 
output to print all available claim names from JWTClaimsSet. Added unit test.
Added comments in getAvailableClaims() method.
Fixed typos in NiFi Docs Admin Guide.
Added license to Groovy test.
Fixed a checkstyle error.
Refactor exchangeAuthorizationCode method.
Added unit tests.
Verified all unit tests added so far are passing.
Refactored code. Added unit tests.
Refactored OIDC provider to decouple constructor & network-dependent 
initialization.
Added unit tests.
Added unit tests.
Refactored OIDC provider to separately authorize the client. Added unit 
tests.
Added unit tests.

NIFI-7332 Refactored exchangeAuthorizationCode method to separately 
retrieve the NiFi JWT.

Signed-off-by: Nathan Gough 

This closes #4344.
---
 .../src/main/asciidoc/administration-guide.adoc|   5 +-
 .../web/security/oidc/OidcIdentityProvider.java|   6 +-
 .../apache/nifi/web/security/oidc/OidcService.java |  17 +-
 .../oidc/StandardOidcIdentityProvider.java | 391 --
 .../StandardOidcIdentityProviderGroovyTest.groovy  | 584 +
 5 files changed, 847 insertions(+), 156 deletions(-)

diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc 
b/nifi-docs/src/main/asciidoc/administration-guide.adoc
index b2653d2..90daf3a 100644
--- a/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -367,10 +367,9 @@ To enable authentication via OpenId Connect the following 
properties must be con
 |`nifi.security.user.oidc.read.timeout` | Read timeout when communicating with 
the OpenId Connect Provider.
 |`nifi.security.user.oidc.client.id` | The client id for NiFi after 
registration with the OpenId Connect Provider.
 |`nifi.security.user.oidc.client.secret` | The client secret for NiFi after 
registration with the OpenId Connect Provider.
-|`nifi.security.user.oidc.preferred.jwsalgorithm` | The preferred algorithm 
for for validating identity tokens. If this value is blank, it will default to 
`RS256` which is required to be supported
+|`nifi.security.user.oidc.preferred.jwsalgorithm` | The preferred algorithm 
for validating identity tokens. If this value is blank, it will default to 
`RS256` which is required to be supported
 |`nifi.security.user.oidc.additional.scopes` | Comma separated scopes that are 
sent to OpenId Connect Provider in addition to `openid` and `email`.
-|`nifi.security.user.oidc.claim.identifying.user` | Claim that identifies the 
user to be logged in; default is `email`. May need to be requested via the 
`nifi.security.user.oidc.additional.scopes` before usage.
-by the OpenId Connect Provider according to the specification. If this value 
is `HS256`, `HS384`, or `HS512`, NiFi will attempt to validate HMAC protected 
tokens using the specified client secret.
+|`nifi.security.user.oidc.claim.identifying.user` | Claim that identifies the 
user to be logged in; default is `email`. May need to be requested via the 
`nifi.security.user.oidc.additional.scopes` before usage by the OpenId Connect 
Provider according to the specification. If this value is `HS256`, `HS384`, or 
`HS512`, NiFi will attempt to validate HMAC protected tokens using the 
specified client secret.
 If this value is `none`, NiFi will attempt to validate unsecured/plain tokens. 
Other values for this algorithm will attempt to parse as an RSA or EC algorithm 
to be used in conjunction with the
 JSON Web Key (JWK) provided through the jwks_uri in the metadata found at the 
discovery URL.
 
|==
diff --git 
a/nifi-nar-bundles/nifi-framework-bu

[nifi-registry] branch master updated: NIFIREG-370 Ensuring update retrieves the latest revision from RevisionManager

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/master by this push:
 new fbf1744  NIFIREG-370 Ensuring update retrieves the latest revision 
from RevisionManager
fbf1744 is described below

commit fbf17445852f1bbfd498134cdb719f610138625e
Author: Bryan Bende 
AuthorDate: Wed Mar 11 15:51:21 2020 -0400

NIFIREG-370 Ensuring update retrieves the latest revision from 
RevisionManager

This closes #266.

Signed-off-by: Kevin Doran 
---
 .../entity/StandardRevisableEntityService.java | 53 +-
 .../entity/TestStandardRevisableEntityService.java | 28 
 2 files changed, 60 insertions(+), 21 deletions(-)

diff --git 
a/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-entity-service/src/main/java/org/apache/nifi/registry/revision/entity/StandardRevisableEntityService.java
 
b/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-entity-service/src/main/java/org/apache/nifi/registry/revision/entity/StandardRevisableEntityService.java
index 541f31f..fa3d4f5 100644
--- 
a/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-entity-service/src/main/java/org/apache/nifi/registry/revision/entity/StandardRevisableEntityService.java
+++ 
b/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-entity-service/src/main/java/org/apache/nifi/registry/revision/entity/StandardRevisableEntityService.java
@@ -58,7 +58,22 @@ public class StandardRevisableEntityService implements 
RevisableEntityService {
 throw new IllegalArgumentException("Creator identity is required");
 }
 
-return createOrUpdate(requestEntity, creatorIdentity, createEntity);
+final Revision revision = 
createRevision(requestEntity.getIdentifier(), requestEntity.getRevision());
+final RevisionClaim claim = new StandardRevisionClaim(revision);
+
+final RevisionUpdate revisionUpdate = 
revisionManager.updateRevision(claim, () -> {
+final T updatedEntity = createEntity.get();
+
+final Revision updatedRevision = 
revision.incrementRevision(revision.getClientId());
+final EntityModification entityModification = new 
EntityModification(updatedRevision, creatorIdentity);
+
+final RevisionInfo updatedRevisionInfo = 
createRevisionInfo(updatedRevision, entityModification);
+updatedEntity.setRevision(updatedRevisionInfo);
+
+return new StandardRevisionUpdate<>(updatedEntity, 
entityModification);
+});
+
+return revisionUpdate.getEntity();
 }
 
 @Override
@@ -91,7 +106,22 @@ public class StandardRevisableEntityService implements 
RevisableEntityService {
 throw new IllegalArgumentException("Updater identity is required");
 }
 
-return createOrUpdate(requestEntity, updaterIdentity, updateEntity);
+final Revision revision = 
createRevision(requestEntity.getIdentifier(), requestEntity.getRevision());
+final RevisionClaim claim = new StandardRevisionClaim(revision);
+
+final RevisionUpdate revisionUpdate = 
revisionManager.updateRevision(claim, () -> {
+final T updatedEntity = updateEntity.get();
+
+final Revision updatedRevision = 
revisionManager.getRevision(requestEntity.getIdentifier()).incrementRevision(revision.getClientId());
+final EntityModification entityModification = new 
EntityModification(updatedRevision, updaterIdentity);
+
+final RevisionInfo updatedRevisionInfo = 
createRevisionInfo(updatedRevision, entityModification);
+updatedEntity.setRevision(updatedRevisionInfo);
+
+return new StandardRevisionUpdate<>(updatedEntity, 
entityModification);
+});
+
+return revisionUpdate.getEntity();
 }
 
 @Override
@@ -127,25 +157,6 @@ public class StandardRevisableEntityService implements 
RevisableEntityService {
 }
 }
 
-private  T createOrUpdate(final T 
requestEntity, final String userIdentity, final Supplier 
updateOrCreateEntity) {
-final Revision revision = 
createRevision(requestEntity.getIdentifier(), requestEntity.getRevision());
-final RevisionClaim claim = new StandardRevisionClaim(revision);
-
-final RevisionUpdate revisionUpdate = 
revisionManager.updateRevision(claim, () -> {
-final T updatedEntity = updateOrCreateEntity.get();
-
-final Revision updatedRevision = 
revision.incrementRevision(revision.getClientId());
-final EntityModification entityModification = new 
EntityModification(updatedRevision, userIdentity);
-
-final RevisionInfo updatedRevisionInfo = 
createRevisionInfo(updatedRevision, entityModification);
-updatedEntity.setRevision(up

[nifi] branch master updated: NIFI-7191 Conditionally disable docker integration tests

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
 new cca54f7  NIFI-7191 Conditionally disable docker integration tests
cca54f7 is described below

commit cca54f7ff22709debe9f3b3b9b97eee92e1e0193
Author: Kevin Doran 
AuthorDate: Mon Feb 24 13:51:17 2020 -0500

NIFI-7191 Conditionally disable docker integration tests

Honor Maven properties skipTests and maven.test.skip for the
shell script integration tests that verifiy docker images.
---
 nifi-docker/dockerhub/pom.xml  | 45 +
 nifi-docker/dockermaven/pom.xml| 45 +
 nifi-toolkit/nifi-toolkit-assembly/pom.xml | 53 ++
 3 files changed, 143 insertions(+)

diff --git a/nifi-docker/dockerhub/pom.xml b/nifi-docker/dockerhub/pom.xml
index 3b41b8b..366106d 100644
--- a/nifi-docker/dockerhub/pom.xml
+++ b/nifi-docker/dockerhub/pom.xml
@@ -71,6 +71,51 @@
 
 
 
+
+docker-skip-tests
+
+
+skipTests
+
+
+
+
+
+exec-maven-plugin
+org.codehaus.mojo
+
+
+Docker integration tests
+none
+
+
+
+
+
+
+
+docker-test-skip-test
+
+
+maven.test.skip
+true
+
+
+
+
+
+exec-maven-plugin
+org.codehaus.mojo
+
+
+Docker integration tests
+none
+
+
+
+
+
+
 
 
 
\ No newline at end of file
diff --git a/nifi-docker/dockermaven/pom.xml b/nifi-docker/dockermaven/pom.xml
index 2270cd9..ccb8990 100644
--- a/nifi-docker/dockermaven/pom.xml
+++ b/nifi-docker/dockermaven/pom.xml
@@ -111,6 +111,51 @@
 
 
 
+
+docker-skip-tests
+
+
+skipTests
+
+
+
+
+
+exec-maven-plugin
+org.codehaus.mojo
+
+
+Docker integration tests
+none
+
+
+
+
+
+
+
+docker-test-skip-test
+
+
+maven.test.skip
+true
+
+
+
+
+
+exec-maven-plugin
+org.codehaus.mojo
+
+
+Docker integration tests
+none
+
+
+
+
+
+
 
 
 
\ No newline at end of file
diff --git a/nifi-toolkit/nifi-toolkit-assembly/pom.xml 
b/nifi-toolkit/nifi-toolkit-assembly/pom.xml
index 530eea9..df807c9 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-assembly/pom.xml
@@ -255,5 +255,58 @@ language governing permissions and limitations under the 
License. -->
 
 
 
+
+docker-skip-tests
+
+
+skipTests
+
+
+
+
+
+exec-maven-plugin
+org.codehaus.mojo
+
+
+Docker integration tests - exit codes
+none
+
+
+Docker integration tests - tls-toolkit
+none
+
+
+
+
+
+
+
+docker-test-skip-test
+
+
+maven.test.skip
+t

[nifi-registry] branch master updated: NIFIREG-358 Refactoring proxy authorization to be part of Authorizables

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/master by this push:
 new 4825565  NIFIREG-358 Refactoring proxy authorization to be part of 
Authorizables
4825565 is described below

commit 4825565e48b935e07c3b6039b16e3144f150fa20
Author: Bryan Bende 
AuthorDate: Fri Feb 7 12:22:37 2020 -0500

NIFIREG-358 Refactoring proxy authorization to be part of Authorizables

NIFIREG-358 Catching UntrustedProxyException when asking for authorized 
resources since it would be considered unauthorized

This closes #258.

Signed-off-by: Kevin Doran 
---
 .../security/authorization/AuthorizerFactory.java  |  12 -
 .../authorization/FrameworkAuthorizer.java | 189 --
 .../authorization/FrameworkManagedAuthorizer.java  |  54 ---
 .../authorization/StandardAuthorizableLookup.java  |  78 +++-
 .../authorization/UntrustedProxyException.java |  29 ++
 .../authorization/resource/Authorizable.java   |  14 -
 .../resource/ProxyChainAuthorizable.java   | 145 
 .../resource/PublicCheckingAuthorizable.java   | 107 ++
 .../registry/service/AuthorizationService.java |   3 +-
 .../service/AuthorizationServiceSpec.groovy|   3 +-
 .../authorization/TestFrameworkAuthorizer.java | 278 --
 .../TestStandardAuthorizableLookup.java| 404 +
 .../authorization/AuthorizationRequest.java|   5 +
 .../web/mapper/UntrustedProxyExceptionMapper.java  |  48 +++
 .../ResourceAuthorizationFilterSpec.groovy |   4 +-
 15 files changed, 814 insertions(+), 559 deletions(-)

diff --git 
a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/AuthorizerFactory.java
 
b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/AuthorizerFactory.java
index 959e29e..f69ac3c 100644
--- 
a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/AuthorizerFactory.java
+++ 
b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/AuthorizerFactory.java
@@ -248,12 +248,8 @@ public class AuthorizerFactory implements 
UserGroupProviderLookup, AccessPolicyP
 try (final ExtensionCloseable extClosable = 
ExtensionCloseable.withClassLoader(authorizerClassLoader)) {
 
authorizer.onConfigured(authorizerConfigurationContext);
 }
-
-// wrap the integrity checked Authorizer with the 
FrameworkAuthorizer
-authorizer = createFrameworkAuthorizer(authorizer);
 }
 
-
 } catch (AuthorizerFactoryException e) {
 throw e;
 } catch (Exception e) {
@@ -427,14 +423,6 @@ public class AuthorizerFactory implements 
UserGroupProviderLookup, AccessPolicyP
 return instance;
 }
 
-private Authorizer createFrameworkAuthorizer(final Authorizer 
baseAuthorizer) {
-if (baseAuthorizer instanceof ManagedAuthorizer) {
-return new FrameworkManagedAuthorizer((ManagedAuthorizer) 
baseAuthorizer, registryService);
-} else {
-return new FrameworkAuthorizer(baseAuthorizer, registryService);
-}
-}
-
 private void performMethodInjection(final Object instance, final Class 
authorizerClass) throws IllegalAccessException, IllegalArgumentException, 
InvocationTargetException {
 for (final Method method : authorizerClass.getMethods()) {
 if (method.isAnnotationPresent(AuthorizerContext.class)) {
diff --git 
a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/FrameworkAuthorizer.java
 
b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/FrameworkAuthorizer.java
deleted file mode 100644
index 08fb8f0..000
--- 
a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/FrameworkAuthorizer.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * 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 d

[nifi] branch support/nifi-1.11.x updated: NIFI-7080

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch support/nifi-1.11.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.11.x by this 
push:
 new e62841f  NIFI-7080
e62841f is described below

commit e62841f6432d618ba9e07d111a9d4a7cdebde9a2
Author: Aldrin Piri 
AuthorDate: Thu Jan 30 14:46:16 2020 -0500

NIFI-7080

* Ensure script files in Docker builds are treated as executable.
* Updating git permissions to reflect executable for both secure.sh scripts.

Signed-off-by: Aldrin Piri 
Signed-off-by: Kevin Doran 

This closes #4027.

Signed-off-by: Kevin Doran 
---
 nifi-docker/dockerhub/Dockerfile | 1 +
 nifi-docker/dockerhub/sh/secure.sh   | 0
 nifi-docker/dockermaven/Dockerfile   | 1 +
 nifi-docker/dockermaven/sh/secure.sh | 0
 4 files changed, 2 insertions(+)

diff --git a/nifi-docker/dockerhub/Dockerfile b/nifi-docker/dockerhub/Dockerfile
index 60aad2c..373389a 100644
--- a/nifi-docker/dockerhub/Dockerfile
+++ b/nifi-docker/dockerhub/Dockerfile
@@ -36,6 +36,7 @@ ENV NIFI_PID_DIR=${NIFI_HOME}/run
 ENV NIFI_LOG_DIR=${NIFI_HOME}/logs
 
 ADD sh/ ${NIFI_BASE_DIR}/scripts/
+RUN chmod -R +x ${NIFI_BASE_DIR}/scripts/*.sh
 
 # Setup NiFi user and create necessary directories
 RUN groupadd -g ${GID} nifi || groupmod -n nifi `getent group ${GID} | cut -d: 
-f1` \
diff --git a/nifi-docker/dockerhub/sh/secure.sh 
b/nifi-docker/dockerhub/sh/secure.sh
old mode 100644
new mode 100755
diff --git a/nifi-docker/dockermaven/Dockerfile 
b/nifi-docker/dockermaven/Dockerfile
index cb73c74..36262e9 100644
--- a/nifi-docker/dockermaven/Dockerfile
+++ b/nifi-docker/dockermaven/Dockerfile
@@ -30,6 +30,7 @@ ENV NIFI_PID_DIR=${NIFI_HOME}/run
 ENV NIFI_LOG_DIR=${NIFI_HOME}/logs
 
 ADD sh/ ${NIFI_BASE_DIR}/scripts/
+RUN chmod -R +x ${NIFI_BASE_DIR}/scripts/*.sh
 
 COPY $NIFI_BINARY $NIFI_BASE_DIR
 RUN unzip ${NIFI_BASE_DIR}/nifi-${NIFI_VERSION}-bin.zip -d ${NIFI_BASE_DIR} \
diff --git a/nifi-docker/dockermaven/sh/secure.sh 
b/nifi-docker/dockermaven/sh/secure.sh
old mode 100644
new mode 100755

[nifi] branch master updated (08d0352 -> a6f0498)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git.


from 08d0352  NIFI-6985 Use correct versioned parameter contexts when child 
process groups are version controlled
 add a6f0498  NIFI-6830 Change code to allow empty KeyPassword.

No new revisions were added by this update.

Summary of changes:
 .../apache/nifi/io/socket/SSLContextFactory.java   |  6 +-
 .../nifi/io/socket/SSLContextFactoryTest.groovy| 24 ++
 2 files changed, 29 insertions(+), 1 deletion(-)

[nifi-registry] branch master updated: NIFIREG-252: adding mavendocker as build profile

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/master by this push:
 new 2ec22a4  NIFIREG-252: adding mavendocker as build profile
2ec22a4 is described below

commit 2ec22a4dfeb072cbb4815b3ffabef32eff586e79
Author: Endre Zoltan Kovacs 
AuthorDate: Fri Oct 18 17:49:34 2019 +0200

NIFIREG-252: adding mavendocker as build profile

skip integration test if -DskipTests is set

This closes #245.

Signed-off-by: Kevin Doran 
---
 nifi-registry-docker-maven/dockermaven/Dockerfile  |  73 +++
 .../dockermaven/integration-test.sh|  50 ++
 nifi-registry-docker-maven/dockermaven/pom.xml | 102 +
 .../dockermaven/sh/common.sh   |  28 ++
 .../dockermaven/sh/secure.sh   |  56 +++
 nifi-registry-docker-maven/dockermaven/sh/start.sh |  56 +++
 .../dockermaven/sh/update_bundle_provider.sh   |  48 ++
 .../dockermaven/sh/update_database.sh  |  24 +
 .../dockermaven/sh/update_flow_provider.sh |  44 +
 .../dockermaven/sh/update_login_providers.sh   |  47 ++
 nifi-registry-docker-maven/pom.xml |  33 +++
 pom.xml|   1 +
 12 files changed, 562 insertions(+)

diff --git a/nifi-registry-docker-maven/dockermaven/Dockerfile 
b/nifi-registry-docker-maven/dockermaven/Dockerfile
new file mode 100644
index 000..945cb80
--- /dev/null
+++ b/nifi-registry-docker-maven/dockermaven/Dockerfile
@@ -0,0 +1,73 @@
+# 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.
+#
+
+FROM openjdk:8-jre AS artifactbase
+LABEL maintainer="Apache NiFi "
+
+ARG NIFI_REGISTRY_BINARY
+ARG NIFI_REGISTRY_VERSION=1.0.0
+
+ENV NIFI_REGISTRY_BASE_DIR /opt/nifi-registry
+ENV NIFI_REGISTRY_HOME ${NIFI_REGISTRY_BASE_DIR}/nifi-registry-current
+
+ADD sh/ ${NIFI_REGISTRY_BASE_DIR}/scripts/
+
+COPY $NIFI_REGISTRY_BINARY $NIFI_REGISTRY_BASE_DIR
+RUN unzip 
${NIFI_REGISTRY_BASE_DIR}/nifi-registry-${NIFI_REGISTRY_VERSION}-bin.zip -d 
${NIFI_REGISTRY_BASE_DIR} \
+&& rm 
${NIFI_REGISTRY_BASE_DIR}/nifi-registry-${NIFI_REGISTRY_VERSION}-bin.zip \
+&& mv ${NIFI_REGISTRY_BASE_DIR}/nifi-registry-${NIFI_REGISTRY_VERSION} 
${NIFI_REGISTRY_HOME} \
+&& ln -s ${NIFI_REGISTRY_HOME} 
${NIFI_REGISTRY_BASE_DIR}/nifi-registry-${NIFI_REGISTRY_VERSION}
+
+
+FROM openjdk:8-jre
+LABEL maintainer="Apache NiFi Registry "
+LABEL site="https://nifi.apache.org;
+
+ARG UID=1000
+ARG GID=1000
+
+ENV NIFI_REGISTRY_BASE_DIR /opt/nifi-registry
+ENV NIFI_REGISTRY_HOME ${NIFI_REGISTRY_BASE_DIR}/nifi-registry-current
+
+COPY --chown=${UID}:${GID} --from=artifactbase $NIFI_REGISTRY_BASE_DIR 
$NIFI_REGISTRY_BASE_DIR
+
+# Setup NiFi user and create necessary directories
+RUN groupadd -g ${GID} nifi || groupmod -n nifi `getent group ${GID} | cut -d: 
-f1` \
+&& useradd --shell /bin/bash -u ${UID} -g ${GID} -m nifi \
+&& chown -R nifi:nifi ${NIFI_REGISTRY_BASE_DIR} \
+&& apt-get update \
+&& apt-get install -y jq xmlstarlet procps
+
+
+USER nifi
+
+# Web HTTP(s) ports
+EXPOSE 18080 18443
+
+WORKDIR ${NIFI_REGISTRY_HOME}
+
+# Apply configuration and start NiFi
+#
+# We need to use the exec form to avoid running our command in a subshell and 
omitting signals,
+# thus being unable to shut down gracefully:
+# https://docs.docker.com/engine/reference/builder/#entrypoint
+#
+# Also we need to use relative path, because the exec form does not invoke a 
command shell,
+# thus normal shell processing does not happen:
+# 
https://docs.docker.com/engine/reference/builder/#exec-form-entrypoint-example
+ENTRYPOINT ["../scripts/start.sh"]
diff --git a/nifi-registry-docker-maven/dockermaven/integration-test.sh 
b/nifi-registry-docker-maven/dockermaven/integration-test.sh
new file mode 100755
index 000..54e2672
--- /dev/null
+++ b/nifi-registry-docker-maven/dockermaven/integration-test.sh
@@ -0,0 +1,50 @@
+#

[nifi-registry] branch master updated: NIFIREG-339 Remove errors from root pom

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/master by this push:
 new a123d01  NIFIREG-339 Remove errors from root pom
a123d01 is described below

commit a123d01e293411906f17b549f04a5ecb84b0b889
Author: Bryan Bende 
AuthorDate: Fri Oct 18 11:06:07 2019 -0400

NIFIREG-339 Remove errors from root pom
---
 checkstyle.xml | 77 ++
 pom.xml| 82 --
 2 files changed, 82 insertions(+), 77 deletions(-)

diff --git a/checkstyle.xml b/checkstyle.xml
new file mode 100644
index 000..80af4b7
--- /dev/null
+++ b/checkstyle.xml
@@ -0,0 +1,77 @@
+https://checkstyle.org/dtds/configuration_1_3.dtd;>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ftp://; />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 8c33e8c..d76613d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -427,7 +427,7 @@
 
 org.apache.maven.plugins
 maven-javadoc-plugin
-2.10.1
+3.1.1
 
 false
 true
@@ -447,6 +447,7 @@
 apache-release
 true
 deploy
+
 
@{project.artifactId}-@{project.version}
 false
 true
@@ -562,82 +563,7 @@
 org.apache.maven.plugins
 maven-checkstyle-plugin
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 

[nifi-registry] branch master updated: NIFIREG-337 Add automated testing for Postgres 10.x

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/master by this push:
 new 007ccd4  NIFIREG-337 Add automated testing for Postgres 10.x
007ccd4 is described below

commit 007ccd42db1d7dbc06f9a32e4841eee6df91b250
Author: Bryan Bende 
AuthorDate: Thu Oct 17 13:24:29 2019 -0400

NIFIREG-337 Add automated testing for Postgres 10.x
---
 README.md  |  3 +-
 .../src/main/asciidoc/administration-guide.adoc|  2 +-
 .../registry/db/Postgres10DataSourceFactory.java   | 55 ++
 nifi-registry-core/pom.xml | 13 +
 4 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4999a69..3e97e83 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,8 @@ Assuming Docker is running on the system where the build is 
running, then the fo
 | --- | - |
 | All supported   | `mvn verify -Ptest-all-dbs` |
 | H2 (default)| `mvn verify` |
-| PostgreSQL  | `mvn verify -Dspring.profiles.active=postgres` | 
+| PostgreSQL 9.x  | `mvn verify -Dspring.profiles.active=postgres` | 
+| PostgreSQL 10.x | `mvn verify -Dspring.profiles.active=postgres-10` | 
 | MySQL 5.6   | `mvn verify -Pcontrib-check 
-Dspring.profiles.active=mysql-56` |
 | MySQL 5.7   | `mvn verify -Pcontrib-check 
-Dspring.profiles.active=mysql-57` |
 | MySQL 8 | `mvn verify -Pcontrib-check 
-Dspring.profiles.active=mysql-8`  |
diff --git 
a/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
 
b/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
index 0c6a5dd..90b80d5 100644
--- 
a/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
+++ 
b/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
@@ -1128,7 +1128,7 @@ providing 2 total locations, including 
`nifi.registry.extension.dir.1`.
 
 The metadata database maintains the knowledge of which buckets exist, which 
versioned items belong to which buckets, as well as the version history for 
each item.
 
-Currently, NiFi Registry supports using H2, Postgres 9.x, and MySQL (5.6, 5.7, 
8.0) for the relational database engine.
+Currently, NiFi Registry supports using H2, Postgres (9.x, 10.x), and MySQL 
(5.6, 5.7, 8.0) for the relational database engine.
 
 NOTE: NiFi Registry 0.1.0 only supports H2.
 
diff --git 
a/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/Postgres10DataSourceFactory.java
 
b/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/Postgres10DataSourceFactory.java
new file mode 100644
index 000..23d2f1d
--- /dev/null
+++ 
b/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/Postgres10DataSourceFactory.java
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+package org.apache.nifi.registry.db;
+
+import org.postgresql.ds.PGSimpleDataSource;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.delegate.DatabaseDelegate;
+import org.testcontainers.jdbc.JdbcDatabaseDelegate;
+
+import javax.annotation.PostConstruct;
+import javax.script.ScriptException;
+import javax.sql.DataSource;
+import java.sql.SQLException;
+
+@Configuration
+@Profile("postgres-10")
+public class Postgres10DataSourceFactory extends TestDataSourceFactory {
+
+private static final PostgreSQLContainer POSTGRESQL_CONTAINER = new 
PostgreSQLContainer("postgres:10");
+
+static {
+POSTGRESQL_CONTAINER.start();
+}
+
+@Override
+protected DataSource createDataSource() {
+PGSimpleDataSource dataSource = new PGSimpleDataSource();
+dataSource.setUrl(POSTGRESQL_CONTAINER.getJdbcUrl());
+dataSource.setUser(POSTGRESQL_CONTAINER.getUsername());
+dataSource.setPassword(POSTGRESQL_C

[nifi] branch master updated (9dd0dda -> 266a59d)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git.


from 9dd0dda  NIFI-6772: Improved the information that is emitted about 
Garbage Collection when a Diagnostics Dump is performed
 add 266a59d  NIFI-6755 Fix broken link to Quartz documentation

No new revisions were added by this update.

Summary of changes:
 nifi-docs/src/main/asciidoc/user-guide.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[nifi] branch master updated (2ab9997 -> 7ac6e4c)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git.


from 2ab9997  NIFI-6662: Adding Kudu Lookup Service NIFI-6662: Cleaning up 
Kudu logic NIFI-6662: Minor enhancements and build fixes NIFI-6662: This closes 
#3732.
 add 7ac6e4c  NIFI-6711 Clear secret key when auto restarting in order to 
obtain new secret key from the NiFi process

No new revisions were added by this update.

Summary of changes:
 nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java | 1 +
 1 file changed, 1 insertion(+)

[nifi-standard-libraries] branch master updated: NIFILIBS-1 Setup root pom, README, LICENSE, & NOTICE

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-standard-libraries.git


The following commit(s) were added to refs/heads/master by this push:
 new 790c215  NIFILIBS-1 Setup root pom, README, LICENSE, & NOTICE
790c215 is described below

commit 790c215cd73aed7b10e25ea660dbecd94409331a
Author: Bryan Bende 
AuthorDate: Mon Sep 23 13:38:22 2019 -0400

NIFILIBS-1 Setup root pom, README, LICENSE, & NOTICE
---
 .gitignore |  17 +++
 LICENSE| 202 ++
 NOTICE |   5 +
 README.md  |  60 
 checkstyle.xml |  79 ++
 pom.xml| 444 +
 6 files changed, 807 insertions(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..1e9336f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,17 @@
+target
+.project
+.settings
+.classpath
+nbactions.xml
+nb-configuration.xml
+.DS_Store
+.metadata
+.recommenders
+
+# Intellij
+.idea/
+*.iml
+*.iws
+*~
+
+.vscode/
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000..d645695
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+  subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the

[nifi-registry] branch master updated: NIFIREG-317 Improve logging for errors that occur when creating providers

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/master by this push:
 new f530195  NIFIREG-317 Improve logging for errors that occur when 
creating providers
f530195 is described below

commit f530195d543d1fcef682048f727b4fb0ad600218
Author: Bryan Bende 
AuthorDate: Wed Sep 4 14:46:42 2019 -0400

NIFIREG-317 Improve logging for errors that occur when creating providers
---
 .../org/apache/nifi/registry/provider/StandardProviderFactory.java| 4 
 1 file changed, 4 insertions(+)

diff --git 
a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/StandardProviderFactory.java
 
b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/StandardProviderFactory.java
index c9eb9f5..3d14d67 100644
--- 
a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/StandardProviderFactory.java
+++ 
b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/StandardProviderFactory.java
@@ -121,6 +121,7 @@ public class StandardProviderFactory implements 
ProviderFactory, DisposableBean
 final JAXBElement element = 
unmarshaller.unmarshal(new StreamSource(providersConfigFile), Providers.class);
 providersHolder.set(element.getValue());
 } catch (SAXException | JAXBException e) {
+LOGGER.error(e.getMessage(), e);
 throw new ProviderFactoryException("Unable to load the 
providers configuration file at: " + providersConfigFile.getAbsolutePath(), e);
 }
 } else {
@@ -157,6 +158,7 @@ public class StandardProviderFactory implements 
ProviderFactory, DisposableBean
 
 LOGGER.info("Instantiated FlowPersistenceProvider with class 
name {}", new Object[]{flowProviderClassName});
 } catch (Exception e) {
+LOGGER.error(e.getMessage(), e);
 throw new ProviderFactoryException("Error creating 
FlowPersistenceProvider with class name: " + flowProviderClassName, e);
 }
 
@@ -207,6 +209,7 @@ public class StandardProviderFactory implements 
ProviderFactory, DisposableBean
 
 LOGGER.info("Instantiated EventHookProvider with class 
name {}", new Object[] {hookProviderClassName});
 } catch (Exception e) {
+LOGGER.error(e.getMessage(), e);
 throw new ProviderFactoryException("Error creating 
EventHookProvider with class name: " + hookProviderClassName, e);
 }
 
@@ -250,6 +253,7 @@ public class StandardProviderFactory implements 
ProviderFactory, DisposableBean
 
 LOGGER.info("Instantiated BundlePersistenceProvider with class 
name {}", new Object[] {extensionBundleProviderClassName});
 } catch (Exception e) {
+LOGGER.error(e.getMessage(), e);
 throw new ProviderFactoryException("Error creating 
BundlePersistenceProvider with class name: " + 
extensionBundleProviderClassName, e);
 }
 

[nifi-registry] branch master updated: Update .travis.yml

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/master by this push:
 new 6a4a606  Update .travis.yml
6a4a606 is described below

commit 6a4a606d64c4aa3ea2a0b5e9a630e4dc8b1555d3
Author: Bryan Bende 
AuthorDate: Wed Sep 4 15:01:46 2019 -0400

Update .travis.yml
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a85ddbd..1cfe9be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,5 +57,5 @@ install: true
 
 #build commands
 script:
-- mvn -T 2C clean install -Pintegration-tests,contrib-check,jsUnitTests | 
grep -v -F -f .travis-output-filters && exit ${PIPESTATUS[0]}
+- mvn clean install -Pintegration-tests,contrib-check,jsUnitTests | grep 
-v -F -f .travis-output-filters && exit ${PIPESTATUS[0]}
 

[nifi-registry] branch master updated: NIFIREG-300 Added nifi-registry-revision modules

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/master by this push:
 new 396e068  NIFIREG-300 Added nifi-registry-revision modules
396e068 is described below

commit 396e068f277964e37bf0d2442fcfa679bc4e2683
Author: Bryan Bende 
AuthorDate: Fri Aug 9 09:48:09 2019 -0400

NIFIREG-300 Added nifi-registry-revision modules

- Added nifi-registry-revision modules containing NiFi's RevisionManager 
concept with a JDBC implementation and supporting utility modules
- Fixing Travis CI config to get builds running again

This closes #212.

Signed-off-by: Kevin Doran 
---
 .travis.yml|   6 +-
 nifi-registry-assembly/NOTICE  |  32 +-
 nifi-registry-core/nifi-registry-framework/pom.xml |   2 +-
 .../nifi-registry-revision-api/pom.xml |  27 ++
 .../registry/revision/api/DeleteRevisionTask.java  |  29 ++
 .../registry/revision/api/EntityModification.java  |  64 
 .../api/ExpiredRevisionClaimException.java |  31 ++
 .../revision/api/InvalidRevisionException.java |  34 ++
 .../nifi/registry/revision/api/Revision.java   | 117 ++
 .../nifi/registry/revision/api/RevisionClaim.java  |  31 ++
 .../registry/revision/api/RevisionManager.java |  92 +
 .../nifi/registry/revision/api/RevisionUpdate.java |  43 +++
 .../registry/revision/api/UpdateRevisionTask.java  |  34 ++
 .../nifi-registry-revision-common/pom.xml  |  35 ++
 .../revision/naive/NaiveRevisionManager.java   | 139 +++
 .../revision/standard/RevisionComparator.java  |  42 +++
 .../revision/standard/StandardRevisionClaim.java   |  49 +++
 .../revision/standard/StandardRevisionUpdate.java  |  66 
 .../registry/revision/web/ClientIdParameter.java   |  43 +++
 .../nifi/registry/revision/web/LongParameter.java  |  39 ++
 .../nifi-registry-revision-entity-model/pom.xml|  34 ++
 .../registry/revision/entity/RevisableEntity.java  |  48 +++
 .../registry/revision/entity/RevisionInfo.java |  79 
 .../nifi-registry-revision-entity-service/pom.xml  |  46 +++
 .../revision/entity/RevisableEntityService.java|  78 
 .../entity/StandardRevisableEntityService.java | 168 +
 .../entity/TestStandardRevisableEntityService.java | 220 +++
 .../nifi-registry-revision-spring-jdbc/pom.xml |  62 +++
 .../revision/jdbc/JdbcRevisionManager.java | 227 +++
 .../registry/revision/jdbc/RevisionRowMapper.java  |  35 ++
 .../org/apache/nifi/registry/TestApplication.java  |  36 ++
 .../revision/jdbc/TestJdbcRevisionManager.java | 418 +
 .../src/test/resources/application.properties  |  22 ++
 nifi-registry-core/nifi-registry-revision/pom.xml  |  34 ++
 nifi-registry-core/nifi-registry-web-api/pom.xml   |  10 +
 nifi-registry-core/pom.xml |   1 +
 pom.xml|   9 +-
 37 files changed, 2459 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ab00146..a85ddbd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ env:
 os: linux
 
 jdk:
-- oraclejdk8
+- openjdk8
 
 # Caches mvn repository in order to speed up builds
 cache:
@@ -35,6 +35,9 @@ before_cache:
 # Remove nifi repo again to save travis from caching it
 - rm -rf $HOME/.m2/repository/org/apache/nifi-registry/
 
+services:
+- xvfb
+
 addons:
 chrome: stable
 
@@ -47,7 +50,6 @@ before_install:
 #   1. simulate an `X` server on Travis CI for karma tests that require a GUI
 before_script:
 - export DISPLAY=:99.0
-- sh -e /etc/init.d/xvfb start
 - sleep 3 # give xvfb some time to start
 
 # skip the installation step entirely
diff --git a/nifi-registry-assembly/NOTICE b/nifi-registry-assembly/NOTICE
index 48fe7f4..9e4dca9 100644
--- a/nifi-registry-assembly/NOTICE
+++ b/nifi-registry-assembly/NOTICE
@@ -16,7 +16,7 @@ The following binary components are provided under the Apache 
Software License v
   (ASLv2) Jetty
 The following NOTICE information applies:
Jetty Web Container
-   Copyright 1995-2017 Mort Bay Consulting Pty Ltd.
+   Copyright 1995-2019 Mort Bay Consulting Pty Ltd.
 
   (ASLv2) Apache Commons Codec
 The following NOTICE information applies:
@@ -165,13 +165,13 @@ The following binary components are provided under the 
Apache Software License v
 
   (ASLv2) Spring Framework
 The following NOTICE information applies:
-  Spring Framework 5.0.2.RELEASE
-  Copyright (c) 2002-2017 Pivotal, Inc.
+  Spring Framework 5.1.8.RELEASE
+  Copyright (c) 2002-2019 Pivotal, Inc.
 
   (ASLv2) Spring Security
 The following NOTICE information applies:
-  Spring Framework 5.0.5.RELEASE
-  Copyright (c) 2002-2017 Pivotal, Inc.
+  Spring Framework

[nifi-minifi] branch master updated: MINIFI-510 Update Travis to use supported JDKs

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi.git


The following commit(s) were added to refs/heads/master by this push:
 new b01d0fe  MINIFI-510 Update Travis to use supported JDKs
b01d0fe is described below

commit b01d0fe8ec2b6735f9a9681f874deb01ef0a7361
Author: Aldrin Piri 
AuthorDate: Tue Aug 13 12:45:30 2019 -0400

MINIFI-510 Update Travis to use supported JDKs
---
 .travis.yml | 31 +++
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e5aba1a..90db7c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,26 @@
+# 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.
 language: java
 
 matrix:
   include:
-- os: linux
+- dist: trusty
   jdk: oraclejdk8
-  # before_install aids in a couple workarounds for issues within the 
Travis-CI environment
-  #   1. Workaround for buffer overflow issues with OpenJDK versions of 
java as per 
https://github.com/travis-ci/travis-ci/issues/5227#issuecomment-165135711
-  #   2. Workaround for non-existent Maven repository as per: 
https://github.com/travis-ci/travis-ci/issues/4629#issuecomment-131214465
-  before_install:
-- sudo hostname "$(hostname | cut -c1-63)"
-- sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" 
/etc/hosts | sudo tee /etc/hosts
-- sed -i.bak -e 
's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g'
 ~/.m2/settings.xml
+- dist: trusty
+  jdk: openjdk8
 - os: osx
-  osx_image: xcode9.2
+  osx_image: xcode9.3
 
-
-
-script: mvn clean install -Pcontrib-check
+script: mvn clean install -Pcontrib-check
\ No newline at end of file

[nifi-registry] branch master updated: NIFIREG-301 Added description to VersionedParameterContext

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/master by this push:
 new 5fbe0a3  NIFIREG-301 Added description to VersionedParameterContext
5fbe0a3 is described below

commit 5fbe0a380b9b0c4b01f822c4c80e58857f1acea5
Author: Bryan Bende 
AuthorDate: Fri Aug 9 10:02:30 2019 -0400

NIFIREG-301 Added description to VersionedParameterContext
---
 .../apache/nifi/registry/flow/VersionedParameterContext.java   | 10 ++
 1 file changed, 10 insertions(+)

diff --git 
a/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedParameterContext.java
 
b/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedParameterContext.java
index 5294c61..bb0b837 100644
--- 
a/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedParameterContext.java
+++ 
b/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/flow/VersionedParameterContext.java
@@ -23,6 +23,7 @@ import java.util.Set;
 public class VersionedParameterContext {
 
 private String name;
+private String description;
 private Set parameters;
 
 @ApiModelProperty("The name of the context")
@@ -34,6 +35,15 @@ public class VersionedParameterContext {
 this.name = name;
 }
 
+@ApiModelProperty("The description of the parameter context")
+public String getDescription() {
+return description;
+}
+
+public void setDescription(String description) {
+this.description = description;
+}
+
 @ApiModelProperty("The parameters in the context")
 public Set getParameters() {
 return parameters;

[nifi-registry] branch switch-travis-to-openjdk8 updated (9535c4a -> 9040ba8)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to branch switch-travis-to-openjdk8
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git.


from 9535c4a  Switch Travis to use OpenJDK instead of Oracle
 add 9040ba8  Remove jsUnitTests from Travis build

No new revisions were added by this update.

Summary of changes:
 .travis.yml | 20 +---
 1 file changed, 1 insertion(+), 19 deletions(-)

[nifi-registry] 01/01: Switch Travis to use OpenJDK instead of Oracle

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch switch-travis-to-openjdk8
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git

commit 9535c4a7bf1eb9cf1c1e9386d1e293cb16888db3
Author: Kevin Doran 
AuthorDate: Fri Aug 9 11:16:53 2019 -0400

Switch Travis to use OpenJDK instead of Oracle
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ab00146..75af663 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ env:
 os: linux
 
 jdk:
-- oraclejdk8
+- openjdk8
 
 # Caches mvn repository in order to speed up builds
 cache:

[nifi-registry] branch switch-travis-to-openjdk8 created (now 9535c4a)

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a change to branch switch-travis-to-openjdk8
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git.


  at 9535c4a  Switch Travis to use OpenJDK instead of Oracle

This branch includes the following new commits:

 new 9535c4a  Switch Travis to use OpenJDK instead of Oracle

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[nifi-registry] branch master updated: NIFIREG-285 - Add DatabaseFlowPersistenceProvider

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/master by this push:
 new 6f19a73  NIFIREG-285 - Add DatabaseFlowPersistenceProvider
6f19a73 is described below

commit 6f19a736c00242affb82a0d326e686be5a2e1b50
Author: Bryan Bende 
AuthorDate: Mon Jul 15 11:49:21 2019 -0400

NIFIREG-285 - Add DatabaseFlowPersistenceProvider

- Added method injection of DataSource in StandardProviderFactory
- Split out postgres migrations to use BYTEA for blob type

This closes #205.

Signed-off-by: Kevin Doran 
---
 .../src/main/asciidoc/administration-guide.adoc|  23 ++-
 .../registry/db/CustomFlywayConfiguration.java |   7 +
 .../registry/provider/StandardProviderFactory.java |  52 +-
 .../flow/DatabaseFlowPersistenceProvider.java  |  86 ++
 ...ache.nifi.registry.flow.FlowPersistenceProvider |   3 +-
 .../migration/default/V6__AddFlowPersistence.sql   |  22 +++
 .../db/migration/mysql/V6__AddFlowPersistence.sql  |  22 +++
 .../db/migration/postgres/V2__Initial.sql  |  60 +++
 .../db/migration/postgres/V3__AddExtensions.sql| 105 
 .../migration/postgres/V4__AddCascadeOnDelete.sql  |  23 +++
 .../postgres/V5__AddBucketPublicFlags.sql  |  16 ++
 .../migration/postgres/V6__AddFlowPersistence.sql  |  22 +++
 .../provider/TestStandardProviderFactory.java  |  18 ++-
 .../flow/TestDatabaseFlowPersistenceProvider.java  | 100 
 .../provider/hook/TestScriptEventHookProvider.java |  12 +-
 .../nifi/registry/provider/ProviderContext.java|  34 
 .../src/main/resources/conf/providers.xml  |   6 +
 .../nifi/registry/web/api/DBFlowStorageIT.java | 178 +
 .../application-ITDBFlowStorage.properties}|   9 +-
 .../conf/db-flow-storage/nifi-registry.properties} |  16 +-
 .../resources/conf/providers-db-flow-storage.xml   |  29 
 .../FlowPersistenceProviderMigrator.java   |  13 +-
 22 files changed, 832 insertions(+), 24 deletions(-)

diff --git 
a/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
 
b/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
index 29b5589..a28dc50 100644
--- 
a/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
+++ 
b/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
@@ -1118,7 +1118,7 @@ Currently, NiFi Registry supports using H2, Postgres 9.x, 
and MySQL (5.6, 5.7, 8
 
 NOTE: NiFi Registry 0.1.0 only supports H2.
 
-== H2
+=== H2
 
 H2 is an embedded database that is pre-configured in the default 
_nifi-registry.properties_ file. The contents of the H2 database are stored in 
a file on the local filesystem.
 
@@ -1130,7 +1130,7 @@ For NiFi Registry 0.2.0 and forward, the location of the 
H2 database is specifie
 
 `nifi.registry.db.url=jdbc:h2:./database/nifi-registry-primary;`
 
-== Postgres
+=== Postgres
 
 Postgres provides the option to use an externally located database that also 
supports high availability.
 
@@ -1159,7 +1159,7 @@ The following steps are required to use Postgres:
   nifi.registry.db.username=nifireg
   nifi.registry.db.password=changeme
 
-== MySQL
+=== MySQL
 
 MySQL also provides the option to use an externally located database that also 
supports high availability.
 
@@ -1357,6 +1357,23 @@ Host bitbucket.org
   IdentityFile ~/.ssh/key-for-bitbucket
 
 
+ DatabaseFlowPersistenceProvider
+
+`DatabaseFlowPersistenceProvider` stores flow contents in a database table.
+
+This provider leverages the same database used for the metadata database, so 
there is no configuration to provide since the
+connection details will come from the database properties in 
`nifi-registry.properties`.
+
+The database table is named `FLOW_PERSISTENCE_PROVIDER` and has the following 
schema:
+
+|
+|*Column*|*Description*
+|BUCKET_ID|The identifier of the bucket where the flow is located.
+|FLOW_ID|The identifier of the flow.
+|VERSION|The version of the flow.
+|FLOW_CONTENT|The serialized bytes of the flow content stored as a BLOB.
+|
+
  Switching from other Flow Persistence Provider
 
 In order to switch the Flow Persistence Provider, it is necessary to reset 
NiFi Registry.
diff --git 
a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/CustomFlywayConfiguration.java
 
b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/CustomFlywayConfiguration.java
index 0cbf64f..0288f9d 100644
--- 
a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/CustomFlywayConfiguration.java
+++ 
b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/CustomFlywayConfiguration.java
@@ -41,6 +41,9 @@ public class

[nifi-registry] branch master updated: NIFIREG-274 Increasing visiblity of dataSource() in TestDataSourceFactory for re-use outside of NiFi Registry

[kdoran]

This is an automated email from the ASF dual-hosted git repository.

kdoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git


The following commit(s) were added to refs/heads/master by this push:
 new 202e47e  NIFIREG-274 Increasing visiblity of dataSource() in 
TestDataSourceFactory for re-use outside of NiFi Registry
202e47e is described below

commit 202e47ebc18f7d10f0bbb49d1b341ed78ae7ad22
Author: Bryan Bende 
AuthorDate: Mon Jul 29 15:58:13 2019 -0400

NIFIREG-274 Increasing visiblity of dataSource() in TestDataSourceFactory 
for re-use outside of NiFi Registry
---
 .../main/java/org/apache/nifi/registry/db/TestDataSourceFactory.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/TestDataSourceFactory.java
 
b/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/TestDataSourceFactory.java
index 0625f0f..773c74b 100644
--- 
a/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/TestDataSourceFactory.java
+++ 
b/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/TestDataSourceFactory.java
@@ -27,7 +27,7 @@ public abstract class TestDataSourceFactory {
 
 @Bean
 @Primary
-DataSource dataSource() {
+public DataSource dataSource() {
 return createDataSource();
 }