(nifi) branch main updated (8d85aeb34e -> 5c335cbbec)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 8d85aeb34e Merge pull request #8930 from terjekid/main add 5c335cbbec NIFI-13364 Removed autorefresh and banner UI properties No new revisions were added by this update. Summary of changes: .../service/MiNiFiPropertiesGenerator.java | 2 - .../resources/MINIFI-216/nifi.properties.before| 2 - .../resources/MINIFI-245/nifi.properties.before| 2 - .../src/test/resources/MINIFI-277/nifi.properties | 2 - .../resources/NIFI-8753/nifi.properties.before | 2 - .../src/test/resources/conf/nifi.properties| 2 - .../java/org/apache/nifi/util/NiFiProperties.java | 24 - .../org/apache/nifi/util/NiFiPropertiesTest.java | 2 - .../NiFiProperties/conf/nifi.blank.properties | 2 - .../NiFiProperties/conf/nifi.missing.properties| 2 - .../resources/NiFiProperties/conf/nifi.properties | 2 - .../src/main/asciidoc/administration-guide.adoc| 2 - .../org/apache/nifi/web/api/dto/BannerDTO.java | 63 -- .../nifi/web/api/dto/FlowConfigurationDTO.java | 15 -- .../apache/nifi/web/api/entity/BannerEntity.java | 44 --- .../src/test/resources/conf/nifi.properties| 2 - .../src/test/resources/conf/nifi.properties| 2 - .../tasks/NiFiPropertiesDiagnosticTask.java| 1 - .../src/test/resources/conf/nifi.properties| 2 - .../resources/flowcontrollertest.nifi.properties | 2 - .../src/test/resources/nifi-with-remote.properties | 2 - .../standardflowserializertest.nifi.properties | 2 - .../standardflowsynchronizerspec.nifi.properties | 2 - .../standardprocessschedulertest.nifi.properties | 2 - .../conf/nifi.nar_with_native_lib.properties | 2 - .../conf/nifi.nar_without_native_lib.properties| 2 - .../src/test/resources/conf/nifi.properties| 2 - .../resources/NarUnpacker/conf/nifi.properties | 2 - .../src/test/resources/nifi.properties | 2 - .../src/test/resources/nifi.properties | 2 - .../nifi-framework/nifi-resources/pom.xml | 2 - .../src/main/resources/conf/nifi.properties| 2 - .../NiFiProperties/conf/encrypted.nifi.properties | 5 +- .../resources/NiFiProperties/conf/nifi.properties | 2 - .../src/test/resources/nifi.properties | 2 - .../connector/FrameworkServerConnectorFactory.java | 6 +-- .../apache/nifi/web/StandardNiFiServiceFacade.java | 3 +- .../java/org/apache/nifi/web/api/FlowResource.java | 46 .../org/apache/nifi/web/api/dto/DtoFactory.java| 6 +-- .../test/resources/site-to-site/nifi.properties| 2 - .../nifi/src/app/state/flow-configuration/index.ts | 1 - .../resources/conf/clustered/node1/nifi.properties | 2 - .../resources/conf/clustered/node2/nifi.properties | 2 - .../test/resources/conf/default/nifi.properties| 2 - .../test/resources/conf/pythonic/nifi.properties | 2 - 45 files changed, 6 insertions(+), 276 deletions(-) delete mode 100644 nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/BannerDTO.java delete mode 100644 nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/BannerEntity.java
(nifi) branch main updated: NIFI-13357 Removed APP_INSTALLATION_TOKEN from GitHubFlowRegistryClient (#8923)
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 f5ecb18fef NIFI-13357 Removed APP_INSTALLATION_TOKEN from
GitHubFlowRegistryClient (#8923)
f5ecb18fef is described below
commit f5ecb18fef271852b389350a17d16b18940115a7
Author: David Handermann
AuthorDate: Tue Jun 4 10:51:37 2024 -0500
NIFI-13357 Removed APP_INSTALLATION_TOKEN from GitHubFlowRegistryClient
(#8923)
Signed-off-by: David Handermann
---
.../nifi/github/GitHubAuthenticationType.java | 37 +++---
.../nifi/github/GitHubFlowRegistryClient.java | 13 +---
.../apache/nifi/github/GitHubRepositoryClient.java | 7
3 files changed, 33 insertions(+), 24 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/main/java/org/apache/nifi/github/GitHubAuthenticationType.java
b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/main/java/org/apache/nifi/github/GitHubAuthenticationType.java
index 8cb7c4be7c..adb74ebef4 100644
---
a/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/main/java/org/apache/nifi/github/GitHubAuthenticationType.java
+++
b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/main/java/org/apache/nifi/github/GitHubAuthenticationType.java
@@ -17,13 +17,40 @@
package org.apache.nifi.github;
+import org.apache.nifi.components.DescribedValue;
+
/**
* Enumeration of authentication types for the GitHub client.
*/
-public enum GitHubAuthenticationType {
+public enum GitHubAuthenticationType implements DescribedValue {
+
+NONE("None", "Authentication disabled"),
+
+PERSONAL_ACCESS_TOKEN("Personal Access Token", "User-based Personal Access
Token"),
+
+APP_INSTALLATION("App Installation", "App-based Installation Token
provisioning from a Private Key");
+
+private final String displayName;
+
+private final String description;
+
+GitHubAuthenticationType(final String displayName, final String
description) {
+this.displayName = displayName;
+this.description = description;
+}
+
+@Override
+public String getValue() {
+return name();
+}
+
+@Override
+public String getDisplayName() {
+return displayName;
+}
-NONE,
-PERSONAL_ACCESS_TOKEN,
-APP_INSTALLATION_TOKEN,
-APP_INSTALLATION
+@Override
+public String getDescription() {
+return description;
+}
}
diff --git
a/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/main/java/org/apache/nifi/github/GitHubFlowRegistryClient.java
b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/main/java/org/apache/nifi/github/GitHubFlowRegistryClient.java
index e17fc33050..da94bddc17 100644
---
a/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/main/java/org/apache/nifi/github/GitHubFlowRegistryClient.java
+++
b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/main/java/org/apache/nifi/github/GitHubFlowRegistryClient.java
@@ -106,7 +106,7 @@ public class GitHubFlowRegistryClient extends
AbstractFlowRegistryClient {
static final PropertyDescriptor AUTHENTICATION_TYPE = new
PropertyDescriptor.Builder()
.name("Authentication Type")
.description("The type of authentication to use for accessing
GitHub")
-.allowableValues(GitHubAuthenticationType.values())
+.allowableValues(GitHubAuthenticationType.class)
.defaultValue(GitHubAuthenticationType.NONE.name())
.required(true)
.build();
@@ -120,15 +120,6 @@ public class GitHubFlowRegistryClient extends
AbstractFlowRegistryClient {
.dependsOn(AUTHENTICATION_TYPE,
GitHubAuthenticationType.PERSONAL_ACCESS_TOKEN.name())
.build();
-static final PropertyDescriptor APP_INSTALLATION_TOKEN = new
PropertyDescriptor.Builder()
-.name("App Installation Token")
-.description("The app installation token to use for
authentication")
-.addValidator(StandardValidators.NON_BLANK_VALIDATOR)
-.required(true)
-.sensitive(true)
-.dependsOn(AUTHENTICATION_TYPE,
GitHubAuthenticationType.APP_INSTALLATION_TOKEN.name())
-.build();
-
static final PropertyDescriptor APP_ID = new PropertyDescriptor.Builder()
.name("App ID")
.description("Identifier of GitHub App to use for authentication")
@@ -155,7 +146,6 @@ public class GitHubFlowRegistryClient extends
AbstractFlowRegistryClient {
REPOSITORY_PATH,
AUTHENTICATION_TYPE,
PERSONAL_ACCESS_TOKEN,
-
(nifi) branch main updated (85cf0e995e -> 7a85da9fee)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 85cf0e995e NIFI-13351 Improved QueryDatabaseTable Processors to call session.putAttributes() add 7a85da9fee NIFI-13339 Set sensitive as true in USM Users JSON content on ListenTrapSNMP No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/nifi/snmp/processors/ListenTrapSNMP.java| 1 + 1 file changed, 1 insertion(+)
(nifi) branch main updated (89f153aad8 -> 85cf0e995e)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 89f153aad8 [NIFI-13355] move view cluster details and view flow configuration details into action kebab menus (#8921) add 6ca03eae55 NIFI-13288 Improved SplitXml and SplitAvro to call session.putAttributes() add 85cf0e995e NIFI-13351 Improved QueryDatabaseTable Processors to call session.putAttributes() No new revisions were added by this update. Summary of changes: .../main/java/org/apache/nifi/processors/avro/SplitAvro.java | 10 ++ .../nifi/processors/standard/AbstractQueryDatabaseTable.java | 11 +++ .../java/org/apache/nifi/processors/standard/SplitXml.java| 9 ++--- 3 files changed, 19 insertions(+), 11 deletions(-)
(nifi) branch main updated: NIFI-13231 Added App Private Key Auth to GitHub FlowRegistryClient
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 cfcae70d37 NIFI-13231 Added App Private Key Auth to GitHub
FlowRegistryClient
cfcae70d37 is described below
commit cfcae70d3781a2d425251b21e88dc61ffbd12d98
Author: maybevanshh <83403250+maybevan...@users.noreply.github.com>
AuthorDate: Wed May 29 15:57:28 2024 +0530
NIFI-13231 Added App Private Key Auth to GitHub FlowRegistryClient
This closes #8890
Signed-off-by: David Handermann
Co-authored-by: David Handermann
---
.../nifi-github-extensions/pom.xml | 22 -
.../nifi/github/GitHubAuthenticationType.java | 4 +-
.../nifi/github/GitHubFlowRegistryClient.java | 24 -
.../apache/nifi/github/GitHubRepositoryClient.java | 50 ++
...thenticationType.java => PrivateKeyReader.java} | 21 ++--
.../nifi/github/StandardPrivateKeyReader.java | 110 +
6 files changed, 216 insertions(+), 15 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/pom.xml
b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/pom.xml
index be73f95343..d4e8fa5f3e 100644
--- a/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/pom.xml
+++ b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/pom.xml
@@ -21,11 +21,10 @@
nifi-github-extensions
jar
+
+0.12.5
+
-
-org.apache.nifi
-nifi-api
-
org.apache.nifi
nifi-utils
@@ -39,5 +38,20 @@
github-api
${github-api.version}
+
+io.jsonwebtoken
+jjwt-api
+${jjwt.version}
+
+
+io.jsonwebtoken
+jjwt-impl
+${jjwt.version}
+
+
+io.jsonwebtoken
+jjwt-jackson
+${jjwt.version}
+
diff --git
a/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/main/java/org/apache/nifi/github/GitHubAuthenticationType.java
b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/main/java/org/apache/nifi/github/GitHubAuthenticationType.java
index 964c376e8d..8cb7c4be7c 100644
---
a/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/main/java/org/apache/nifi/github/GitHubAuthenticationType.java
+++
b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/main/java/org/apache/nifi/github/GitHubAuthenticationType.java
@@ -24,6 +24,6 @@ public enum GitHubAuthenticationType {
NONE,
PERSONAL_ACCESS_TOKEN,
-APP_INSTALLATION_TOKEN;
-
+APP_INSTALLATION_TOKEN,
+APP_INSTALLATION
}
diff --git
a/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/main/java/org/apache/nifi/github/GitHubFlowRegistryClient.java
b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/main/java/org/apache/nifi/github/GitHubFlowRegistryClient.java
index 34fce1d4cb..e17fc33050 100644
---
a/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/main/java/org/apache/nifi/github/GitHubFlowRegistryClient.java
+++
b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/src/main/java/org/apache/nifi/github/GitHubFlowRegistryClient.java
@@ -129,6 +129,24 @@ public class GitHubFlowRegistryClient extends
AbstractFlowRegistryClient {
.dependsOn(AUTHENTICATION_TYPE,
GitHubAuthenticationType.APP_INSTALLATION_TOKEN.name())
.build();
+static final PropertyDescriptor APP_ID = new PropertyDescriptor.Builder()
+.name("App ID")
+.description("Identifier of GitHub App to use for authentication")
+.addValidator(StandardValidators.NON_BLANK_VALIDATOR)
+.required(true)
+.sensitive(false)
+.dependsOn(AUTHENTICATION_TYPE,
GitHubAuthenticationType.APP_INSTALLATION.name())
+.build();
+
+static final PropertyDescriptor APP_PRIVATE_KEY = new
PropertyDescriptor.Builder()
+.name("App Private Key")
+.description("RSA private key associated with GitHub App to use
for authentication.")
+.addValidator(StandardValidators.NON_BLANK_VALIDATOR)
+.required(true)
+.sensitive(true)
+.dependsOn(AUTHENTICATION_TYPE,
GitHubAuthenticationType.APP_INSTALLATION.name())
+.build();
+
static final List PROPERTY_DESCRIPTORS = List.of(
GITHUB_API_URL,
REPOSITORY_OWNER,
@@ -137,7 +155,9 @@ public class GitHubFlowRegistryClient extends
AbstractFlowRegistryClient {
REPOSITORY_PATH,
AUTHEN
(nifi) branch main updated (210e0b1655 -> b768b23e0f)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 210e0b1655 NIFI-13350: (#8912) add b768b23e0f NIFI-13138 Add Bundle extensions name and description in NiFi Registry No new revisions were added by this update. Summary of changes: .../registry/nf-registry-grid-list-viewer.html | 73 ++ .../src/main/webapp/services/nf-registry.api.js| 25 .../main/webapp/services/nf-registry.service.js| 21 +++ .../explorer/grid-list/_structureElements.scss | 2 +- 4 files changed, 109 insertions(+), 12 deletions(-)
(nifi) branch main updated: NIFI-13308 Upgraded Spring Framework from 6.1.7 to 6.1.8
This is an automated email from the ASF dual-hosted git repository. exceptionfactory 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 89e8434bf0 NIFI-13308 Upgraded Spring Framework from 6.1.7 to 6.1.8 89e8434bf0 is described below commit 89e8434bf03398ac06dbe4be84c72236a4bd902e Author: Joseph Witt AuthorDate: Tue May 28 13:32:36 2024 -0700 NIFI-13308 Upgraded Spring Framework from 6.1.7 to 6.1.8 - Upgraded Spring Boot from 3.2.5 to 3.2.6 - Upgraded Slack bolt-socket-mode from 1.39.2 to 1.39.3 - Upgraded maven-artifact from 3.9.6 to 3.9.7 - Upgraded mariadb-java-client from 3.3.3 to 3.4.0 - Upgraded software.amazon.awssdk from 2.25.55 to 2.25.60 - Upgraded com.amazonaws from 1.12.725 to 1.12.730 - Upgraded Jersey from 3.1.6 to 3.1.7 - Upgraded Netty from 4.1.109.Final to 4.1.110.Final - Upgraded box-java-sdk from 4.9.0 to 4.9.1 This closes #8887 Signed-off-by: David Handermann --- nifi-extension-bundles/nifi-box-bundle/pom.xml | 2 +- .../nifi-elasticsearch-client-service/pom.xml | 2 +- .../nifi-slack-bundle/nifi-slack-processors/pom.xml| 2 +- nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml| 2 +- nifi-registry/pom.xml | 2 +- pom.xml| 10 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nifi-extension-bundles/nifi-box-bundle/pom.xml b/nifi-extension-bundles/nifi-box-bundle/pom.xml index 11f7045a80..4a473d90ee 100644 --- a/nifi-extension-bundles/nifi-box-bundle/pom.xml +++ b/nifi-extension-bundles/nifi-box-bundle/pom.xml @@ -39,7 +39,7 @@ com.box box-java-sdk -4.9.0 +4.9.1 diff --git a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml index cb297064f5..d7520ace72 100644 --- a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml +++ b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml @@ -159,7 +159,7 @@ org.apache.maven maven-artifact -3.9.6 +3.9.7 test diff --git a/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml b/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml index 57e9395e8e..a577a77b43 100644 --- a/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml +++ b/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml @@ -30,7 +30,7 @@ com.slack.api bolt-socket-mode -1.39.2 +1.39.3 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 d1eecdaf26..d05576ee09 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml +++ b/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml @@ -67,7 +67,7 @@ org.mariadb.jdbc mariadb-java-client -3.3.3 +3.4.0 org.postgresql diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index 2dca1ff1bf..29b55b48b4 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -35,7 +35,7 @@ nifi-registry-docker-maven -3.2.5 +3.2.6 10.13.0 10.0.0 3.12.0 diff --git a/pom.xml b/pom.xml index 5bd6659891..637ed2975a 100644 --- a/pom.xml +++ b/pom.xml @@ -109,8 +109,8 @@ UTF-8 UTF-8 2014 -1.12.725 - 2.25.55 +1.12.730 + 2.25.60 2.10.1 6.12.1 1.9.24 @@ -146,15 +146,15 @@ 1.2.1 2.1.5 1.9.22.1 -3.1.6 +3.1.7 2.23.1 1.5.6 5.12.0 3.10.6.Final 2.2 -4.1.109.Final +4.1.110.Final 6.0.0 -6.1.7 +6.1.8 6.3.0 2.2.22 2.2.224
(nifi) branch main updated (0660616864 -> cbe5f7db9d)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 0660616864 NIFI-13284: (#8891) add cbe5f7db9d NIFI-12343 Added Max JSON Field String Length for Elasticsearch No new revisions were added by this update. Summary of changes: .../AbstractByQueryElasticsearch.java | 7 ++- .../AbstractJsonQueryElasticsearch.java| 54 +- .../AbstractPaginatedJsonQueryElasticsearch.java | 5 +- .../elasticsearch/AbstractPutElasticsearch.java| 7 ++- .../elasticsearch/ConsumeElasticsearch.java| 7 +-- .../elasticsearch/ElasticsearchRestProcessor.java | 45 +- .../processors/elasticsearch/GetElasticsearch.java | 13 +- .../elasticsearch/PutElasticsearchJson.java| 9 ++-- .../elasticsearch/PutElasticsearchRecord.java | 10 ++-- .../AbstractByQueryElasticsearchTest.java | 28 +++ .../AbstractJsonQueryElasticsearchTest.java| 38 +-- .../AbstractPutElasticsearchTest.java | 2 +- .../elasticsearch/ConsumeElasticsearchTest.java| 28 +-- .../elasticsearch/GetElasticsearchTest.java| 54 -- .../nifi/processors/elasticsearch/JsonUtils.java | 2 + .../elasticsearch/PutElasticsearchJsonTest.java| 38 ++- .../elasticsearch/PutElasticsearchRecordTest.java | 2 +- .../integration/AbstractElasticsearch_IT.java | 8 ++-- .../integration/GetElasticsearch_IT.java | 4 +- .../mock/AbstractMockElasticsearchClient.java | 8 .../mock/MockBulkLoadClientService.java| 4 +- 21 files changed, 242 insertions(+), 131 deletions(-)
(nifi) branch support/nifi-1.x updated: NIFI-13298 Removed unused instantiated java.util.HashSet from RouteAttribute
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 8734e2ec49 NIFI-13298 Removed unused instantiated java.util.HashSet
from RouteAttribute
8734e2ec49 is described below
commit 8734e2ec491273942217a785feea637261f36681
Author: dan-s1
AuthorDate: Mon May 27 20:26:20 2024 +
NIFI-13298 Removed unused instantiated java.util.HashSet from RouteAttribute
This closes #8883
Signed-off-by: David Handermann
(cherry picked from commit a1a7c3c5a5779477d4b20027a57a22390095303a)
---
.../main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java | 2 --
1 file changed, 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
index 1fc5529ed9..135140f235 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java
@@ -254,13 +254,11 @@ public class RouteOnAttribute extends AbstractProcessor {
final Iterator relationshipNameIterator =
destinationRelationships.iterator();
final Relationship firstRelationship =
relationshipNameIterator.next();
final Map transferMap = new HashMap<>();
-final Set clones = new HashSet<>();
// make all the clones for any remaining relationships
while (relationshipNameIterator.hasNext()) {
final Relationship relationship =
relationshipNameIterator.next();
final FlowFile cloneFlowFile = session.clone(flowFile);
-clones.add(cloneFlowFile);
transferMap.put(relationship, cloneFlowFile);
}
(nifi) branch main updated (2598068b31 -> a1a7c3c5a5)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 2598068b31 NIFI-13300 Upgraded Maven from 3.9.6 to 3.9.7 add a1a7c3c5a5 NIFI-13298 Removed unused instantiated java.util.HashSet from RouteAttribute No new revisions were added by this update. Summary of changes: .../main/java/org/apache/nifi/processors/standard/RouteOnAttribute.java | 2 -- 1 file changed, 2 deletions(-)
(nifi) branch main updated: NIFI-13300 Upgraded Maven from 3.9.6 to 3.9.7
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 2598068b31 NIFI-13300 Upgraded Maven from 3.9.6 to 3.9.7
2598068b31 is described below
commit 2598068b31f9bb4c1b29f0d3562f2e41303391df
Author: Joseph Witt
AuthorDate: Sat May 25 12:11:33 2024 -0700
NIFI-13300 Upgraded Maven from 3.9.6 to 3.9.7
- Upgraded Apache Parent from 31 to 32
- Upgraded Maven Wrapper from 3.2.0 to 3.3.2
This closes #8880
Signed-off-by: David Handermann
---
.mvn/wrapper/maven-wrapper.properties | 4 +-
mvnw | 106 --
mvnw.cmd | 8 ++-
pom.xml | 2 +-
4 files changed, 72 insertions(+), 48 deletions(-)
diff --git a/.mvn/wrapper/maven-wrapper.properties
b/.mvn/wrapper/maven-wrapper.properties
index 346d645fd0..2559d1264e 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
diff --git a/mvnw b/mvnw
index 633bbb7498..3a28521e43 100755
--- a/mvnw
+++ b/mvnw
@@ -19,7 +19,7 @@
#
#
-# Apache Maven Wrapper startup batch script, version 3.2.0
+# Apache Maven Wrapper startup batch script, version 3.3.2
#
# Optional ENV vars
# -
@@ -35,15 +35,17 @@ set -euf
# OS specific support.
native_path() { printf %s\\n "$1"; }
case "$(uname)" in
-(CYGWIN*|MINGW*) [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix
"$JAVA_HOME")"
- native_path() { cygpath --path --windows "$1"; } ;;
+CYGWIN* | MINGW*)
+ [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
+ native_path() { cygpath --path --windows "$1"; }
+ ;;
esac
# set JAVACMD and JAVACCMD
set_java_home() {
# For Cygwin and MinGW, ensure paths are in Unix format before anything is
touched
- if [ -n "${JAVA_HOME-}" ] ; then
-if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ if [ -n "${JAVA_HOME-}" ]; then
+if [ -x "$JAVA_HOME/jre/sh/java" ]; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
JAVACCMD="$JAVA_HOME/jre/sh/javac"
@@ -51,17 +53,25 @@ set_java_home() {
JAVACMD="$JAVA_HOME/bin/java"
JAVACCMD="$JAVA_HOME/bin/javac"
- if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ] ; then
+ if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
echo "The JAVA_HOME environment variable is not defined correctly, so
mvnw cannot run." >&2
echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\"
or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
return 1
fi
fi
else
-JAVACMD="$('set' +e; 'unset' -f command 2>/dev/null; 'command' -v java)"
|| :
-JAVACCMD="$('set' +e; 'unset' -f command 2>/dev/null; 'command' -v javac)"
|| :
+JAVACMD="$(
+ 'set' +e
+ 'unset' -f command 2>/dev/null
+ 'command' -v java
+)" || :
+JAVACCMD="$(
+ 'set' +e
+ 'unset' -f command 2>/dev/null
+ 'command' -v javac
+)" || :
-if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ] ; then
+if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
echo "The java/javac command does not exist in PATH nor is JAVA_HOME
set, so mvnw cannot run." >&2
return 1
fi
@@ -72,7 +82,8 @@ set_java_home() {
hash_string() {
str="${1:-}" h=0
while [ -n "$str" ]; do
-h=$(( ( h * 31 + $(LC_CTYPE=C printf %d "'$str") ) % 4294967296 ))
+char="${str%"${str#?}"}"
+h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
(nifi) branch main updated (3a78575b9a -> e12a2dd39e)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 3a78575b9a NIFI-12968: Simplify login sequence (#8843) new 59eae00847 NIFI-13259 Enabled publishing nifi-stateless-assembly to Maven new e12a2dd39e NIFI-13255 Replaced deprecated Netty JdkSslContext constructor 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: .../main/java/org/apache/nifi/graph/TinkerpopClientService.java | 9 - nifi-stateless/nifi-stateless-assembly/pom.xml | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-)
(nifi) 02/02: NIFI-13255 Replaced deprecated Netty JdkSslContext constructor
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit e12a2dd39ef18857c85314419d5350d8bbb2265e
Author: dan-s1
AuthorDate: Mon May 20 20:49:37 2024 +
NIFI-13255 Replaced deprecated Netty JdkSslContext constructor
This closes #8856
Signed-off-by: David Handermann
---
.../main/java/org/apache/nifi/graph/TinkerpopClientService.java | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git
a/nifi-extension-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/TinkerpopClientService.java
b/nifi-extension-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/TinkerpopClientService.java
index 99ec623899..4ce288e306 100644
---
a/nifi-extension-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/TinkerpopClientService.java
+++
b/nifi-extension-bundles/nifi-graph-bundle/nifi-other-graph-services/src/main/java/org/apache/nifi/graph/TinkerpopClientService.java
@@ -21,7 +21,9 @@ import groovy.lang.Binding;
import groovy.lang.GroovyClassLoader;
import groovy.lang.GroovyShell;
import groovy.lang.Script;
+import io.netty.handler.ssl.ApplicationProtocolConfig;
import io.netty.handler.ssl.ClientAuth;
+import io.netty.handler.ssl.IdentityCipherSuiteFilter;
import io.netty.handler.ssl.JdkSslContext;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.nifi.annotation.behavior.RequiresInstanceClassLoading;
@@ -334,9 +336,14 @@ public class TinkerpopClientService extends
AbstractControllerService implements
protected Cluster.Builder setupSSL(ConfigurationContext context,
Cluster.Builder builder) {
if (context.getProperty(SSL_CONTEXT_SERVICE).isSet()) {
SSLContextService service =
context.getProperty(SSL_CONTEXT_SERVICE).asControllerService(SSLContextService.class);
+ApplicationProtocolConfig applicationProtocolConfig = new
ApplicationProtocolConfig(ApplicationProtocolConfig.Protocol.NONE,
+
ApplicationProtocolConfig.SelectorFailureBehavior.FATAL_ALERT,
ApplicationProtocolConfig.SelectedListenerFailureBehavior.FATAL_ALERT);
+JdkSslContext jdkSslContext = new
JdkSslContext(service.createContext(), true, null,
+IdentityCipherSuiteFilter.INSTANCE,
applicationProtocolConfig, ClientAuth.NONE, null, false);
+
builder
.enableSsl(true)
-.sslContext(new JdkSslContext(service.createContext(),
true, ClientAuth.NONE));
+.sslContext(jdkSslContext);
usesSSL = true;
}
(nifi) 01/02: NIFI-13259 Enabled publishing nifi-stateless-assembly to Maven
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 59eae00847fcdaa5c44fa9acafcb5ef91905b980
Author: bob
AuthorDate: Fri May 17 09:08:39 2024 -0500
NIFI-13259 Enabled publishing nifi-stateless-assembly to Maven
This closes #8844
Signed-off-by: David Handermann
---
nifi-stateless/nifi-stateless-assembly/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nifi-stateless/nifi-stateless-assembly/pom.xml
b/nifi-stateless/nifi-stateless-assembly/pom.xml
index 5af836d9e8..4ec9ab4852 100644
--- a/nifi-stateless/nifi-stateless-assembly/pom.xml
+++ b/nifi-stateless/nifi-stateless-assembly/pom.xml
@@ -149,7 +149,7 @@
maven-assembly-plugin
nifi-stateless-${project.version}
-false
+true
(nifi) branch main updated: NIFI-13227 Upgraded Spring and various dependencies
This is an automated email from the ASF dual-hosted git repository. exceptionfactory 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 3f9ef07e3c NIFI-13227 Upgraded Spring and various dependencies 3f9ef07e3c is described below commit 3f9ef07e3c3f69a361f00b68c98f507b825838dc Author: Joseph Witt AuthorDate: Fri May 17 12:55:12 2024 -0700 NIFI-13227 Upgraded Spring and various dependencies - Upgraded aspectj from 1.9.22 to 1.9.22.1 - Upgraded mockito from 5.11.0 to 5.12.0 - Upgraded software.amazon.awssdk from 2.25.49 to 2.25.55 - Upgraded com.amazonaws from 1.12.719 to 1.12.725 - Upgraded com.slack.api from 1.39.0 to 1.39.2 - Upgraded swagger-annotations from 2.2.21 to 2.2.22 - Upgraded mockftpserver from 3.1.0 to 3.2.0 - Upgraded Spring Framework from 6.1.6 to 6.1.7 - Upgraded subethasmtp from 7.0.2 to 7.1.1 - Upgraded reactor-core and test from 3.6.5 to 3.6.6 - Upgraded spring-retry from 2.0.5 to 2.0.6 - Upgraded com.google.cloud libraries-bom from 26.38.0 to 26.39.0 - Upgraded flyway from 10.12.0 to 10.13.0 This closes #8849 Signed-off-by: David Handermann --- nifi-code-coverage/pom.xml | 2 +- .../nifi-azure-bundle/nifi-azure-processors/pom.xml | 4 ++-- .../nifi-email-bundle/nifi-email-processors/pom.xml | 2 +- nifi-extension-bundles/nifi-gcp-bundle/pom.xml | 2 +- .../nifi-questdb-bundle/nifi-questdb/pom.xml | 2 +- .../nifi-slack-bundle/nifi-slack-processors/pom.xml | 2 +- nifi-extension-bundles/nifi-standard-bundle/pom.xml | 2 +- nifi-registry/pom.xml| 2 +- pom.xml | 12 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/nifi-code-coverage/pom.xml b/nifi-code-coverage/pom.xml index 50e5767338..3b986b2de6 100644 --- a/nifi-code-coverage/pom.xml +++ b/nifi-code-coverage/pom.xml @@ -89,7 +89,7 @@ io.projectreactor.netty reactor-netty-http -1.1.18 +1.1.19 diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml index 511f36b893..0563412de0 100644 --- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml +++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml @@ -111,7 +111,7 @@ io.projectreactor reactor-core -3.6.5 +3.6.6 com.azure @@ -191,7 +191,7 @@ io.projectreactor reactor-test -3.6.5 +3.6.6 test diff --git a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/pom.xml b/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/pom.xml index f9cfcf5e1e..66a1811313 100644 --- a/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/pom.xml +++ b/nifi-extension-bundles/nifi-email-bundle/nifi-email-processors/pom.xml @@ -69,7 +69,7 @@ com.github.davidmoten subethasmtp -7.0.2 +7.1.1 org.springframework.integration diff --git a/nifi-extension-bundles/nifi-gcp-bundle/pom.xml b/nifi-extension-bundles/nifi-gcp-bundle/pom.xml index 16668a1c42..c66b58bdc7 100644 --- a/nifi-extension-bundles/nifi-gcp-bundle/pom.xml +++ b/nifi-extension-bundles/nifi-gcp-bundle/pom.xml @@ -25,7 +25,7 @@ pom -26.38.0 +26.39.0 diff --git a/nifi-extension-bundles/nifi-questdb-bundle/nifi-questdb/pom.xml b/nifi-extension-bundles/nifi-questdb-bundle/nifi-questdb/pom.xml index 4d37bbf03e..32b43d1077 100644 --- a/nifi-extension-bundles/nifi-questdb-bundle/nifi-questdb/pom.xml +++ b/nifi-extension-bundles/nifi-questdb-bundle/nifi-questdb/pom.xml @@ -44,7 +44,7 @@ org.springframework.retry spring-retry -2.0.5 +2.0.6 diff --git a/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml b/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml index 93c14d6855..57e9395e8e 100644 --- a/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml +++ b/nifi-extension-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml @@ -30,7 +30,7 @@ com.slack.api bolt-socket-mode -1.39.0 +1.39.2 diff --git a/nifi-extension-bundles/nifi-standard-bundle/pom.xml b/nifi-extension-bundles/nifi-standard-bundle/pom.xml index
(nifi) branch main updated (c1063600af -> 45a66745b0)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from c1063600af NIFI-13263 - Bump ParCEFone version (#8851) add 24b13d7a3e NIFI-13250 Replaced deprecated method withRelyingPartyRegistration add 2e7e3733f3 NIFI-13251 Replaced deprecated AWS method Region.fromName() add a91dee65fb NIFI-13252 Replaced deprecated AWS SQS method attributeNames() add 9877b122ce NIFI-13253 Corrected the discrepancies in the top level NOTICE file add 45a66745b0 NIFI-13254 Replaced deprecated BoundedInputStream constructor with builder No new revisions were added by this update. Summary of changes: NOTICE | 66 ++ .../AbstractAWSCredentialsProviderProcessor.java | 4 +- .../nifi/processors/aws/util/RegionUtilV1.java | 3 +- .../ClientSideKMSEncryptionStrategy.java | 5 +- .../org/apache/nifi/processors/aws/sqs/GetSQS.java | 3 +- .../azure/storage/PutAzureDataLakeStorage.java | 8 ++- .../processors/gcp/storage/FetchGCSObject.java | 5 +- .../StandardRelyingPartyRegistrationResolver.java | 2 +- 8 files changed, 35 insertions(+), 61 deletions(-)
(nifi) annotated tag rel/nifi-2.0.0-M3 created (now 57442fd70f)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to annotated tag rel/nifi-2.0.0-M3 in repository https://gitbox.apache.org/repos/asf/nifi.git at 57442fd70f (tag) tagging f2215c6522a5571189290760c55f0317f8562cbd (commit) replaces rel/nifi-2.0.0-M2 by exceptionfactory on Fri May 17 14:32:01 2024 -0500 - Log - NIFI-13219 Tagged NiFi 2.0.0-M3 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEsYYTFzI3dQ26sKK5KbalLSqujboFAmZHsLEACgkQKbalLSqu jbpm+g/8CB/bJpFYqFUB5BWxXY7mNXbPOkQOHYSZo2t60NxRyh1ex3veMN6fJ3FB 8uo0FHWiod3HjNaM20r6P49Ykh0mRYT4MuJoQyGrryWVmuPjv281F3d9XY5EvVbz bXztLeplUEgEQO3jjhn4DNSp4fBRRVc5qvamQrNitxpMvne/EX6a/Ni2FNW6S6BZ 3s6MSgEMIjda80PVpeotksem3VzR5XhqIMubZbUSeQLscoUf7cNyprqAhwQWYi4w /pP1GYEi6iG2+G2mlY/wtfWmXs7YM0bLUYnjVfrjPIcpzl8cIn8i2MbXhXqXwzJV c1u7rbERjlFZjp0Slu6KoIla8IO47sY10tQAxoQe5MKJh6o8eYL35Q8vhVVixUxd pDnhuv0vKrEWKiYxDBqP5oVL9ehmwlpfhOT+bBOa6E/xJ6RYKoKzGJxLqY/5j4On LNLN03Lbc1DxXhip/ssV8BNrqGkMspiV+bNkgchaYWOGNItTTAM6GBweD89bU5vR X3jSdiAAmePiR9Q8qNAa5TR+/dHYtsE6aWPqe7JlMrNm7PyUyO7XCr7w4p/oQGN5 ejohLse96SnPmCJN2zvQnilpcDuMY5q+lwYW8FVfIge3F4rOXm7IrTNz9y6C3o5d eL6/RlAuNlHXwKrydDfetOD8rce55+LZXEy6D6Y042DHs4/1tF8= =XKeC -END PGP SIGNATURE- --- No new revisions were added by this update.
(nifi) annotated tag rel/nifi-2.0.0-M3 deleted (was 068b7bfd35)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to annotated tag rel/nifi-2.0.0-M3 in repository https://gitbox.apache.org/repos/asf/nifi.git *** WARNING: tag rel/nifi-2.0.0-M3 was deleted! *** tag was 068b7bfd35 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
(nifi) branch main updated (60112f242c -> b27fc46b60)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 60112f242c [NIFI-13226] - Support changing color of processors and labels (#8836) add b27fc46b60 NIFI-12670 Read Jolt Transform with UTF-8 Encoding No new revisions were added by this update. Summary of changes: .../processors/jolt/AbstractJoltTransform.java | 2 +- .../processors/jolt/TestJoltTransformJSON.java | 20 + .../processors/jolt/TestJoltTransformRecord.java | 26 ++ 3 files changed, 47 insertions(+), 1 deletion(-)
(nifi-site) branch main updated: NIFI-13219 Removed Kafka Connector from Current Downloads
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 9cda2fbb NIFI-13219 Removed Kafka Connector from Current Downloads
9cda2fbb is described below
commit 9cda2fbbd9cd7f9f4d11a12be717fc12c2282a1a
Author: exceptionfactory
AuthorDate: Thu May 16 23:24:24 2024 -0500
NIFI-13219 Removed Kafka Connector from Current Downloads
---
content/download/_index.md | 1 -
1 file changed, 1 deletion(-)
diff --git a/content/download/_index.md b/content/download/_index.md
index 30c657c9..1b4407bb 100644
--- a/content/download/_index.md
+++ b/content/download/_index.md
@@ -45,7 +45,6 @@ window.addEventListener('uikit:init', () => {
Binaries
{{< download-links label="NiFi Standard" project="nifi" extension="-bin.zip">}}
{{< download-links label="NiFi Stateless" project="nifi" extension="-bin.zip"
qualifier="stateless">}}
-{{< download-links label="NiFi Kafka Connector" project="nifi"
extension=".zip" qualifier="kafka-connector-assembly">}}
{{< download-links label="NiFi Toolkit" project="nifi" extension="-bin.zip"
qualifier="toolkit">}}
### NiFi {{< param previousProjectVersion >}} https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version{{<
param previousProjectVersion >}}">Release Notes
svn commit: r69247 - /release/nifi/2.0.0-M2/
Author: exceptionfactory Date: Fri May 17 04:21:14 2024 New Revision: 69247 Log: NIFI-13219 Removed: release/nifi/2.0.0-M2/
(nifi-site) branch main updated: NIFI-13219 Updated current version to 2.0.0-M3
This is an automated email from the ASF dual-hosted git repository. exceptionfactory 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 e6eab3a1 NIFI-13219 Updated current version to 2.0.0-M3 e6eab3a1 is described below commit e6eab3a1296194762060ee26c176733691c8ea07 Author: exceptionfactory AuthorDate: Thu May 16 23:07:29 2024 -0500 NIFI-13219 Updated current version to 2.0.0-M3 --- config.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.toml b/config.toml index da785927..fca099cd 100644 --- a/config.toml +++ b/config.toml @@ -36,8 +36,8 @@ downloadPathUrl = "https://downloads.apache.org/nifi; archiveDownloadPathUrl = "https://archive.apache.org/dist/nifi; mavenCentralDownloadPathUrl = "https://repo1.maven.org/maven2/org/apache/nifi; -currentProjectVersion = "2.0.0-M2" -currentProjectVersionReleased = "2024-01-29" +currentProjectVersion = "2.0.0-M3" +currentProjectVersionReleased = "2024-05-16" previousProjectVersion = "1.26.0" previousProjectVersionReleased = "2024-05-06"
(nifi) annotated tag rel/nifi-2.0.0-M3 created (now 068b7bfd35)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to annotated tag rel/nifi-2.0.0-M3 in repository https://gitbox.apache.org/repos/asf/nifi.git at 068b7bfd35 (tag) tagging 3828a372962e8be5338c7bf96eabfd091f4a88d6 (commit) replaces nifi-2.0.0-M3-RC1 by exceptionfactory on Thu May 16 23:04:54 2024 -0500 - Log - NIFI-13219 Tagged NiFi 2.0.0-M3 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEsYYTFzI3dQ26sKK5KbalLSqujboFAmZG12YACgkQKbalLSqu jbqzVRAAvUi77uGCVtngS39I7jbCQOiiscTJLZSjMqSzuV1wq48uHQE8Hrgukc4W Mdk615Vv00++JmDXoROxsdE8/tK0pM9WcwWY447kK83bRQ5tyUBnbnvs8AhtRnun uEW3aUYaPzILhH3dOJ4d2jKZTmoxxBSphrIAVGRBAkTZ4BAD+VUP1upATvxpRpEc bgCqH053Mycn+VWF6zwvYGEYS56ATtpd0rMf/ZoWB2+TyEiyVfJbDBm3ZAen6TKG 2tce66o1lUkh8DyO/30/aHufWb0ujH1FlEJryvymTATiHVZ/9I8c0hHZENiPEM1h ZBW8yYlF/SXn2g4r2MDyith3eSVAI2W8aEjmRb0o4IoRIDF2WDfiQSusNfQmDQAu PfHtW/DWH0h749JirN8U3BBWNV55c1it0zFsn+fs3Q8XvI3ggZMGr+wuxKanC/6n pfyyzrjcrJDqaLLPhNWDcBwbjj8wXJdm878GyDN5Rphc5EHhjvSzqPlyHxvEuhmt BHvLX5r6J0jr/Hd3AZsel4Tuq6/IWzBl6waFlX6Z2fgAwupTw8EDZPdNz/HV5C0x 7Fi1NTLBaDGuPKI+z0WLM20BItw8VMcywJ+RVk8LV5CI+M4g87JwgOPfSasltSsb gv2snE7XhpitFWHSt/POsE+nFN4U56txNwRizFS2tYGvJdSc/PI= =educ -END PGP SIGNATURE- --- No new revisions were added by this update.
svn commit: r69246 - /dev/nifi/nifi-2.0.0-M3/ /release/nifi/2.0.0-M3/
Author: exceptionfactory Date: Fri May 17 04:00:11 2024 New Revision: 69246 Log: NIFI-13219 Added: release/nifi/2.0.0-M3/ - copied from r69245, dev/nifi/nifi-2.0.0-M3/ Removed: dev/nifi/nifi-2.0.0-M3/
(nifi) branch support/nifi-1.x updated (801a14e7cf -> be62d80a89)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git from 801a14e7cf NIFI-12669 Fixed ByteArrayOutputStream.toString() for Java 8 in EvaluateXQuery add be62d80a89 NIFI-12896 Added Endpoint Override URL property for PutSNS Processor No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/nifi/processors/aws/sns/PutSNS.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(nifi) branch support/nifi-1.x updated: NIFI-12669 Fixed ByteArrayOutputStream.toString() for Java 8 in EvaluateXQuery
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 801a14e7cf NIFI-12669 Fixed ByteArrayOutputStream.toString() for Java
8 in EvaluateXQuery
801a14e7cf is described below
commit 801a14e7cf1217a7a6bab2234a6dd18867ce57bf
Author: sujkim
AuthorDate: Mon Mar 18 10:58:04 2024 -0500
NIFI-12669 Fixed ByteArrayOutputStream.toString() for Java 8 in
EvaluateXQuery
---
.../main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java
index 297c7ef998..73dff31275 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateXQuery.java
@@ -370,7 +370,7 @@ public class EvaluateXQuery extends AbstractProcessor {
private String formatItem(XdmItem item, ProcessContext context) throws
IOException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
writeFormattedItem(item, context, baos);
-return baos.toString(StandardCharsets.UTF_8);
+return baos.toString(StandardCharsets.UTF_8.toString());
}
void writeFormattedItem(XdmItem item, ProcessContext context, OutputStream
out) throws IOException {
(nifi) branch main updated (ea48d22fba -> eaf3f23100)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from ea48d22fba NIFI-12896 Add Endpoint Override URL property for PutSNS Processor add eaf3f23100 NIFI-13228 Fixed Jolt Transform Custom UI with updated property names No new revisions were added by this update. Summary of changes: .../src/main/webapp/app/transformjson/transformjson.controller.js | 4 ++-- .../nifi/web/standard/api/processor/TestProcessorResource.java| 6 +++--- .../web/standard/api/transformjson/TestTransformJSONResource.java | 8 3 files changed, 9 insertions(+), 9 deletions(-)
(nifi) branch main updated: NIFI-12896 Add Endpoint Override URL property for PutSNS Processor
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 ea48d22fba NIFI-12896 Add Endpoint Override URL property for PutSNS
Processor
ea48d22fba is described below
commit ea48d22fba666cc5ec70db70ccd4a13da07acff8
Author: sujkim
AuthorDate: Mon Mar 18 15:58:04 2024 +
NIFI-12896 Add Endpoint Override URL property for PutSNS Processor
This closes #8529
Signed-off-by: David Handermann
---
.../org/apache/nifi/processors/aws/sns/PutSNS.java | 1 +
.../apache/nifi/processors/aws/sns/ITPutSNS.java | 118 +
2 files changed, 119 insertions(+)
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sns/PutSNS.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sns/PutSNS.java
index 1450bbc24e..8365203ee7 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sns/PutSNS.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sns/PutSNS.java
@@ -130,6 +130,7 @@ public class PutSNS extends
AbstractAwsSyncProcessorhttp://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.processors.aws.sns;
+
+import org.apache.nifi.processor.Processor;
+import org.apache.nifi.processors.aws.testutil.AuthUtils;
+import org.apache.nifi.processors.aws.v2.AbstractAwsProcessor;
+import org.apache.nifi.util.TestRunner;
+import org.apache.nifi.util.TestRunners;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.localstack.LocalStackContainer;
+import org.testcontainers.utility.DockerImageName;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.sns.SnsClient;
+import software.amazon.awssdk.services.sns.model.CreateTopicRequest;
+import software.amazon.awssdk.services.sns.model.CreateTopicResponse;
+
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Provides integration level testing with actual AWS S3 resources for {@link
PutSNS} and requires additional configuration and resources to work.
+ */
+public class ITPutSNS {
+
+private static final DockerImageName localstackImage =
DockerImageName.parse("localstack/localstack:latest");
+
+private static final LocalStackContainer localstack = new
LocalStackContainer(localstackImage)
+.withServices(LocalStackContainer.Service.SNS);
+
+private static final String CREDENTIALS_FILE =
"src/test/resources/mock-aws-credentials.properties";
+private static String topicARN;
+private static SnsClient client;
+
+@BeforeAll
+public static void setup() throws InterruptedException {
+localstack.start();
+
+client = SnsClient.builder()
+.endpointOverride(localstack.getEndpoint())
+.credentialsProvider(
+StaticCredentialsProvider.create(
+
AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())
+)
+)
+.region(Region.of(localstack.getRegion()))
+.build();
+
+final CreateTopicResponse response =
client.createTopic(CreateTopicRequest.builder()
+.name("SnsSystemTest")
+.build());
+assertTrue(response.sdkHttpResponse().isSuccessful());
+topicARN = response.topicArn();
+}
+
+@AfterAll
+public static void shutdown() {
+client.close();
+localstack.stop();
+}
+
+@Test
+public void testPublish() throws IOException {
+final TestRunner runner = initRunner(PutSNS.class);
+AuthUtils.enableAccessKey(runner, localstack.getAccessKey(),
localstack.getSecretKey());
+assertTrue(runner.setProperty("DynamicProperty", "hello!").isValid());
+
+final Map attrs = new HashMap<>();
+attrs.put("filename", "1.txt");
+r
(nifi) branch main updated: NIFI-13225 Replaced most of the deprecated elements in Registry JwtService
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 4ccf3a288c NIFI-13225 Replaced most of the deprecated elements in
Registry JwtService
4ccf3a288c is described below
commit 4ccf3a288c5bea758f0e1d59b0385cdeb47aeef3
Author: dan-s1
AuthorDate: Mon May 13 22:38:36 2024 +
NIFI-13225 Replaced most of the deprecated elements in Registry JwtService
This closes #8827
Signed-off-by: David Handermann
---
.../security/authentication/jwt/JwtService.java| 27 +++---
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/jwt/JwtService.java
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/jwt/JwtService.java
index f75966b3bb..2daf267aca 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/jwt/JwtService.java
+++
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/jwt/JwtService.java
@@ -23,10 +23,11 @@ import io.jsonwebtoken.JwsHeader;
import io.jsonwebtoken.JwtException;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.MalformedJwtException;
-import io.jsonwebtoken.SignatureAlgorithm;
-import io.jsonwebtoken.SignatureException;
import io.jsonwebtoken.SigningKeyResolverAdapter;
import io.jsonwebtoken.UnsupportedJwtException;
+import io.jsonwebtoken.security.Keys;
+import io.jsonwebtoken.security.MacAlgorithm;
+import io.jsonwebtoken.security.SignatureException;
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.registry.security.authentication.AuthenticationResponse;
import org.apache.nifi.registry.security.key.Key;
@@ -44,7 +45,7 @@ public class JwtService {
private static final org.slf4j.Logger logger =
LoggerFactory.getLogger(JwtService.class);
-private static final SignatureAlgorithm SIGNATURE_ALGORITHM =
SignatureAlgorithm.HS256;
+private static final MacAlgorithm SIGNATURE_ALGORITHM = Jwts.SIG.HS256;
private static final String KEY_ID_CLAIM = "kid";
private static final String USERNAME_CLAIM = "preferred_username";
@@ -65,15 +66,15 @@ public class JwtService {
}
// Additional validation that subject is present
-if (StringUtils.isEmpty(jws.getBody().getSubject())) {
+if (StringUtils.isEmpty(jws.getPayload().getSubject())) {
throw new JwtException("No subject available in token");
}
// TODO: Validate issuer against active IdentityProvider?
-if (StringUtils.isEmpty(jws.getBody().getIssuer())) {
+if (StringUtils.isEmpty(jws.getPayload().getIssuer())) {
throw new JwtException("No issuer available in token");
}
-return jws.getBody().getSubject();
+return jws.getPayload().getSubject();
} catch (JwtException e) {
logger.debug("The Base64 encoded JWT: " + base64EncodedToken);
final String errorMessage = "There was an error validating the
JWT";
@@ -100,7 +101,7 @@ public class JwtService {
return key.getKey().getBytes(StandardCharsets.UTF_8);
}
-}).build().parseClaimsJws(base64EncodedToken);
+}).build().parseSignedClaims(base64EncodedToken);
} catch (final MalformedJwtException | UnsupportedJwtException |
SignatureException | ExpiredJwtException | IllegalArgumentException e) {
// TODO: Exercise all exceptions to ensure none leak key material
to logs
final String errorMessage = "Unable to validate the access token.";
@@ -152,14 +153,14 @@ public class JwtService {
// TODO: Implement "jti" claim with nonce to prevent replay
attacks and allow blacklisting of revoked tokens
// Build the token
-return Jwts.builder().setSubject(identity)
-.setIssuer(issuer)
-.setAudience(audience)
+return Jwts.builder().subject(identity)
+.issuer(issuer)
+.audience().add(audience).and()
.claim(USERNAME_CLAIM, preferredUsername)
.claim(KEY_ID_CLAIM, key.getId())
-.setIssuedAt(now.getTime())
-.setExpiration(expiration.getTime())
-.signWith(SIGNATURE_ALGORITHM, keyBytes).compact();
+.issuedAt(now.getTime())
+.expiration(
(nifi) branch main updated (ee179f4acf -> 35a7e87432)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from ee179f4acf NIFI-13238 Added Checkstyle rules for whitespace add 35a7e87432 NIFI-13235 Corrected REST API Import Process Group ID Reference No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(nifi) annotated tag nifi-2.0.0-M3-RC1 created (now ba6e74fc9e)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to annotated tag nifi-2.0.0-M3-RC1 in repository https://gitbox.apache.org/repos/asf/nifi.git at ba6e74fc9e (tag) tagging f2215c6522a5571189290760c55f0317f8562cbd (commit) replaces rel/nifi-2.0.0-M2 by exceptionfactory on Mon May 13 17:29:33 2024 -0500 - Log - NIFI-13219-RC1 copy for tag nifi-2.0.0-M3-RC1 --- No new revisions were added by this update.
(nifi) branch NIFI-13219-RC1 created (now 3828a37296)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch NIFI-13219-RC1 in repository https://gitbox.apache.org/repos/asf/nifi.git at 3828a37296 NIFI-13219-RC1 prepare for next development iteration This branch includes the following new commits: new f2215c6522 NIFI-13219-RC1 prepare release nifi-2.0.0-M3-RC1 new 3828a37296 NIFI-13219-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.
svn commit: r69139 - /dev/nifi/nifi-2.0.0-M3/
Author: exceptionfactory Date: Tue May 14 03:41:15 2024 New Revision: 69139 Log: NIFI-13219 Uploaded RC1 artifacts for NiFi 2.0.0-M3 Added: dev/nifi/nifi-2.0.0-M3/ dev/nifi/nifi-2.0.0-M3/minifi-2.0.0-M3-bin.zip (with props) dev/nifi/nifi-2.0.0-M3/minifi-2.0.0-M3-bin.zip.asc dev/nifi/nifi-2.0.0-M3/minifi-2.0.0-M3-bin.zip.sha256 dev/nifi/nifi-2.0.0-M3/minifi-2.0.0-M3-bin.zip.sha512 dev/nifi/nifi-2.0.0-M3/minifi-toolkit-2.0.0-M3-bin.zip (with props) dev/nifi/nifi-2.0.0-M3/minifi-toolkit-2.0.0-M3-bin.zip.asc dev/nifi/nifi-2.0.0-M3/minifi-toolkit-2.0.0-M3-bin.zip.sha256 dev/nifi/nifi-2.0.0-M3/minifi-toolkit-2.0.0-M3-bin.zip.sha512 dev/nifi/nifi-2.0.0-M3/nifi-2.0.0-M3-bin.zip (with props) dev/nifi/nifi-2.0.0-M3/nifi-2.0.0-M3-bin.zip.asc dev/nifi/nifi-2.0.0-M3/nifi-2.0.0-M3-bin.zip.sha256 dev/nifi/nifi-2.0.0-M3/nifi-2.0.0-M3-bin.zip.sha512 dev/nifi/nifi-2.0.0-M3/nifi-2.0.0-M3-source-release.zip (with props) dev/nifi/nifi-2.0.0-M3/nifi-2.0.0-M3-source-release.zip.asc dev/nifi/nifi-2.0.0-M3/nifi-2.0.0-M3-source-release.zip.sha256 dev/nifi/nifi-2.0.0-M3/nifi-2.0.0-M3-source-release.zip.sha512 dev/nifi/nifi-2.0.0-M3/nifi-registry-2.0.0-M3-bin.zip (with props) dev/nifi/nifi-2.0.0-M3/nifi-registry-2.0.0-M3-bin.zip.asc dev/nifi/nifi-2.0.0-M3/nifi-registry-2.0.0-M3-bin.zip.sha256 dev/nifi/nifi-2.0.0-M3/nifi-registry-2.0.0-M3-bin.zip.sha512 dev/nifi/nifi-2.0.0-M3/nifi-registry-toolkit-2.0.0-M3-bin.zip (with props) dev/nifi/nifi-2.0.0-M3/nifi-registry-toolkit-2.0.0-M3-bin.zip.asc dev/nifi/nifi-2.0.0-M3/nifi-registry-toolkit-2.0.0-M3-bin.zip.sha256 dev/nifi/nifi-2.0.0-M3/nifi-registry-toolkit-2.0.0-M3-bin.zip.sha512 dev/nifi/nifi-2.0.0-M3/nifi-stateless-2.0.0-M3-bin.zip (with props) dev/nifi/nifi-2.0.0-M3/nifi-stateless-2.0.0-M3-bin.zip.asc dev/nifi/nifi-2.0.0-M3/nifi-stateless-2.0.0-M3-bin.zip.sha256 dev/nifi/nifi-2.0.0-M3/nifi-stateless-2.0.0-M3-bin.zip.sha512 dev/nifi/nifi-2.0.0-M3/nifi-toolkit-2.0.0-M3-bin.zip (with props) dev/nifi/nifi-2.0.0-M3/nifi-toolkit-2.0.0-M3-bin.zip.asc dev/nifi/nifi-2.0.0-M3/nifi-toolkit-2.0.0-M3-bin.zip.sha256 dev/nifi/nifi-2.0.0-M3/nifi-toolkit-2.0.0-M3-bin.zip.sha512 Added: dev/nifi/nifi-2.0.0-M3/minifi-2.0.0-M3-bin.zip == Binary file - no diff available. Propchange: dev/nifi/nifi-2.0.0-M3/minifi-2.0.0-M3-bin.zip -- svn:mime-type = application/octet-stream Added: dev/nifi/nifi-2.0.0-M3/minifi-2.0.0-M3-bin.zip.asc == --- dev/nifi/nifi-2.0.0-M3/minifi-2.0.0-M3-bin.zip.asc (added) +++ dev/nifi/nifi-2.0.0-M3/minifi-2.0.0-M3-bin.zip.asc Tue May 14 03:41:15 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEsYYTFzI3dQ26sKK5KbalLSqujboFAmZC3IgACgkQKbalLSqu +jborsRAAkt3LmUCfUNomA2BP+RvsbYSZ/Mj3zMGRlcWKk1HgQAZKdBdNG80gQA23 +pSgWQ2EA6eOzxH4LD+vKD9yVBJy4WsVTBaKt4LSWva9L04mfGW5HnFhPodEc1kix +Bu4EJecOupmfppVxxNAHZ00rr391jWPRcuFXgXrQByWk3wIvpO+CWktWoEjbBwqu +FrsouM8LjSDYxGmYgIkrYPKzg0ZpPscFd695OE+H1pw2NgqRVklVJ9bKnh+QyT+9 +t5BZgUlgDyTel+Gswv1I0QXrDXKHLpGF0vxfAg86WfIqRn4LYr1AjOgncWJ7aDS4 +bsLPbaca+2mjV9W4VGvQkKtGHLLIQfDe09oxrDT6MN8JBjLPxZPIFmnVI67/mWaC +rTCnnF2Oe9/ailSeAESRZ75DgYy3nTAo3zTOaG2KGwBvQ1f3RF/MAeWKnZajZ2f1 +SFmPq21bIrRYDBgmpeKMANKNspqjJULGhN9J/Z5inixoC1/bqZBFwRkty0RJ+6sP +S7VyenhL7AGfymTwkkXshH5MEhk7moWKe5s4cScYgePGU3B4dEZS38BQHV5sdOLv +CEBJO0hI/vPdyeHZgAHFKhA312l8qnTSVwvfReJMwNgZuHGfDHLzMFPy7Za4fobd ++WgHaqNVPSu/PJukdGjZNmrvYlk/U8nloGcLkQxeBxqTxfBtc34= +=InAz +-END PGP SIGNATURE- Added: dev/nifi/nifi-2.0.0-M3/minifi-2.0.0-M3-bin.zip.sha256 == --- dev/nifi/nifi-2.0.0-M3/minifi-2.0.0-M3-bin.zip.sha256 (added) +++ dev/nifi/nifi-2.0.0-M3/minifi-2.0.0-M3-bin.zip.sha256 Tue May 14 03:41:15 2024 @@ -0,0 +1 @@ +78dce8efaa9b7a1ba67ee8c2935ac3715fb926cb50544db1d2b6d2381570dd4f Added: dev/nifi/nifi-2.0.0-M3/minifi-2.0.0-M3-bin.zip.sha512 == --- dev/nifi/nifi-2.0.0-M3/minifi-2.0.0-M3-bin.zip.sha512 (added) +++ dev/nifi/nifi-2.0.0-M3/minifi-2.0.0-M3-bin.zip.sha512 Tue May 14 03:41:15 2024 @@ -0,0 +1 @@ +78f8b3b2080c2687d37871f10fa77c6d003df05a74530af6d4a399b1321ff7271d2be6bd776c2d8a0407ec2db3552da1fa42bcf033ad75f9dec212fd4949792e Added: dev/nifi/nifi-2.0.0-M3/minifi-toolkit-2.0.0-M3-bin.zip == Binary file - no diff available. Propchange: dev/nifi/nifi-2.0.0-M3/minifi-toolkit-2.0.0-M3-bin.zip -- svn:mime-type = application/octet-stream Added: dev/nifi/nifi-2.0.0-M3/minifi-toolkit-2.0.0-M3
(nifi) 01/05: NIFI-13219 Corrected phase for python-extensions-bundle plugins
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 7f536117b10d95a82f2e1d7a113af8ec917762b2 Author: exceptionfactory AuthorDate: Mon May 13 16:58:39 2024 -0500 NIFI-13219 Corrected phase for python-extensions-bundle plugins Signed-off-by: David Handermann --- nifi-python-extensions/nifi-python-extensions-bundle/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-python-extensions/nifi-python-extensions-bundle/pom.xml b/nifi-python-extensions/nifi-python-extensions-bundle/pom.xml index 6ca4bf582d..ad1ad37a10 100644 --- a/nifi-python-extensions/nifi-python-extensions-bundle/pom.xml +++ b/nifi-python-extensions/nifi-python-extensions-bundle/pom.xml @@ -48,7 +48,7 @@ unpack-dependencies -generate-test-resources +compile true META-INF, META-INF/** @@ -71,7 +71,7 @@ single -generate-test-resources +package 0775
(nifi) 05/05: NIFI-13169 Upgraded Flyway in Registry from 9.22.3 to 10.12.0
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 08cc23826ba2f4c83848d9eefbf69193d8c10b29
Author: Matt Burgess
AuthorDate: Mon May 13 14:31:11 2024 -0400
NIFI-13169 Upgraded Flyway in Registry from 9.22.3 to 10.12.0
This closes #8823
Signed-off-by: David Handermann
---
nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml | 5 +
.../org/apache/nifi/registry/db/CustomFlywayConfiguration.java| 8
.../nifi/registry/revision/jdbc/TestJdbcRevisionManager.java | 5 +++--
nifi-registry/pom.xml | 4 ++--
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
b/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
index a1afec44d5..b4580e1861 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
@@ -296,6 +296,11 @@
flyway-mysql
${flyway.version}
+
+org.flywaydb
+flyway-database-postgresql
+${flyway.version}
+
com.h2database
h2
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/CustomFlywayConfiguration.java
b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/CustomFlywayConfiguration.java
index 42e2946b70..d21046f9bd 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/CustomFlywayConfiguration.java
+++
b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/CustomFlywayConfiguration.java
@@ -20,10 +20,10 @@ import org.flywaydb.core.api.FlywayException;
import org.flywaydb.core.api.configuration.FluentConfiguration;
import org.flywaydb.core.internal.database.DatabaseType;
import org.flywaydb.core.internal.database.DatabaseTypeRegister;
-import org.flywaydb.core.internal.database.postgresql.PostgreSQLDatabaseType;
import org.flywaydb.core.internal.jdbc.JdbcUtils;
import org.flywaydb.database.mysql.MySQLDatabaseType;
import org.flywaydb.database.mysql.mariadb.MariaDBDatabaseType;
+import org.flywaydb.database.postgresql.PostgreSQLDatabaseType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import
org.springframework.boot.autoconfigure.flyway.FlywayConfigurationCustomizer;
@@ -56,7 +56,7 @@ public class CustomFlywayConfiguration implements
FlywayConfigurationCustomizer
@Override
public void customize(final FluentConfiguration configuration) {
-final DatabaseType databaseType =
getDatabaseType(configuration.getDataSource());
+final DatabaseType databaseType =
getDatabaseType(configuration.getDataSource(), configuration);
LOGGER.info("Determined database type is {}", databaseType.getName());
if (databaseType instanceof MySQLDatabaseType || databaseType
instanceof MariaDBDatabaseType) {
@@ -87,9 +87,9 @@ public class CustomFlywayConfiguration implements
FlywayConfigurationCustomizer
* @param dataSource the data source
* @return the database type
*/
-private DatabaseType getDatabaseType(final DataSource dataSource) {
+private DatabaseType getDatabaseType(final DataSource dataSource, final
org.flywaydb.core.api.configuration.Configuration configuration) {
try (final Connection connection = dataSource.getConnection()) {
-return
DatabaseTypeRegister.getDatabaseTypeForConnection(connection);
+return
DatabaseTypeRegister.getDatabaseTypeForConnection(connection, configuration);
} catch (SQLException e) {
LOGGER.error(e.getMessage(), e);
throw new FlywayException("Unable to obtain connection from Flyway
DataSource", e);
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-spring-jdbc/src/test/java/org/apache/nifi/registry/revision/jdbc/TestJdbcRevisionManager.java
b/nifi-registry/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-spring-jdbc/src/test/java/org/apache/nifi/registry/revision/jdbc/TestJdbcRevisionManager.java
index 4af747dc03..5d3d23949e 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-spring-jdbc/src/test/java/org/apache/nifi/registry/revision/jdbc/TestJdbcRevisionManager.java
+++
b/nifi-registry/nifi-registry-core/nifi-registry-revision/nifi-registry-revision-spring-jdbc/src/test/java/org/apache/nifi/registry/revision/jdbc/TestJdbcRevisionManager.java
@@ -27,6 +27,7 @@ import org.apache.nifi.registry.revision.api.RevisionUpdate;
import org.apache.nifi.registry.revision.ap
(nifi) 04/05: NIFI-13224 Replaced deprecated commons-compress IOUtils.toByteArray
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 2a45cae588967b7d7a4cfb96c9a08bec92380e6e Author: dan-s1 AuthorDate: Mon May 13 20:03:03 2024 + NIFI-13224 Replaced deprecated commons-compress IOUtils.toByteArray Replaced deprecated commons-compress IOUtils.toByteArray with commons-io IOUtils.toByteArray This closes #8825 Signed-off-by: David Handermann --- .../nifi/elasticsearch/integration/ElasticSearchClientService_IT.java | 2 +- .../src/main/java/org/apache/nifi/avro/AvroTypeUtil.java| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/integration/ElasticSearchClientService_IT.java b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/integration/ElasticSearchClientService_IT.java index 04a2cb62e6..8f10e8d53b 100644 --- a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/integration/ElasticSearchClientService_IT.java +++ b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/test/java/org/apache/nifi/elasticsearch/integration/ElasticSearchClientService_IT.java @@ -19,7 +19,7 @@ package org.apache.nifi.elasticsearch.integration; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; -import org.apache.commons.compress.utils.IOUtils; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.http.HttpEntity; import org.apache.http.entity.ContentType; diff --git a/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/main/java/org/apache/nifi/avro/AvroTypeUtil.java b/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/main/java/org/apache/nifi/avro/AvroTypeUtil.java index beb09d48ae..f05ac173a3 100644 --- a/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/main/java/org/apache/nifi/avro/AvroTypeUtil.java +++ b/nifi-extension-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/main/java/org/apache/nifi/avro/AvroTypeUtil.java @@ -55,7 +55,7 @@ import org.apache.avro.generic.GenericFixed; import org.apache.avro.generic.GenericRecord; import org.apache.avro.specific.SpecificRecord; import org.apache.avro.util.Utf8; -import org.apache.commons.compress.utils.IOUtils; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair;
(nifi) 03/05: NIFI-13223 Replaced deprecated commons-lang3 classes with commons-text versions
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 92ed464f5dda1ede412f144928655494032e8734
Author: dan-s1
AuthorDate: Mon May 13 19:07:44 2024 +
NIFI-13223 Replaced deprecated commons-lang3 classes with commons-text
versions
Replaced commons-lang3 CharSequenceTranslator, AggregateTranslator,
LookupTranslator and UnicodeUnpairedSurrogateRemover with commons-text
replacements.
This closes #8824
Signed-off-by: David Handermann
---
.../nifi-framework/nifi-framework-core-api/pom.xml| 4
.../java/org/apache/nifi/util/CharacterFilterUtils.java | 15 ---
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
index e6b8c24349..56540b7854 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
@@ -76,6 +76,10 @@ language governing permissions and limitations under the
License. -->
org.apache.commons
commons-lang3
+
+org.apache.commons
+commons-text
+
org.apache.nifi
nifi-expression-language
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/util/CharacterFilterUtils.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/util/CharacterFilterUtils.java
index e363cd841f..295dd101da 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/util/CharacterFilterUtils.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/util/CharacterFilterUtils.java
@@ -17,13 +17,15 @@
package org.apache.nifi.util;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.text.translate.AggregateTranslator;
-import org.apache.commons.lang3.text.translate.CharSequenceTranslator;
-import org.apache.commons.lang3.text.translate.LookupTranslator;
-import org.apache.commons.lang3.text.translate.UnicodeUnpairedSurrogateRemover;
+import org.apache.commons.text.translate.AggregateTranslator;
+import org.apache.commons.text.translate.CharSequenceTranslator;
+import org.apache.commons.text.translate.LookupTranslator;
+import org.apache.commons.text.translate.UnicodeUnpairedSurrogateRemover;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
public class CharacterFilterUtils {
@@ -33,9 +35,8 @@ public class CharacterFilterUtils {
"\u0017", "\u0018", "\u0019", "\u001a", "\u001b", "\u001c",
"\u001d", "\u001e", "\u001f", "\ufffe",
"\u");
-private static final String[][] INVALID_XML_CHARACTER_MAPPING =
INVALID_XML_CHARACTERS.stream()
-.map(invalidCharacter -> new String[] { invalidCharacter,
StringUtils.EMPTY })
-.toArray(String[][]::new);
+private static final Map
INVALID_XML_CHARACTER_MAPPING = INVALID_XML_CHARACTERS.stream()
+.collect(Collectors.toMap(invalidXmlCharacter ->
invalidXmlCharacter, invalidXmlCharacter -> StringUtils.EMPTY));
private static final CharSequenceTranslator INVALID_XML_CHARACTER_FILTER =
new AggregateTranslator(
new LookupTranslator(INVALID_XML_CHARACTER_MAPPING),
(nifi) 02/05: NIFI-13222 Replaced deprecated commons-compress IOUtils.closeQuietly
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 5d702671f63b75e50a8675d981df5981916abda5 Author: dan-s1 AuthorDate: Mon May 13 17:57:37 2024 + NIFI-13222 Replaced deprecated commons-compress IOUtils.closeQuietly This closes #8822 Signed-off-by: David Handermann --- c2/c2-client-bundle/c2-client-service/pom.xml | 4 .../c2/client/service/operation/TransferDebugOperationHandler.java| 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/c2/c2-client-bundle/c2-client-service/pom.xml b/c2/c2-client-bundle/c2-client-service/pom.xml index 7a9260f7e9..eb03b5c6be 100644 --- a/c2/c2-client-bundle/c2-client-service/pom.xml +++ b/c2/c2-client-bundle/c2-client-service/pom.xml @@ -52,6 +52,10 @@ limitations under the License. c2-protocol-api 2.0.0-SNAPSHOT + +commons-io +commons-io + org.apache.commons commons-compress diff --git a/c2/c2-client-bundle/c2-client-service/src/main/java/org/apache/nifi/c2/client/service/operation/TransferDebugOperationHandler.java b/c2/c2-client-bundle/c2-client-service/src/main/java/org/apache/nifi/c2/client/service/operation/TransferDebugOperationHandler.java index f44f39246e..4544b07dd8 100644 --- a/c2/c2-client-bundle/c2-client-service/src/main/java/org/apache/nifi/c2/client/service/operation/TransferDebugOperationHandler.java +++ b/c2/c2-client-bundle/c2-client-service/src/main/java/org/apache/nifi/c2/client/service/operation/TransferDebugOperationHandler.java @@ -24,7 +24,7 @@ import static java.nio.file.Files.walk; import static java.util.Collections.emptyMap; import static java.util.Optional.empty; import static java.util.Optional.ofNullable; -import static org.apache.commons.compress.utils.IOUtils.closeQuietly; +import static org.apache.commons.io.IOUtils.closeQuietly; import static org.apache.commons.lang3.StringUtils.EMPTY; import static org.apache.nifi.c2.protocol.api.C2OperationState.OperationState.FULLY_APPLIED; import static org.apache.nifi.c2.protocol.api.C2OperationState.OperationState.NOT_APPLIED;
(nifi) branch main updated (13e281d8d7 -> 08cc23826b)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 13e281d8d7 NIFI-13220 Only allow buckets with write access dropdown when starting version control new 7f536117b1 NIFI-13219 Corrected phase for python-extensions-bundle plugins new 5d702671f6 NIFI-13222 Replaced deprecated commons-compress IOUtils.closeQuietly new 92ed464f5d NIFI-13223 Replaced deprecated commons-lang3 classes with commons-text versions new 2a45cae588 NIFI-13224 Replaced deprecated commons-compress IOUtils.toByteArray new 08cc23826b NIFI-13169 Upgraded Flyway in Registry from 9.22.3 to 10.12.0 The 5 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: c2/c2-client-bundle/c2-client-service/pom.xml | 4 .../service/operation/TransferDebugOperationHandler.java | 2 +- .../integration/ElasticSearchClientService_IT.java| 2 +- .../src/main/java/org/apache/nifi/avro/AvroTypeUtil.java | 2 +- .../nifi-framework/nifi-framework-core-api/pom.xml| 4 .../java/org/apache/nifi/util/CharacterFilterUtils.java | 15 --- .../nifi-python-extensions-bundle/pom.xml | 4 ++-- .../nifi-registry-core/nifi-registry-framework/pom.xml| 5 + .../nifi/registry/db/CustomFlywayConfiguration.java | 8 .../registry/revision/jdbc/TestJdbcRevisionManager.java | 5 +++-- nifi-registry/pom.xml | 4 ++-- 11 files changed, 35 insertions(+), 20 deletions(-)
(nifi) branch main updated (0c9ef91507 -> 13e281d8d7)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 0c9ef91507 NIFI-13127 Add branching support to Registry dialogs add 13e281d8d7 NIFI-13220 Only allow buckets with write access dropdown when starting version control No new revisions were added by this update. Summary of changes: .../items/flow/save-version-dialog/save-version-dialog.component.ts| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
(nifi) branch main updated (bffacdec98 -> 0c9ef91507)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from bffacdec98 NIFI-13072: Fix MonitorActivity problems with cluster scope flow monitoring add 0c9ef91507 NIFI-13127 Add branching support to Registry dialogs No new revisions were added by this update. Summary of changes: .../flow-designer/service/registry.service.ts | 33 ++- .../pages/flow-designer/state/flow/flow.effects.ts | 59 - .../app/pages/flow-designer/state/flow/index.ts| 2 + .../change-version-dialog.html | 32 ++- .../change-version-dialog.scss | 6 +- .../import-from-registry.component.html| 265 +++-- .../import-from-registry.component.scss| 6 +- .../import-from-registry.component.ts | 88 +-- .../save-version-dialog.component.html | 20 ++ .../save-version-dialog.component.ts | 65 - .../src/main/nifi/src/app/state/shared/index.ts| 11 + 11 files changed, 414 insertions(+), 173 deletions(-)
(nifi) 05/05: NIFI-13217 Updated ProcessSession Comments to List Immutable Attributes
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 15696ad86a2716c20d3f1889daa1f23f6e11298b
Author: EndzeitBegins <1115+endzeitbeg...@users.noreply.github.com>
AuthorDate: Sat May 11 14:25:08 2024 +0200
NIFI-13217 Updated ProcessSession Comments to List Immutable Attributes
This closes #8819
Signed-off-by: David Handermann
---
.../src/main/java/org/apache/nifi/processor/ProcessSession.java| 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git
a/nifi-api/src/main/java/org/apache/nifi/processor/ProcessSession.java
b/nifi-api/src/main/java/org/apache/nifi/processor/ProcessSession.java
index b3a33dcb3f..e6516ca68e 100644
--- a/nifi-api/src/main/java/org/apache/nifi/processor/ProcessSession.java
+++ b/nifi-api/src/main/java/org/apache/nifi/processor/ProcessSession.java
@@ -430,7 +430,8 @@ public interface ProcessSession {
/**
* Removes the attribute with the given {@code key} from the given {@link
FlowFile}.
*
- * If the {@code key} is named {@code uuid}, this method will return the
same FlowFile without removing any attribute.
+ * The attributes with the keys {@code uuid}, {@code path}, and {@code
filename} will not be removed.
+ * If the {@code key} is one of those, this method will return the same
FlowFile without removing any attribute.
*
* @param flowFile to update
* @param key of attribute to remove
@@ -447,7 +448,7 @@ public interface ProcessSession {
/**
* Removes the attributes with the given {@code keys} from the given
{@link FlowFile}.
*
- * If the set of keys contains the value {@code uuid}, this key will be
ignored.
+ * The attributes with the keys {@code uuid}, {@code path}, and {@code
filename} will not be removed.
*
* @param flowFile to update
* @param keys of attributes to remove
@@ -464,7 +465,7 @@ public interface ProcessSession {
/**
* Removes all attributes from the given {@link FlowFile} whose key
matches the given pattern.
*
- * If the pattern matches the key {@code uuid}, this key will not be
removed.
+ * The attributes with the keys {@code uuid}, {@code path}, and {@code
filename} will not be removed.
*
* @param flowFile to update
* @param keyPattern pattern to match each {@link FlowFile} attribute
against; may be null, in which case no attribute is removed
(nifi) 01/05: NIFI-13215 AWS SDK and Elasticsearch Dependencies Upgraded
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 6fc374b268726326a23a3914e0baa78abae0e514 Author: Joseph Witt AuthorDate: Fri May 10 13:32:32 2024 -0700 NIFI-13215 AWS SDK and Elasticsearch Dependencies Upgraded - Upgraded AWS SDK 1 from 1.12.718 to 1.12.719 - Upgraded AWS SDK 2 from 2.25.48 to 2.25.49 - Upgraded snowflake-ingest-sdk from 2.1.0 to 2.1.1 - Upgraded org.elasticsearch.client from 8.13.3 to 8.13.4 - Upgraded software.amazon.kinesis from 2.5.8 to 2.6.0 This closes #8814 Signed-off-by: David Handermann --- nifi-extension-bundles/nifi-aws-bundle/pom.xml | 2 +- nifi-extension-bundles/nifi-elasticsearch-bundle/pom.xml | 4 ++-- nifi-extension-bundles/nifi-snowflake-bundle/pom.xml | 2 +- pom.xml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nifi-extension-bundles/nifi-aws-bundle/pom.xml b/nifi-extension-bundles/nifi-aws-bundle/pom.xml index ecd446169a..5ff4cc5e42 100644 --- a/nifi-extension-bundles/nifi-aws-bundle/pom.xml +++ b/nifi-extension-bundles/nifi-aws-bundle/pom.xml @@ -27,7 +27,7 @@ pom - 2.5.8 + 2.6.0 diff --git a/nifi-extension-bundles/nifi-elasticsearch-bundle/pom.xml b/nifi-extension-bundles/nifi-elasticsearch-bundle/pom.xml index bb26aea04f..6b9506f9b7 100644 --- a/nifi-extension-bundles/nifi-elasticsearch-bundle/pom.xml +++ b/nifi-extension-bundles/nifi-elasticsearch-bundle/pom.xml @@ -33,7 +33,7 @@ language governing permissions and limitations under the License. --> -8.13.3 +8.13.4 @@ -88,7 +88,7 @@ language governing permissions and limitations under the License. --> -8.13.3 +8.13.4 s3cret diff --git a/nifi-extension-bundles/nifi-snowflake-bundle/pom.xml b/nifi-extension-bundles/nifi-snowflake-bundle/pom.xml index acfa2c14f3..1aebd21592 100644 --- a/nifi-extension-bundles/nifi-snowflake-bundle/pom.xml +++ b/nifi-extension-bundles/nifi-snowflake-bundle/pom.xml @@ -34,7 +34,7 @@ net.snowflake snowflake-ingest-sdk -2.1.0 +2.1.1 net.snowflake diff --git a/pom.xml b/pom.xml index 4b05e1fb5d..d6fd13dd13 100644 --- a/pom.xml +++ b/pom.xml @@ -109,8 +109,8 @@ UTF-8 UTF-8 2014 -1.12.718 - 2.25.48 +1.12.719 + 2.25.49 2.10.1 6.12.1 1.9.24
(nifi) 02/05: NIFI-13214 Replaced deprecated Lucene IndexReader methods with StoredFields
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit c66a3cf4ff6b531ed87b65f54fe3f73d5e810f16
Author: dan-s1
AuthorDate: Fri May 10 20:27:50 2024 +
NIFI-13214 Replaced deprecated Lucene IndexReader methods with StoredFields
This closes #8815
Signed-off-by: David Handermann
---
.../apache/nifi/provenance/index/lucene/LuceneEventIndex.java| 4 +++-
.../java/org/apache/nifi/provenance/index/lucene/QueryTask.java | 9 ++---
.../main/java/org/apache/nifi/provenance/lucene/DocsReader.java | 4 +++-
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/LuceneEventIndex.java
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/LuceneEventIndex.java
index 45dabfd999..60f444f988 100644
---
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/LuceneEventIndex.java
+++
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/LuceneEventIndex.java
@@ -19,6 +19,7 @@ package org.apache.nifi.provenance.index.lucene;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.StoredFields;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
@@ -333,8 +334,9 @@ public class LuceneEventIndex implements EventIndex {
try {
final IndexReader reader =
searcher.getIndexSearcher().getIndexReader();
+final StoredFields storedFields = reader.storedFields();
final int maxDocId = reader.maxDoc() - 1;
-final Document document = reader.document(maxDocId);
+final Document document = storedFields.document(maxDocId);
final long eventId =
document.getField(SearchableFields.Identifier.getSearchableFieldName()).numericValue().longValue();
logger.info("Determined that Max Event ID indexed for
Partition {} is approximately {} based on index {}", partitionName, eventId,
directory);
return eventId;
diff --git
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/QueryTask.java
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/QueryTask.java
index 368a19dc38..a6ef58a22b 100644
---
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/QueryTask.java
+++
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/QueryTask.java
@@ -18,6 +18,7 @@
package org.apache.nifi.provenance.index.lucene;
import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.StoredFields;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
@@ -125,7 +126,9 @@ public class QueryTask implements Runnable {
// Query lucene
final IndexReader indexReader =
searcher.getIndexSearcher().getIndexReader();
final TopDocs topDocs;
+final StoredFields storedFields;
try {
+ storedFields = indexReader.storedFields();
// Sort based on document id, descending. This gives us most
recent events first.
final Sort sort = new Sort(new SortField(null,
SortField.Type.DOC, true));
@@ -152,7 +155,7 @@ public class QueryTask implements Runnable {
return;
}
-final Tuple, Long> eventsAndTotalHits
= readDocuments(topDocs, indexReader);
+final Tuple, Long> eventsAndTotalHits
= readDocuments(topDocs, storedFields);
if (eventsAndTotalHits == null) {
queryResult.update(Collections.emptyList(), 0L);
@@ -174,7 +177,7 @@ public class QueryTask implements Runnable {
}
}
-private Tuple, Long> readDocuments(final
TopDocs topDocs, final IndexReader indexReader) {
+private Tuple, Long> readDocuments(final
TopDocs topDocs, final StoredFields storedFields) {
// If no topDocs is supplied, just provide a Tuple that has no records
and a hit count of 0.
(nifi) 03/05: NIFI-13216 Replaced deprecated GzipUtils methods
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 22109de2ad4516329ba7f7db10758157977646f7
Author: dan-s1
AuthorDate: Fri May 10 21:23:03 2024 +
NIFI-13216 Replaced deprecated GzipUtils methods
- Replaced isCompressedFilename and getUncompressedFilename with the API
suggested alternatives
This closes #8816
Signed-off-by: David Handermann
---
.../c2/client/service/operation/TransferDebugOperationHandler.java| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/c2/c2-client-bundle/c2-client-service/src/main/java/org/apache/nifi/c2/client/service/operation/TransferDebugOperationHandler.java
b/c2/c2-client-bundle/c2-client-service/src/main/java/org/apache/nifi/c2/client/service/operation/TransferDebugOperationHandler.java
index 98e5703bd9..f44f39246e 100644
---
a/c2/c2-client-bundle/c2-client-service/src/main/java/org/apache/nifi/c2/client/service/operation/TransferDebugOperationHandler.java
+++
b/c2/c2-client-bundle/c2-client-service/src/main/java/org/apache/nifi/c2/client/service/operation/TransferDebugOperationHandler.java
@@ -167,8 +167,8 @@ public class TransferDebugOperationHandler implements
C2OperationHandler {
Path tempDirectory = createTempDirectory(operationId);
String fileName = bundleFile.getFileName().toString();
-Path preparedFile = GzipUtils.isCompressedFilename(fileName)
-? handleGzipFile(bundleFile,
Paths.get(tempDirectory.toAbsolutePath().toString(),
GzipUtils.getUncompressedFilename(fileName)))
+Path preparedFile = GzipUtils.isCompressedFileName(fileName)
+? handleGzipFile(bundleFile,
Paths.get(tempDirectory.toAbsolutePath().toString(),
GzipUtils.getUncompressedFileName(fileName)))
: handleUncompressedFile(bundleFile,
Paths.get(tempDirectory.toAbsolutePath().toString(), fileName));
preparedFiles.add(preparedFile);
}
(nifi) branch main updated (74731b5a59 -> 15696ad86a)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 74731b5a59 [NIFI-13212] handle canvas overflow on shorter screens (#8810) new 6fc374b268 NIFI-13215 AWS SDK and Elasticsearch Dependencies Upgraded new c66a3cf4ff NIFI-13214 Replaced deprecated Lucene IndexReader methods with StoredFields new 22109de2ad NIFI-13216 Replaced deprecated GzipUtils methods new 03005aa132 NIFI-13185 Removed manual and non-working Integration Tests new 15696ad86a NIFI-13217 Updated ProcessSession Comments to List Immutable Attributes The 5 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: .github/workflows/integration-tests.yml| 1 - .../operation/TransferDebugOperationHandler.java | 4 +- .../org/apache/nifi/processor/ProcessSession.java | 7 +- ...andardHashiCorpVaultCommunicationServiceIT.java | 126 .../AwsKmsSensitivePropertyProviderIT.java | 142 ...sSecretsManagerSensitivePropertyProviderIT.java | 133 ...zureKeyVaultKeySensitivePropertyProviderIT.java | 135 .../GcpKmsSensitivePropertyProviderIT.java | 134 .../aws/kinesis/firehose/ITPutKinesisFirehose.java | 286 .../stream/ITConsumeKinesisStreamConnectAWS.java | 72 -- .../ITConsumeKinesisStreamEndpointOverride.java| 88 --- .../aws/kinesis/stream/ITPutKinesisStream.java | 421 --- .../ITPutKinesisStreamWithEndpointOverride.java| 84 --- .../nifi/processors/aws/lambda/ITPutLambda.java| 137 .../apache/nifi/processors/aws/sns/ITPutSNS.java | 78 -- nifi-extension-bundles/nifi-aws-bundle/pom.xml | 2 +- .../azure/AzureGraphUserGroupProviderIT.java | 219 -- .../cosmos/document/ITPutAzureCosmosDBRecord.java | 160 - .../storage/AbstractAzureBlobStorage_v12IT.java| 195 - .../storage/AbstractAzureDataLakeStorageIT.java| 151 .../azure/storage/AbstractAzureStorageIT.java | 132 .../azure/storage/ITCopyAzureBlobStorage_v12.java | 122 .../storage/ITDeleteAzureBlobStorage_v12.java | 194 - .../storage/ITDeleteAzureDataLakeStorage.java | 501 - .../azure/storage/ITFetchAzureBlobStorage_v12.java | 232 -- .../azure/storage/ITFetchAzureDataLakeStorage.java | 558 --- .../azure/storage/ITListAzureBlobStorage_v12.java | 223 -- .../azure/storage/ITListAzureDataLakeStorage.java | 534 -- .../azure/storage/ITMoveAzureDataLakeStorage.java | 374 -- .../azure/storage/ITPutAzureBlobStorage_v12.java | 385 -- .../azure/storage/ITPutAzureDataLakeStorage.java | 434 --- .../nifi/processors/box/AbstractBoxFileIT.java | 137 .../apache/nifi/processors/box/FetchBoxFileIT.java | 137 .../apache/nifi/processors/box/ListBoxFileIT.java | 143 .../apache/nifi/processors/box/PutBoxFileIT.java | 120 .../JsonConfigBasedBoxClientServiceIT.java | 87 --- .../nifi/processors/dropbox/AbstractDropboxIT.java | 128 .../nifi/processors/dropbox/FetchDropboxIT.java| 132 .../nifi/processors/dropbox/ListDropboxIT.java | 136 .../nifi/processors/dropbox/PutDropboxIT.java | 157 .../nifi-elasticsearch-bundle/pom.xml | 4 +- .../GremlinClientServiceControllerSettingsIT.java | 81 --- ...mlinClientServiceYamlSettingsAndBytecodeIT.java | 133 .../jms/processors/JMSPublisherConsumerIT.java | 58 -- .../apache/nifi/processors/mongodb/GetMongoIT.java | 76 -- .../processors/mongodb/gridfs/PutGridFSIT.java | 11 - .../prometheus/PrometheusReportingTaskIT.java | 18 - .../provenance/index/lucene/LuceneEventIndex.java | 4 +- .../nifi/provenance/index/lucene/QueryTask.java| 9 +- .../apache/nifi/provenance/lucene/DocsReader.java | 4 +- .../ITRedisDistributedMapCacheClientService.java | 486 - .../nifi/redis/state/ITRedisStateProvider.java | 3 +- .../salesforce/PutSalesforceObjectIT.java | 135 .../salesforce/QuerySalesforceObjectIT.java| 99 --- .../salesforce/util/SalesforceRestServiceIT.java | 78 -- .../nifi/processors/snowflake/SnowflakePipeIT.java | 122 .../service/SnowflakeConnectionPoolIT.java | 87 --- .../nifi-snowflake-bundle/pom.xml | 2 +- .../processors/standard/AbstractConversionIT.java | 388 -- .../standard/ConversionWithExplicitSchemaIT.java | 88 --- .../standard/ConversionWithSchemaInferenceIT.java | 51 -- .../TestConversions/data.int_float_string.json | 22 - .../data.int_float_string.with_header.csv | 8 - .../data.int_float_string.with_schema.av
(nifi) branch support/nifi-1.x updated: NIFI-13156 Replaced JsonParser deprecated getCurrentName() with currentName()
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 634d2bd7d3 NIFI-13156 Replaced JsonParser deprecated getCurrentName()
with currentName()
634d2bd7d3 is described below
commit 634d2bd7d33add828bab66bdeb148b1b1bc021cd
Author: dan-s1
AuthorDate: Fri May 10 14:36:25 2024 +
NIFI-13156 Replaced JsonParser deprecated getCurrentName() with
currentName()
This closes #8807
Signed-off-by: David Handermann
(cherry picked from commit 811a491ba51c3fa18cb6b6cd2fa93e5f69602909)
---
.../main/java/org/apache/nifi/json/AbstractJsonRowRecordReader.java | 4 ++--
.../main/java/org/apache/nifi/processors/hubspot/GetHubSpot.java| 6 +++---
.../apache/nifi/processors/salesforce/QuerySalesforceObject.java| 2 +-
.../main/java/org/apache/nifi/processors/shopify/GetShopify.java| 2 +-
.../main/java/org/apache/nifi/processors/zendesk/GetZendesk.java| 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/AbstractJsonRowRecordReader.java
b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/AbstractJsonRowRecordReader.java
index de524853ca..4d993b6029 100644
---
a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/AbstractJsonRowRecordReader.java
+++
b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-json-record-utils/src/main/java/org/apache/nifi/json/AbstractJsonRowRecordReader.java
@@ -149,7 +149,7 @@ public abstract class AbstractJsonRowRecordReader
implements RecordReader {
if (strategy == StartingFieldStrategy.NESTED_FIELD) {
while (jsonParser.nextToken() != null) {
-if (nestedFieldName.equals(jsonParser.getCurrentName())) {
+if (nestedFieldName.equals(jsonParser.currentName())) {
logger.debug("Parsing starting at nested field [{}]",
nestedFieldName);
break;
}
@@ -311,7 +311,7 @@ public abstract class AbstractJsonRowRecordReader
implements RecordReader {
if (jsonParser.getCurrentToken() == JsonToken.FIELD_NAME) {
jsonParser.nextToken();
-final String fieldName = jsonParser.getCurrentName();
+final String fieldName = jsonParser.currentName();
final String fieldValue = jsonParser.getValueAsString();
if (captureFieldPredicate.test(fieldName, fieldValue)) {
diff --git
a/nifi-nar-bundles/nifi-hubspot-bundle/nifi-hubspot-processors/src/main/java/org/apache/nifi/processors/hubspot/GetHubSpot.java
b/nifi-nar-bundles/nifi-hubspot-bundle/nifi-hubspot-processors/src/main/java/org/apache/nifi/processors/hubspot/GetHubSpot.java
index d624b58afe..98f378f199 100644
---
a/nifi-nar-bundles/nifi-hubspot-bundle/nifi-hubspot-processors/src/main/java/org/apache/nifi/processors/hubspot/GetHubSpot.java
+++
b/nifi-nar-bundles/nifi-hubspot-bundle/nifi-hubspot-processors/src/main/java/org/apache/nifi/processors/hubspot/GetHubSpot.java
@@ -271,17 +271,17 @@ public class GetHubSpot extends AbstractProcessor {
final JsonGenerator jsonGenerator =
JSON_FACTORY.createGenerator(out, JsonEncoding.UTF8)) {
boolean isCursorAvailable = false;
while (jsonParser.nextToken() != null) {
-if (jsonParser.getCurrentToken() == JsonToken.FIELD_NAME
&& jsonParser.getCurrentName()
+if (jsonParser.getCurrentToken() == JsonToken.FIELD_NAME
&& jsonParser.currentName()
.equals("total")) {
jsonParser.nextToken();
total.set(jsonParser.getIntValue());
}
-if (jsonParser.getCurrentToken() == JsonToken.FIELD_NAME
&& jsonParser.getCurrentName()
+if (jsonParser.getCurrentToken() == JsonToken.FIELD_NAME
&& jsonParser.currentName()
.equals("results")) {
jsonParser.nextToken();
jsonGenerator.copyCurrentStructure(jsonParser);
}
-final String fieldName = jsonParser.getCurrentName();
+final String fieldName = jsonParser.currentName();
if (PAGING_CURSOR.equals(fieldName)) {
isCursorAvailable = true;
jsonParser.nextToken();
diff --git
a/nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-processors/src/main/java/org/apache/
(nifi) branch support/nifi-1.x updated: NIFI-13208 Increased PropertyDescriptor visibility in HadoopDBCPConnectionPool
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 5bd3f74b99 NIFI-13208 Increased PropertyDescriptor visibility in
HadoopDBCPConnectionPool
5bd3f74b99 is described below
commit 5bd3f74b996cca18c439a851d5e4b47bc953382f
Author: lehelb
AuthorDate: Thu May 9 23:49:46 2024 -0500
NIFI-13208 Increased PropertyDescriptor visibility in
HadoopDBCPConnectionPool
This closes #8805
Signed-off-by: David Handermann
(cherry picked from commit 49a9f4f54460b940321fae2698464058ee0f81b4)
---
.../src/main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/src/main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java
b/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/src/main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java
index 17917f8489..cbdd7220ce 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/src/main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/src/main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java
@@ -116,7 +116,7 @@ public class HadoopDBCPConnectionPool extends
AbstractDBCPConnectionPool {
.required(true)
.build();
-static final PropertyDescriptor HADOOP_CONFIGURATION_RESOURCES = new
PropertyDescriptor.Builder()
+public static final PropertyDescriptor HADOOP_CONFIGURATION_RESOURCES =
new PropertyDescriptor.Builder()
.name("hadoop-config-resources")
.displayName("Hadoop Configuration Resources")
.description("A file, or comma separated list of files, which
contain the Hadoop configuration (core-site.xml, etc.). Without this, Hadoop "
(nifi) branch main updated (6b48e61295 -> 49a9f4f544)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 6b48e61295 [NIFI-13177] ensure consistent typography rendering (#8786) add 811a491ba5 NIFI-13156 Replaced JsonParser deprecated getCurrentName() with currentName() add 49a9f4f544 NIFI-13208 Increased PropertyDescriptor visibility in HadoopDBCPConnectionPool No new revisions were added by this update. Summary of changes: .../main/java/org/apache/nifi/json/AbstractJsonRowRecordReader.java | 4 ++-- .../main/java/org/apache/nifi/processors/hubspot/GetHubSpot.java| 6 +++--- .../apache/nifi/processors/salesforce/QuerySalesforceObject.java| 2 +- .../main/java/org/apache/nifi/processors/shopify/GetShopify.java| 2 +- .../main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java| 2 +- .../main/java/org/apache/nifi/processors/zendesk/GetZendesk.java| 2 +- 6 files changed, 9 insertions(+), 9 deletions(-)
(nifi) branch main updated (dcf66fd105 -> c09144051f)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from dcf66fd105 NIFI-13204: (#8798) add c09144051f NIFI-13206 Updated S3 Integration Tests to delete bucket encryption No new revisions were added by this update. Summary of changes: .../org/apache/nifi/processors/aws/s3/AbstractS3IT.java| 1 + .../org/apache/nifi/processors/aws/s3/ITFetchS3Object.java | 14 +++--- pom.xml| 8 3 files changed, 8 insertions(+), 15 deletions(-)
(nifi) branch support/nifi-1.x updated (99603eb6b8 -> cf199a6b8b)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git from 99603eb6b8 NIFI-13201 Deprecated Accumulo Components for Removal This closes #8793 add cf199a6b8b NIFI-13172 Deprecated nifi-kafka-connect components No new revisions were added by this update. Summary of changes: nifi-external/nifi-kafka-connect/README.md| 3 +++ .../org/apache/nifi/kafka/connect/StatelessNiFiSinkConnector.java | 4 .../java/org/apache/nifi/kafka/connect/StatelessNiFiSinkTask.java | 4 .../org/apache/nifi/kafka/connect/StatelessNiFiSourceConnector.java | 4 .../java/org/apache/nifi/kafka/connect/StatelessNiFiSourceTask.java | 4 5 files changed, 19 insertions(+)
(nifi) 02/03: NIFI-13205 Removed legacy Provenance Lucene integration test
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 44f6e2b8334d18b8bbd8f977d819b6e48eccd612
Author: Joseph Witt
AuthorDate: Thu May 9 15:55:07 2024 -0700
NIFI-13205 Removed legacy Provenance Lucene integration test
This closes #8799
Signed-off-by: David Handermann
---
.../nifi-persistent-provenance-repository/pom.xml | 18 ---
.../provenance/StartupAgainstOldLuceneIndexIT.java | 124 -
.../src/test/resources/lucene-4-prov-repo/0.prov | Bin 20634 -> 0 bytes
.../lucene-4-index-1554304717707/_0.fdt| 0
.../lucene-4-index-1554304717707/_0.fdx| 0
.../lucene-4-index-1554304717707/_1.fdt| 0
.../lucene-4-index-1554304717707/_1.fdx| 0
.../test/resources/lucene-4-prov-repo/toc/0.toc| Bin 18 -> 0 bytes
8 files changed, 142 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
index 19515b4341..106594a94c 100644
---
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
+++
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
@@ -62,22 +62,4 @@
runtime
-
-
-
-org.apache.rat
-apache-rat-plugin
-
-
-
src/test/resources/lucene-4-prov-repo/0.prov
-
src/test/resources/lucene-4-prov-repo/toc/0.toc
-
src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_0.fdt
-
src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_0.fdx
-
src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_1.fdt
-
src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_1.fdx
-
-
-
-
-
diff --git
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/StartupAgainstOldLuceneIndexIT.java
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/StartupAgainstOldLuceneIndexIT.java
deleted file mode 100644
index 8f4cf2fdb7..00
---
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/StartupAgainstOldLuceneIndexIT.java
+++ /dev/null
@@ -1,124 +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.provenance;
-
-import org.apache.nifi.authorization.Authorizer;
-import org.apache.nifi.events.EventReporter;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
-import org.mockito.Mockito;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.UUID;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-/**
- * This test is intended to ensure that we can properly startup even when
pointing to a Provenance
- * Repository that was created against the old Lucene.
- */
-@Timeout(value = 5)
-public class StartupAgainstOldLuceneIndexIT {
-
-@Test
-public void testStartup() throws IOException, InterruptedException {
-// Test startup with old lucene 4 index directory and no temp or
migrated directory.
-testStartup(false, false);
-
-// Test startup with old lucene 4 index directory and temp directory.
-testStartup(true, false);
-
-// Test startup with old lucene 4 index directory, temp directory, and
(nifi) 01/03: NIFI-13193 Set Minimum Maven Version to 3.9.6
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit d1a9043167d90cfea22043bb43e5eae6022ced80 Author: Joseph Witt AuthorDate: Thu May 9 13:05:44 2024 -0700 NIFI-13193 Set Minimum Maven Version to 3.9.6 - Upgraded Maven plugins - Upgraded SpotBugs from 4.7.3.5 to 4.8.5.0 - Upgraded asciidoctor-maven-plugin from 2.2.4 to 3.0.0 - Upgraded license-maven-plugin from 2.2.0 to 2.4.0 - Upgraded download-maven-plugin from 1.7.1 to 1.9.0 - Upgraded maven-clean-plugin from 3.3.1 to 3.3.2 - Upgraded frontend-maven-plugin from 1.14.2 to 1.15.0 - Upgraded hisrc-higherjaxb40-maven-plugin from 2.1.1 to 2.2.0 - Upgraded jacoco-maven-plugin from 0.8.11 to 0.8.12 - Upgraded swagger-maven-plugin-jakarta from 2.2.20 to 2.2.21 - Upgraded swagger-codegen-maven-plugin from 3.0.52 to 3.0.55 This closes #8797 Signed-off-by: David Handermann --- README.md | 6 +- nifi-commons/nifi-xml-processing/pom.xml | 2 +- nifi-docs/pom.xml | 2 +- .../nifi-asn1-bundle/nifi-asn1-services/pom.xml | 1 - .../nifi-box-bundle/nifi-box-nar/pom.xml | 2 +- .../nifi-py4j-bundle/nifi-python-framework/pom.xml| 3 +-- .../nifi-framework/nifi-web/nifi-web-frontend/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 +- nifi-manifest/nifi-runtime-manifest/pom.xml | 1 - .../nifi-registry-core/nifi-registry-docs/pom.xml | 2 +- nifi-registry/pom.xml | 6 -- pom.xml | 19 +-- 12 files changed, 21 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 3c86f2c732..0613359a3a 100644 --- a/README.md +++ b/README.md @@ -64,13 +64,9 @@ Apache NiFi was made for dataflow. It supports highly configurable directed grap - Pluggable fine-grained role-based authentication/authorization - Multiple teams can manage and share specific portions of the flow -## Minimum Recommendations -* JDK 21 -* Apache Maven 3.9.2 - ## Minimum Requirements * JDK 21 -* Apache Maven 3.9.2 +* Apache Maven 3.9.6 ## Getting Started diff --git a/nifi-commons/nifi-xml-processing/pom.xml b/nifi-commons/nifi-xml-processing/pom.xml index 381f33a4a4..734aa3c10e 100644 --- a/nifi-commons/nifi-xml-processing/pom.xml +++ b/nifi-commons/nifi-xml-processing/pom.xml @@ -27,7 +27,7 @@ com.github.spotbugs spotbugs-maven-plugin -4.7.3.5 +4.8.5.0 package diff --git a/nifi-docs/pom.xml b/nifi-docs/pom.xml index f2adf5118f..7d5733df08 100644 --- a/nifi-docs/pom.xml +++ b/nifi-docs/pom.xml @@ -48,7 +48,7 @@ org.asciidoctor asciidoctor-maven-plugin -2.2.4 +3.0.0 output-html diff --git a/nifi-extension-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml b/nifi-extension-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml index 1086da7f5e..1b2c66d527 100644 --- a/nifi-extension-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml +++ b/nifi-extension-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml @@ -75,7 +75,6 @@ org.codehaus.mojo exec-maven-plugin -3.1.0 compile-asn diff --git a/nifi-extension-bundles/nifi-box-bundle/nifi-box-nar/pom.xml b/nifi-extension-bundles/nifi-box-bundle/nifi-box-nar/pom.xml index 24c010405c..7e1e7e6dfd 100644 --- a/nifi-extension-bundles/nifi-box-bundle/nifi-box-nar/pom.xml +++ b/nifi-extension-bundles/nifi-box-bundle/nifi-box-nar/pom.xml @@ -44,7 +44,7 @@ org.codehaus.mojo license-maven-plugin -2.2.0 +2.4.0
(nifi) branch main updated (9cf5f947e8 -> 87776e369e)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 9cf5f947e8 NIFI-13200: Do not allow 'filename' or 'path' attribute to removed from FlowFile This closes #8791 new d1a9043167 NIFI-13193 Set Minimum Maven Version to 3.9.6 new 44f6e2b833 NIFI-13205 Removed legacy Provenance Lucene integration test new 87776e369e NIFI-13171 Removed nifi-kafka-connector in nifi-external module The 3 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: .github/workflows/ci-workflow.yml | 2 - README.md | 6 +- nifi-commons/nifi-xml-processing/pom.xml | 2 +- nifi-docs/pom.xml | 2 +- .../nifi-asn1-bundle/nifi-asn1-services/pom.xml| 1 - .../nifi-box-bundle/nifi-box-nar/pom.xml | 2 +- .../nifi-persistent-provenance-repository/pom.xml | 18 - .../provenance/StartupAgainstOldLuceneIndexIT.java | 124 -- .../src/test/resources/lucene-4-prov-repo/0.prov | Bin 20634 -> 0 bytes .../lucene-4-index-1554304717707/_0.fdt| 0 .../lucene-4-index-1554304717707/_0.fdx| 0 .../lucene-4-index-1554304717707/_1.fdt| 0 .../lucene-4-index-1554304717707/_1.fdx| 0 .../test/resources/lucene-4-prov-repo/toc/0.toc| Bin 18 -> 0 bytes .../nifi-py4j-bundle/nifi-python-framework/pom.xml | 3 +- nifi-external/nifi-kafka-connect/README.md | 487 - .../nifi-kafka-connector-assembly/LICENSE | 291 .../nifi-kafka-connector-assembly/NOTICE | 138 -- .../nifi-kafka-connector-assembly/pom.xml | 185 .../src/main/assembly/dependencies.xml | 58 --- .../nifi-kafka-connector-tests/pom.xml | 128 -- .../src/main/assembly/dependencies.xml | 33 -- .../kafka/connect/StatelessNiFiSinkTaskIT.java | 140 -- .../kafka/connect/StatelessNiFiSourceTaskIT.java | 288 .../kafka/connect/WorkingDirectoryUtilsTest.java | 222 -- .../src/test/resources/flows/Generate_Data.json| 167 --- .../src/test/resources/flows/Write_To_File.json| 312 - .../nifi-kafka-connector/pom.xml | 63 --- .../kafka/connect/StatelessKafkaConnectorUtil.java | 276 .../kafka/connect/StatelessNiFiCommonConfig.java | 269 .../kafka/connect/StatelessNiFiSinkConfig.java | 113 - .../kafka/connect/StatelessNiFiSinkConnector.java | 66 --- .../nifi/kafka/connect/StatelessNiFiSinkTask.java | 276 .../kafka/connect/StatelessNiFiSourceConfig.java | 120 - .../connect/StatelessNiFiSourceConnector.java | 87 .../kafka/connect/StatelessNiFiSourceTask.java | 295 - .../nifi/kafka/connect/WorkingDirectoryUtils.java | 100 - .../ConnectDirectoryExistsValidator.java | 51 --- .../validators/ConnectHttpUrlValidator.java| 45 -- .../ConnectRegularExpressionValidator.java | 43 -- .../connect/validators/FlowSnapshotValidator.java | 54 --- nifi-external/nifi-kafka-connect/pom.xml | 32 -- nifi-external/pom.xml | 29 -- .../nifi-web/nifi-web-frontend/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml| 2 +- nifi-manifest/nifi-runtime-manifest/pom.xml| 1 - .../nifi-registry-core/nifi-registry-docs/pom.xml | 2 +- nifi-registry/pom.xml | 6 - pom.xml| 20 +- 49 files changed, 21 insertions(+), 4540 deletions(-) delete mode 100644 nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/StartupAgainstOldLuceneIndexIT.java delete mode 100644 nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/0.prov delete mode 100644 nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_0.fdt delete mode 100644 nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_0.fdx delete mode 100644 nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_1.fdt delete mode 100644 nifi-extension-bundles/nifi-provenance-reposit
(nifi) branch main updated (53207a20a0 -> 1592b98298)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 53207a20a0 NIFI-12857 Simplified implementation of QueuePrioritizer and added tests add 1592b98298 NIFI-13194 Removed InvokeAWSGatewayApi Processor No new revisions were added by this update. Summary of changes: .../aws/wag/AbstractAWSGatewayApiProcessor.java| 630 -- .../processors/aws/wag/InvokeAWSGatewayApi.java| 401 -- .../services/org.apache.nifi.processor.Processor |1 - .../aws/wag/TestInvokeAWSGatewayApiCommon.java | 1319 .../aws/wag/TestInvokeAmazonGatewayApi.java| 54 - .../aws/wag/TestInvokeAmazonGatewayApiMock.java| 214 6 files changed, 2619 deletions(-) delete mode 100644 nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/wag/AbstractAWSGatewayApiProcessor.java delete mode 100644 nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/wag/InvokeAWSGatewayApi.java delete mode 100644 nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/wag/TestInvokeAWSGatewayApiCommon.java delete mode 100644 nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/wag/TestInvokeAmazonGatewayApi.java delete mode 100644 nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/wag/TestInvokeAmazonGatewayApiMock.java
(nifi) branch support/nifi-1.x updated (dc39334b37 -> d2993b2463)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git from dc39334b37 NIFI-13181 Updated msal4j to 1.15.0 This closes #8777 add d2993b2463 NIFI-13191 Deprecated InvokeAWSGatewayApi No new revisions were added by this update. Summary of changes: .../java/org/apache/nifi/processors/aws/wag/InvokeAWSGatewayApi.java| 2 ++ 1 file changed, 2 insertions(+)
(nifi) branch main updated: NIFI-12857 Simplified implementation of QueuePrioritizer and added tests
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 53207a20a0 NIFI-12857 Simplified implementation of QueuePrioritizer
and added tests
53207a20a0 is described below
commit 53207a20a0d2692437368ffaee594ae6e796a647
Author: EndzeitBegins <1115+endzeitbeg...@users.noreply.github.com>
AuthorDate: Sat Mar 2 00:34:07 2024 +0100
NIFI-12857 Simplified implementation of QueuePrioritizer and added tests
This closes #8466
Signed-off-by: David Handermann
---
.../nifi/controller/queue/QueuePrioritizer.java| 71 ---
.../nifi/controller/TestStandardFlowFileQueue.java | 12 +-
.../controller/queue/QueuePrioritizerTest.java | 136 +
3 files changed, 159 insertions(+), 60 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/QueuePrioritizer.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/QueuePrioritizer.java
index 7c2c1a87e5..643f8d1089 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/QueuePrioritizer.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/QueuePrioritizer.java
@@ -18,74 +18,47 @@
package org.apache.nifi.controller.queue;
import org.apache.nifi.controller.repository.FlowFileRecord;
-import org.apache.nifi.controller.repository.claim.ContentClaim;
import org.apache.nifi.flowfile.FlowFilePrioritizer;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
public class QueuePrioritizer implements Comparator,
Serializable {
private static final long serialVersionUID = 1L;
-private final transient List prioritizers = new
ArrayList<>();
+private static final Comparator penaltyComparator =
Comparator
+.comparing(FlowFileRecord::isPenalized)
+.thenComparingLong(record -> record.isPenalized() ?
record.getPenaltyExpirationMillis() : 0);
+private static final Comparator claimComparator =
Comparator
+.comparing(FlowFileRecord::getContentClaim,
Comparator.nullsFirst(Comparator.naturalOrder()))
+.thenComparingLong(FlowFileRecord::getContentClaimOffset);
+private static final Comparator idComparator =
Comparator.comparingLong(FlowFileRecord::getId);
+
+private final transient List prioritizers;
public QueuePrioritizer(final List priorities) {
-if (null != priorities) {
-prioritizers.addAll(priorities);
-}
+prioritizers = priorities == null ? List.of() :
List.copyOf(priorities);
}
@Override
public int compare(final FlowFileRecord f1, final FlowFileRecord f2) {
-int returnVal = 0;
-final boolean f1Penalized = f1.isPenalized();
-final boolean f2Penalized = f2.isPenalized();
-
-if (f1Penalized && !f2Penalized) {
-return 1;
-} else if (!f1Penalized && f2Penalized) {
-return -1;
-}
-
-if (f1Penalized && f2Penalized) {
-if (f1.getPenaltyExpirationMillis() <
f2.getPenaltyExpirationMillis()) {
-return -1;
-} else if (f1.getPenaltyExpirationMillis() >
f2.getPenaltyExpirationMillis()) {
-return 1;
-}
+final int penaltyComparisonResult = penaltyComparator.compare(f1, f2);
+if (penaltyComparisonResult != 0) {
+return penaltyComparisonResult;
}
-if (!prioritizers.isEmpty()) {
-for (final FlowFilePrioritizer prioritizer : prioritizers) {
-returnVal = prioritizer.compare(f1, f2);
-if (returnVal != 0) {
-return returnVal;
-}
+for (FlowFilePrioritizer comparator : prioritizers) {
+final int prioritizerComparisonResult = comparator.compare(f1, f2);
+if (prioritizerComparisonResult != 0) {
+return prioritizerComparisonResult;
}
}
-final ContentClaim claim1 = f1.getContentClaim();
-final ContentClaim claim2 = f2.getContentClaim();
-
-
-// put the one without a claim first
-if (claim1 == null && claim2 != null) {
-return -1;
-} else if (claim1 != null && claim2 == null) {
-return 1;
-} else if (claim1 != null && claim2 != null) {
-final int claimComparison = claim1.compareTo(claim2);
-if (claimComparison != 0) {
-return claimComparison;
-}
-
-final int
(nifi) branch main updated: NIFI-13105 Implemented FlowRegistryClient using GitHub for versioning
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 7cd1a30948 NIFI-13105 Implemented FlowRegistryClient using GitHub for
versioning
7cd1a30948 is described below
commit 7cd1a30948638c1fec113a47c835cb991a3a44fb
Author: Bryan Bende
AuthorDate: Tue Jan 30 17:29:31 2024 -0500
NIFI-13105 Implemented FlowRegistryClient using GitHub for versioning
This closes #8765
Signed-off-by: David Handermann
---
.../nifi/registry/flow/FlowRegistryClient.java | 14 +-
nifi-assembly/pom.xml | 6 +
.../nifi-github-extensions/pom.xml | 43 ++
.../apache/nifi/github/FlowSnapshotSerializer.java | 34 ++
.../nifi/github/GitHubAuthenticationType.java | 29 +
.../nifi/github/GitHubCreateContentRequest.java| 101 +++
.../nifi/github/GitHubFlowRegistryClient.java | 677 +
.../apache/nifi/github/GitHubRepositoryClient.java | 471 ++
.../nifi/github/JacksonFlowSnapshotSerializer.java | 58 ++
.../nifi/github/VersionedComponentModule.java | 64 ++
...rg.apache.nifi.registry.flow.FlowRegistryClient | 15 +
.../nifi/github/GitHubFlowRegistryClientTest.java | 202 ++
.../nifi-github-bundle/nifi-github-nar/pom.xml | 42 ++
nifi-extension-bundles/nifi-github-bundle/pom.xml | 36 ++
nifi-extension-bundles/pom.xml | 1 +
.../flow/FlowAnalyzingRegistryClientNode.java | 5 +
.../flow/StandardFlowRegistryClientNode.java | 7 +-
.../nifi/registry/flow/FlowRegistryClientNode.java | 2 +
.../apache/nifi/web/StandardNiFiServiceFacade.java | 10 +-
.../org/apache/nifi/web/api/VersionsResource.java | 2 +-
.../nifi/web/dao/impl/StandardFlowRegistryDAO.java | 7 +-
21 files changed, 1817 insertions(+), 9 deletions(-)
diff --git
a/nifi-api/src/main/java/org/apache/nifi/registry/flow/FlowRegistryClient.java
b/nifi-api/src/main/java/org/apache/nifi/registry/flow/FlowRegistryClient.java
index 749e5b880f..4436c55ef7 100644
---
a/nifi-api/src/main/java/org/apache/nifi/registry/flow/FlowRegistryClient.java
+++
b/nifi-api/src/main/java/org/apache/nifi/registry/flow/FlowRegistryClient.java
@@ -21,6 +21,7 @@ import org.apache.nifi.components.ConfigurableComponent;
import java.io.IOException;
import java.util.Optional;
import java.util.Set;
+import java.util.UUID;
/**
*
@@ -146,7 +147,7 @@ public interface FlowRegistryClient extends
ConfigurableComponent {
FlowRegistryBucket getBucket(FlowRegistryClientConfigurationContext
context, BucketLocation bucketLocation) throws FlowRegistryException,
IOException;
/**
- * Registers the given RegisteredFlow into the the Flow Registry.
+ * Registers the given RegisteredFlow into the Flow Registry.
*
* @param context Configuration context.
* @param flow The RegisteredFlow to add to the Registry.
@@ -252,4 +253,15 @@ public interface FlowRegistryClient extends
ConfigurableComponent {
* @throws IOException If there is issue with the communication between
NiFi and the Flow Registry.
*/
Optional getLatestVersion(FlowRegistryClientConfigurationContext
context, FlowLocation flowLocation) throws FlowRegistryException, IOException;
+
+/**
+ * Generates the id for registering a flow.
+ *
+ * @param flowName the name of the flow
+ * @return the generated id
+ */
+default String generateFlowId(final String flowName) {
+return UUID.randomUUID().toString();
+}
+
}
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 00ee910d70..6501ad0e66 100644
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -872,6 +872,12 @@ language governing permissions and limitations under the
License. -->
2.0.0-SNAPSHOT
nar
+
+org.apache.nifi
+nifi-github-nar
+2.0.0-SNAPSHOT
+nar
+
org.aspectj
diff --git
a/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/pom.xml
b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/pom.xml
new file mode 100644
index 00..be73f95343
--- /dev/null
+++ b/nifi-extension-bundles/nifi-github-bundle/nifi-github-extensions/pom.xml
@@ -0,0 +1,43 @@
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd;>
+
+4.0.0
+
+org.apache.nifi
+nifi-github-bundle
+2.0.0-SNAPSHOT
+
+nifi-github-extensions
+jar
+
+
+org.apache.nifi
+nifi-api
+
+
+org.apache.nifi
+
(nifi) branch main updated (4faad38c16 -> fe90baae8c)
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
from 4faad38c16 NIFI-13187 - Modernize Archetypes This closes #8783.
new d305a169b3 NIFI-13186 Corrected Provenance dependency for
lucene-backward-codecs
new 44dddbd739 NIFI-13189 Upgraded AWS SDK with Testcontainers and picocli
new fe90baae8c NIFI-13188 Upgraded dependency-check plugin from 8.4.3 to
9.1.0
The 3 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:
.../minifi-toolkit-encrypt-config/pom.xml | 2 +-
.../nifi-persistent-provenance-repository/pom.xml | 15 ++
.../apache/nifi/provenance/IndexConfiguration.java | 2 +-
.../index/lucene/IndexDirectoryManager.java| 24 +++-
.../provenance/index/lucene/LuceneEventIndex.java | 31 +
.../index/lucene/MigrateDefunctIndex.java | 13 +
.../provenance/StartupAgainstOldLuceneIndexIT.java | 9 +++---
.../index/lucene/TestIndexDirectoryManager.java| 26 +-
.../index/lucene/TestLuceneEventIndex.java | 32 +++---
.../_0.fdt | 0
.../_0.fdx | 0
.../_1.fdt | 0
.../_1.fdx | 0
.../nifi-provenance-repository-bundle/pom.xml | 10 ---
nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml | 2 +-
pom.xml| 8 +++---
16 files changed, 61 insertions(+), 113 deletions(-)
rename
nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/{index-1554304717707
=> lucene-4-index-1554304717707}/_0.fdt (100%)
rename
nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/{index-1554304717707
=> lucene-4-index-1554304717707}/_0.fdx (100%)
rename
nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/{index-1554304717707
=> lucene-4-index-1554304717707}/_1.fdt (100%)
rename
nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/{index-1554304717707
=> lucene-4-index-1554304717707}/_1.fdx (100%)
(nifi) 01/03: NIFI-13186 Corrected Provenance dependency for lucene-backward-codecs
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit d305a169b3d0a2f7627c1f7b76e2e16d2ba533d1
Author: Joseph Witt
AuthorDate: Wed May 8 17:20:30 2024 -0700
NIFI-13186 Corrected Provenance dependency for lucene-backward-codecs
- Updated references to lucene-9 indexes and removed legacy old style
indexes
This closes #8782
Signed-off-by: David Handermann i
---
.../nifi-persistent-provenance-repository/pom.xml | 15 ++
.../apache/nifi/provenance/IndexConfiguration.java | 2 +-
.../index/lucene/IndexDirectoryManager.java| 24 +++-
.../provenance/index/lucene/LuceneEventIndex.java | 31 +
.../index/lucene/MigrateDefunctIndex.java | 13 +
.../provenance/StartupAgainstOldLuceneIndexIT.java | 9 +++---
.../index/lucene/TestIndexDirectoryManager.java| 26 +-
.../index/lucene/TestLuceneEventIndex.java | 32 +++---
.../_0.fdt | 0
.../_0.fdx | 0
.../_1.fdt | 0
.../_1.fdx | 0
.../nifi-provenance-repository-bundle/pom.xml | 10 ---
13 files changed, 55 insertions(+), 107 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
index 8912b20012..19515b4341 100644
---
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
+++
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
@@ -52,13 +52,16 @@
nifi-repository-encryption
2.0.0-SNAPSHOT
-
org.apache.lucene
lucene-core
+
+org.apache.lucene
+lucene-backward-codecs
+runtime
+
-
@@ -68,10 +71,10 @@
src/test/resources/lucene-4-prov-repo/0.prov
src/test/resources/lucene-4-prov-repo/toc/0.toc
-
src/test/resources/lucene-4-prov-repo/index-1554304717707/_0.fdt
-
src/test/resources/lucene-4-prov-repo/index-1554304717707/_0.fdx
-
src/test/resources/lucene-4-prov-repo/index-1554304717707/_1.fdt
-
src/test/resources/lucene-4-prov-repo/index-1554304717707/_1.fdx
+
src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_0.fdt
+
src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_0.fdx
+
src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_1.fdt
+
src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_1.fdx
diff --git
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/IndexConfiguration.java
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/IndexConfiguration.java
index 0133686e54..cb280d4ddb 100644
---
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/IndexConfiguration.java
+++
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/IndexConfiguration.java
@@ -170,7 +170,7 @@ public class IndexConfiguration {
if (firstEntryTime == null) {
firstEntryTime = newIndexTimestamp;
}
-return new File(storageDirectory, "lucene-8-index-" + firstEntryTime);
+return new File(storageDirectory, "lucene-9-index-" + firstEntryTime);
}
public List getIndexDirectories() {
diff --git
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/IndexDirectoryManager.java
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/IndexDirectoryManager.java
index 7dc4e16861..3d68332843 100644
---
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/index/lucene/IndexDirectoryManager.java
+++
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-p
(nifi) 03/03: NIFI-13188 Upgraded dependency-check plugin from 8.4.3 to 9.1.0
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit fe90baae8ceb669e1c42c0a1f16d8d18187543c8 Author: Joseph Witt AuthorDate: Wed May 8 22:43:26 2024 -0700 NIFI-13188 Upgraded dependency-check plugin from 8.4.3 to 9.1.0 This closes #8784 Signed-off-by: David Handermann --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 71db4df5e5..89660403d4 100644 --- a/pom.xml +++ b/pom.xml @@ -1194,7 +1194,7 @@ org.owasp dependency-check-maven -8.4.3 +9.1.0 false
(nifi) 02/03: NIFI-13189 Upgraded AWS SDK with Testcontainers and picocli
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 44dddbd739b63168d39e4fa8a1d54ba31c1cb24f Author: Joseph Witt AuthorDate: Wed May 8 22:56:59 2024 -0700 NIFI-13189 Upgraded AWS SDK with Testcontainers and picocli - Upgraded picocli from 4.7.5 to 4.7.6 - Upgraded Testcontainers from 1.19.7 to 1.19.8 - Upgraded AWS SDK 1 from 1.12.716 to 1.12.718 - Upgraded AWS SDK 2 from 2.25.46 to 2.25.48 This closes #8785 Signed-off-by: David Handermann --- minifi/minifi-toolkit/minifi-toolkit-encrypt-config/pom.xml | 2 +- nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml| 2 +- pom.xml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/minifi/minifi-toolkit/minifi-toolkit-encrypt-config/pom.xml b/minifi/minifi-toolkit/minifi-toolkit-encrypt-config/pom.xml index c5544ff384..d4fce1b908 100644 --- a/minifi/minifi-toolkit/minifi-toolkit-encrypt-config/pom.xml +++ b/minifi/minifi-toolkit/minifi-toolkit-encrypt-config/pom.xml @@ -27,7 +27,7 @@ info.picocli picocli -4.7.5 +4.7.6 org.apache.nifi diff --git a/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml b/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml index db194ee877..1e1d4d4218 100644 --- a/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml +++ b/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml @@ -77,7 +77,7 @@ info.picocli picocli -4.7.5 +4.7.6 org.slf4j diff --git a/pom.xml b/pom.xml index a048a57444..71db4df5e5 100644 --- a/pom.xml +++ b/pom.xml @@ -110,8 +110,8 @@ UTF-8 UTF-8 2014 -1.12.716 - 2.25.46 +1.12.718 + 2.25.48 2.10.1 6.12.1 1.9.24 @@ -129,7 +129,7 @@ 4.5.14 4.4.16 1.78.1 -1.19.7 +1.19.8 2.0.13 2.9.0 10.17.1.0
(nifi) branch main updated (f4d40722fe -> 0ab5e2f741)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from f4d40722fe NIFI-13168 Upgraded QuestDB from 7.3.7 to 7.4.2 This closes #8773 add f0d0676518 NIFI-13178 Upgraded extension and framework dependencies add 0ab5e2f741 NIFI-13179 Upgraded oauth2-oidc-sdk from 9.43.4 to 11.10.1 No new revisions were added by this update. Summary of changes: minifi/minifi-bootstrap/pom.xml | 2 +- nifi-code-coverage/pom.xml| 2 +- .../nifi-azure-bundle/nifi-azure-graph-authorizer/pom.xml | 2 +- .../nifi-azure-bundle/nifi-azure-processors/pom.xml | 4 ++-- .../nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/pom.xml| 2 +- .../nifi-standard-bundle/nifi-standard-processors/pom.xml | 2 +- nifi-extension-bundles/nifi-standard-bundle/pom.xml | 2 +- .../nifi-lookup-services-bundle/nifi-lookup-services/pom.xml | 2 +- .../nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml | 2 +- nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml | 2 +- nifi-framework-bundle/pom.xml | 2 +- nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml | 2 +- nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml| 2 +- nifi-registry/nifi-registry-core/pom.xml | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-)
(nifi) branch main updated (09cf383f9b -> 096ce97530)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 09cf383f9b NIFI-13167 Replaced Hamcrest Matchers with JUnit Matchers This closes #8764 add 89ab35c955 NIFI-13166 Upgraded Jetty from 12.0.8 to 12.0.9 add 096ce97530 NIFI-13170 Upgraded Neo4j Driver to 5.20.0 No new revisions were added by this update. Summary of changes: nifi-extension-bundles/nifi-box-bundle/pom.xml | 2 +- .../nifi-graph-bundle/nifi-neo4j-cypher-service/pom.xml | 16 ++-- .../nifi-hazelcast-services/pom.xml | 2 +- .../nifi-protobuf-bundle/nifi-protobuf-services/pom.xml | 2 +- nifi-extension-bundles/nifi-protobuf-bundle/pom.xml | 2 +- pom.xml | 4 ++-- 6 files changed, 8 insertions(+), 20 deletions(-)
(nifi) branch main updated (e7567b04e2 -> 9edea70713)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from e7567b04e2 NIFI-13120 Introduce branch as a concept in Registry Client and VCI add 9edea70713 NIFI-12255 Refactored PutElasticsearchRecord and PutElasticsearchJson Relationships No new revisions were added by this update. Summary of changes: .../nifi-elasticsearch-restapi-nar/pom.xml | 4 - .../elasticsearch/AbstractPutElasticsearch.java| 63 ++- .../elasticsearch/PutElasticsearchJson.java| 107 +++-- .../elasticsearch/PutElasticsearchRecord.java | 160 .../AbstractPutElasticsearchTest.java | 28 ++ .../elasticsearch/PutElasticsearchJsonTest.java| 213 +- .../elasticsearch/PutElasticsearchRecordTest.java | 436 - .../batchWithoutError.json | 8 + .../integration/AbstractElasticsearchITBase.java | 2 +- .../nifi-elasticsearch-bundle/pom.xml | 4 +- .../org/apache/nifi/util/MockProcessContext.java | 44 +-- .../nifi/util/MockRelationshipConfiguration.java | 101 + .../nifi/util/RelationshipMigrationResult.java | 15 +- .../nifi/util/StandardProcessorTestRunner.java | 104 ++--- .../main/java/org/apache/nifi/util/TestRunner.java | 12 +- 15 files changed, 766 insertions(+), 535 deletions(-) create mode 100644 nifi-mock/src/main/java/org/apache/nifi/util/MockRelationshipConfiguration.java copy nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/BatchCounts.java => nifi-mock/src/main/java/org/apache/nifi/util/RelationshipMigrationResult.java (68%)
(nifi) branch main updated: NIFI-13163 Upgraded Lucene from 8.11.3 to 9.10.0
This is an automated email from the ASF dual-hosted git repository. exceptionfactory 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 6922abde5a NIFI-13163 Upgraded Lucene from 8.11.3 to 9.10.0 6922abde5a is described below commit 6922abde5ab989ca47be3004ce6b502bc6d83199 Author: Joseph Witt AuthorDate: Mon May 6 17:12:21 2024 -0700 NIFI-13163 Upgraded Lucene from 8.11.3 to 9.10.0 This closes #8759 Signed-off-by: David Handermann --- nifi-extension-bundles/nifi-provenance-repository-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-extension-bundles/nifi-provenance-repository-bundle/pom.xml b/nifi-extension-bundles/nifi-provenance-repository-bundle/pom.xml index 825d0e7234..970ed36dc0 100644 --- a/nifi-extension-bundles/nifi-provenance-repository-bundle/pom.xml +++ b/nifi-extension-bundles/nifi-provenance-repository-bundle/pom.xml @@ -27,7 +27,7 @@ nifi-provenance-repository-nar -8.11.3 +9.10.0
(nifi) branch main updated: NIFI-13161 Upgraded Jackson and AWS dependencies
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 ff34c41261 NIFI-13161 Upgraded Jackson and AWS dependencies
ff34c41261 is described below
commit ff34c41261737d4583f26a32dd378c8c2923c9a6
Author: Joseph Witt
AuthorDate: Mon May 6 16:24:38 2024 -0700
NIFI-13161 Upgraded Jackson and AWS dependencies
- Removed bytebuddy as was only there due to Jackson 2.17.0 mistake
- io.grpc context 1.59.0 to 1.59.1
- com.amazonaws 1.12.715 to 1.12.716
- software.amazon.awssdk 2.25.45 to 2.25.46
- jackson 2.17.0 to 2.17.1
- calcite 1.36.0 to 1.37.0
This closes #8758
Signed-off-by: David Handermann
---
minifi/minifi-assembly/pom.xml| 6 --
nifi-commons/nifi-calcite-utils/pom.xml | 4 ++--
nifi-extension-bundles/nifi-asana-bundle/pom.xml | 2 +-
.../nifi-sql-reporting-tasks/pom.xml | 2 +-
nifi-extension-bundles/nifi-standard-bundle/pom.xml | 2 +-
.../nifi-standard-shared-bom/pom.xml | 11 ---
.../nifi-standard-shared-nar/pom.xml | 5 -
pom.xml | 6 +++---
8 files changed, 8 insertions(+), 30 deletions(-)
diff --git a/minifi/minifi-assembly/pom.xml b/minifi/minifi-assembly/pom.xml
index 7c8727a023..69c7a2ce6b 100644
--- a/minifi/minifi-assembly/pom.xml
+++ b/minifi/minifi-assembly/pom.xml
@@ -313,12 +313,6 @@ limitations under the License.
jackson-core
compile
-
-net.bytebuddy
-byte-buddy
-1.14.14
-compile
-
com.fasterxml.jackson.core
jackson-databind
diff --git a/nifi-commons/nifi-calcite-utils/pom.xml
b/nifi-commons/nifi-calcite-utils/pom.xml
index 458e94c451..3613e73ed0 100644
--- a/nifi-commons/nifi-calcite-utils/pom.xml
+++ b/nifi-commons/nifi-calcite-utils/pom.xml
@@ -52,12 +52,12 @@
org.apache.calcite
calcite-linq4j
-1.36.0
+1.37.0
org.apache.calcite
calcite-core
-1.36.0
+1.37.0
commons-logging
diff --git a/nifi-extension-bundles/nifi-asana-bundle/pom.xml
b/nifi-extension-bundles/nifi-asana-bundle/pom.xml
index 1115487244..345435c379 100644
--- a/nifi-extension-bundles/nifi-asana-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-asana-bundle/pom.xml
@@ -57,7 +57,7 @@
io.grpc
grpc-context
-1.59.0
+1.59.1
diff --git
a/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml
b/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml
index 9c371dba14..6bc349d9cc 100644
---
a/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml
+++
b/nifi-extension-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml
@@ -65,7 +65,7 @@
org.apache.calcite
calcite-core
-1.36.0
+1.37.0
commons-logging
diff --git a/nifi-extension-bundles/nifi-standard-bundle/pom.xml
b/nifi-extension-bundles/nifi-standard-bundle/pom.xml
index 992105644a..b653733057 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-extension-bundles/nifi-standard-bundle/pom.xml
@@ -196,7 +196,7 @@
org.apache.calcite
calcite-core
-1.36.0
+1.37.0
log4j
diff --git
a/nifi-extension-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml
b/nifi-extension-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml
index 89bbdefba4..826474be1a 100644
---
a/nifi-extension-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml
+++
b/nifi-extension-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml
@@ -92,12 +92,6 @@
${jackson.bom.version}
provided
-
-net.bytebuddy
-byte-buddy
-1.14.14
-provided
-
org.bouncycastle
@@ -272,10 +266,6 @@
com.fasterxml.jackson.core
jackson-databind
-
-net.bytebuddy
-byte-buddy
-
org.bouncycastle
bcprov-jdk18on
@@ -378,7 +368,6
(nifi-site) branch main updated: NIFI-13133 Updated previous version to 1.26.0
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 da81df23 NIFI-13133 Updated previous version to 1.26.0
da81df23 is described below
commit da81df2347c24d671172e2e98e4acbfc092d845a
Author: exceptionfactory
AuthorDate: Mon May 6 22:33:19 2024 -0500
NIFI-13133 Updated previous version to 1.26.0
---
config.toml | 4 ++--
static/.htaccess | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/config.toml b/config.toml
index 17049d07..da785927 100644
--- a/config.toml
+++ b/config.toml
@@ -38,8 +38,8 @@ mavenCentralDownloadPathUrl =
"https://repo1.maven.org/maven2/org/apache/nifi;
currentProjectVersion = "2.0.0-M2"
currentProjectVersionReleased = "2024-01-29"
-previousProjectVersion = "1.25.0"
-previousProjectVersionReleased = "2024-01-30"
+previousProjectVersion = "1.26.0"
+previousProjectVersionReleased = "2024-05-06"
minifiCppCurrentProjectVersion = "0.15.0"
minifiCppCurrentProjectVersionReleased = "2023-09-01"
diff --git a/static/.htaccess b/static/.htaccess
index ebe3a94e..f8c13620 100644
--- a/static/.htaccess
+++ b/static/.htaccess
@@ -5,7 +5,7 @@ RewriteCond %{HTTPS} !=on
RewriteRule ^(.*)$ https://%{SERVER_NAME}%{REQUEST_URI} [L,R]
# Redirect component documentation to specified version
-RewriteRule
^docs/nifi-docs/components/org\.apache\.nifi/([^\/]+?)/[^\/]+?/(.*)$
docs/nifi-docs/components/org.apache.nifi/$1/1.25.0/$2 [L]
+RewriteRule
^docs/nifi-docs/components/org\.apache\.nifi/([^\/]+?)/[^\/]+?/(.*)$
docs/nifi-docs/components/org.apache.nifi/$1/1.26.0/$2 [L]
# Rewrite historical links
RewriteRule ^minifi/$ /projects/minifi/ [L,R]
(nifi) branch support/nifi-1.x updated (da71773ef0 -> 7b366754b7)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git from da71773ef0 NIFI-13152 Deprecated DataDogReportingTask add 7b366754b7 NIFI-13151 Deprecated Couchbase Components No new revisions were added by this update. Summary of changes: .../main/java/org/apache/nifi/couchbase/CouchbaseClusterService.java| 2 ++ .../java/org/apache/nifi/couchbase/CouchbaseKeyValueLookupService.java | 2 ++ .../main/java/org/apache/nifi/couchbase/CouchbaseMapCacheClient.java| 2 ++ .../java/org/apache/nifi/couchbase/CouchbaseRecordLookupService.java| 2 ++ .../main/java/org/apache/nifi/processors/couchbase/GetCouchbaseKey.java | 2 ++ .../main/java/org/apache/nifi/processors/couchbase/PutCouchbaseKey.java | 2 ++ 6 files changed, 12 insertions(+)
(nifi) branch support/nifi-1.x updated (00d90e3f4a -> da71773ef0)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git from 00d90e3f4a Revert "NIFI-12231 FetchSmb supports Move and Delete Completion Strategies" add da71773ef0 NIFI-13152 Deprecated DataDogReportingTask No new revisions were added by this update. Summary of changes: .../java/org/apache/nifi/reporting/datadog/DataDogReportingTask.java| 2 ++ 1 file changed, 2 insertions(+)
(nifi) branch main updated: NIFI-13149 Removed nifi-datadog-bundle
This is an automated email from the ASF dual-hosted git repository. exceptionfactory 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 030435d996 NIFI-13149 Removed nifi-datadog-bundle 030435d996 is described below commit 030435d996d8157380fdb193992fe60731788a79 Author: Joseph Witt AuthorDate: Mon May 6 10:53:19 2024 -0700 NIFI-13149 Removed nifi-datadog-bundle This closes #8751 Signed-off-by: David Handermann --- nifi-assembly/pom.xml | 6 - nifi-code-coverage/pom.xml | 5 - .../nifi-datadog-bundle/nifi-datadog-nar/pom.xml | 40 --- .../src/main/resources/META-INF/LICENSE| 262 .../src/main/resources/META-INF/NOTICE | 106 .../nifi-datadog-reporting-task/pom.xml| 72 -- .../reporting/datadog/DDMetricRegistryBuilder.java | 84 --- .../reporting/datadog/DataDogReportingTask.java| 269 - .../nifi/reporting/datadog/api/MetricBuilder.java | 84 --- .../nifi/reporting/datadog/api/MetricFields.java | 29 --- .../nifi/reporting/datadog/api/MetricsBuilder.java | 93 --- .../reporting/datadog/metrics/MetricNames.java | 60 - .../reporting/datadog/metrics/MetricsService.java | 155 .../org.apache.nifi.reporting.ReportingTask| 15 -- .../additionalDetails.html | 53 .../datadog/TestDataDogReportingTask.java | 200 --- .../nifi/reporting/datadog/TestMetricsService.java | 111 - nifi-extension-bundles/nifi-datadog-bundle/pom.xml | 30 --- nifi-extension-bundles/pom.xml | 1 - 19 files changed, 1675 deletions(-) diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml index 34342a022a..25c6996820 100644 --- a/nifi-assembly/pom.xml +++ b/nifi-assembly/pom.xml @@ -284,12 +284,6 @@ language governing permissions and limitations under the License. --> 2.0.0-SNAPSHOT nar - -org.apache.nifi -nifi-datadog-nar -2.0.0-SNAPSHOT -nar - org.apache.nifi nifi-standard-nar diff --git a/nifi-code-coverage/pom.xml b/nifi-code-coverage/pom.xml index 6265d496b0..0b389fa484 100644 --- a/nifi-code-coverage/pom.xml +++ b/nifi-code-coverage/pom.xml @@ -867,11 +867,6 @@ nifi-couchbase-services-api 2.0.0-SNAPSHOT - -org.apache.nifi -nifi-datadog-reporting-task -2.0.0-SNAPSHOT - org.apache.nifi nifi-dropbox-processors diff --git a/nifi-extension-bundles/nifi-datadog-bundle/nifi-datadog-nar/pom.xml b/nifi-extension-bundles/nifi-datadog-bundle/nifi-datadog-nar/pom.xml deleted file mode 100644 index b2c4769757..00 --- a/nifi-extension-bundles/nifi-datadog-bundle/nifi-datadog-nar/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd;> - -4.0.0 - -org.apache.nifi -nifi-datadog-bundle -2.0.0-SNAPSHOT - - -nifi-datadog-nar -nar - - - - -org.apache.nifi -nifi-datadog-reporting-task -2.0.0-SNAPSHOT - - -org.apache.nifi -nifi-standard-shared-nar -2.0.0-SNAPSHOT -nar - - - diff --git a/nifi-extension-bundles/nifi-datadog-bundle/nifi-datadog-nar/src/main/resources/META-INF/LICENSE b/nifi-extension-bundles/nifi-datadog-bundle/nifi-datadog-nar/src/main/resources/META-INF/LICENSE deleted file mode 100644 index b7b067d073..00 --- a/nifi-extension-bundles/nifi-datadog-bundle/nifi-datadog-nar/src/main/resources/META-INF/LICENSE +++ /dev/null @@ -1,262 +0,0 @@ - - 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
(nifi) branch main updated (f7dc324701 -> 52255ee813)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from f7dc324701 [NIFI-13128] add missing caution-color to invalid input port (#8731) add 52255ee813 NIFI-13108 Updated common and framework dependencies No new revisions were added by this update. Summary of changes: nifi-assembly/pom.xml | 4 +-- nifi-bom/pom.xml | 16 -- nifi-extension-bom/pom.xml | 6 ++-- .../record/TestKinesisRecordProcessorRecord.java | 4 +-- nifi-extension-bundles/nifi-azure-bundle/pom.xml | 2 +- .../nifi-compress-processors/pom.xml | 2 +- nifi-extension-bundles/nifi-gcp-bundle/pom.xml | 2 +- .../nifi-py4j-bundle/nifi-py4j-bridge/pom.xml | 12 ++-- .../nifi-framework-nar-bom/pom.xml | 3 -- .../flowanalysis/FlowAnalysisRuleProvider.java | 6 ++-- .../reporting/ReportingTaskProvider.java | 10 +++--- .../nifi/persistence/FlowConfigurationDAO.java | 2 +- .../nifi-framework/nifi-runtime/pom.xml| 10 ++ pom.xml| 36 +++--- 14 files changed, 63 insertions(+), 52 deletions(-)
(nifi) branch support/nifi-1.x updated: NIFI-13006 Deprecated nifi-solr-bundle components
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 c23f63ad17 NIFI-13006 Deprecated nifi-solr-bundle components
c23f63ad17 is described below
commit c23f63ad1749e9511a43fb6d276c479eb636f860
Author: Joseph Witt
AuthorDate: Fri Apr 26 11:01:46 2024 -0700
NIFI-13006 Deprecated nifi-solr-bundle components
This closes #8706
Signed-off-by: David Handermann
---
.../src/main/java/org/apache/nifi/processors/solr/GetSolr.java | 2 ++
.../main/java/org/apache/nifi/processors/solr/PutSolrContentStream.java | 2 ++
.../src/main/java/org/apache/nifi/processors/solr/PutSolrRecord.java| 2 ++
.../src/main/java/org/apache/nifi/processors/solr/QuerySolr.java| 2 ++
4 files changed, 8 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java
b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java
index ce6e3fd993..ec556fe929 100644
---
a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java
+++
b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java
@@ -23,6 +23,7 @@ import
org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
import org.apache.nifi.annotation.behavior.Stateful;
import org.apache.nifi.annotation.configuration.DefaultSchedule;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.components.AllowableValue;
@@ -96,6 +97,7 @@ import static
org.apache.nifi.processors.solr.SolrUtils.ZK_CONNECTION_TIMEOUT;
@CapabilityDescription("Queries Solr and outputs the results as a FlowFile in
the format of XML or using a Record Writer")
@Stateful(scopes = {Scope.CLUSTER}, description = "Stores latest date of Date
Field so that the same data will not be fetched multiple times.")
@DefaultSchedule(strategy = SchedulingStrategy.TIMER_DRIVEN, period = "1 min")
+@DeprecationNotice(reason = "The SOLR processors are deprecated and will be
removed in NiFi 2.x.")
public class GetSolr extends SolrProcessor {
public static final String STATE_MANAGER_FILTER = "stateManager_filter";
diff --git
a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrContentStream.java
b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrContentStream.java
index 5bfc7b7a0b..a116cb6cb7 100644
---
a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrContentStream.java
+++
b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrContentStream.java
@@ -22,6 +22,7 @@ import org.apache.nifi.annotation.behavior.DynamicProperty;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.expression.ExpressionLanguageScope;
@@ -77,6 +78,7 @@ import static
org.apache.nifi.processors.solr.SolrUtils.ZK_CONNECTION_TIMEOUT;
@CapabilityDescription("Sends the contents of a FlowFile as a ContentStream to
Solr")
@DynamicProperty(name="A Solr request parameter name", value="A Solr request
parameter value",
description="These parameters will be passed to Solr on the request")
+@DeprecationNotice(reason = "The SOLR processors are deprecated and will be
removed in NiFi 2.x.")
public class PutSolrContentStream extends SolrProcessor {
public static final PropertyDescriptor CONTENT_STREAM_PATH = new
PropertyDescriptor
diff --git
a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrRecord.java
b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrRecord.java
index 90dccfd91a..ea2dcfe635 100644
---
a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrRecord.java
+++
b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-
(nifi) branch main updated (9098c013f2 -> a20c5d9dff)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 9098c013f2 NIFI-12300 Add OAuth2 Support to RestLookupService (#8462) add a20c5d9dff NIFI-13073 Changed Flow Version from int to String No new revisions were added by this update. Summary of changes: .../nifi/flow/VersionedExternalFlowMetadata.java | 6 +-- .../apache/nifi/flow/VersionedFlowCoordinates.java | 6 +-- .../nifi/registry/flow/FlowRegistryClient.java | 14 +++--- .../apache/nifi/registry/flow/RegisterAction.java | 15 +++ .../nifi/registry/flow/RegisteredFlowSnapshot.java | 7 ++- .../flow/RegisteredFlowSnapshotMetadata.java | 6 +-- .../flow/NifiRegistryFlowRegistryClient.java | 39 +++- .../nifi/registry/flow/NifiRegistryUtil.java | 4 +- .../web/api/dto/VersionControlInformationDTO.java | 6 +-- .../StandardVersionedComponentSynchronizer.java| 2 +- .../apache/nifi/groups/StandardProcessGroup.java | 10 ++--- .../flow/FlowAnalyzingRegistryClientNode.java | 9 ++-- .../flow/StandardFlowRegistryClientNode.java | 13 +++--- .../flow/StandardVersionControlInformation.java| 10 ++--- .../flow/FlowAnalyzingRegistryClientNodeTest.java | 20 ++--- .../nifi/registry/flow/FlowRegistryClientNode.java | 7 +-- .../registry/flow/GhostFlowRegistryClient.java | 9 ++-- .../registry/flow/VersionControlInformation.java | 2 +- .../flow/mapping/NiFiRegistryFlowMapperTest.java | 2 +- .../org/apache/nifi/web/NiFiServiceFacade.java | 5 ++- .../apache/nifi/web/StandardNiFiServiceFacade.java | 21 - .../org/apache/nifi/web/api/VersionsResource.java | 2 +- .../nifi/web/dao/impl/StandardFlowRegistryDAO.java | 3 +- .../apache/nifi/web/api/TestVersionsResource.java | 2 +- .../app/pages/flow-designer/state/flow/index.ts| 17 +-- .../change-version-dialog.spec.ts | 6 +-- .../change-version-dialog/change-version-dialog.ts | 12 - .../import-from-registry.component.ts | 28 ++-- .../local-changes-dialog.spec.ts | 2 +- .../_save-version-dialog.component-theme.scss | 5 --- .../save-version-dialog.component.html | 10 ++--- .../save-version-dialog.component.scss | 9 .../nifi/src/app/service/nifi-common.service.ts| 13 ++ .../src/main/nifi/src/app/state/shared/index.ts| 2 +- .../partials/canvas/save-flow-version-dialog.jsp | 1 - .../nifi-web-ui/src/main/webapp/css/dialog.css | 11 - .../main/webapp/js/nf/canvas/nf-flow-version.js| 36 +++ .../nifi-web-ui/src/main/webapp/js/nf/nf-common.js | 18 .../nifi/registry/VersionedFlowConverter.java | 2 +- .../diff/ConciseEvolvingDifferenceDescriptor.java | 2 +- .../flow/diff/StaticDifferenceDescriptor.java | 2 +- .../nifi/registry/flow/InMemoryFlowRegistry.java | 14 +++--- .../apache/nifi/stateless/core/RegistryUtil.java | 2 +- .../nifi/stateless/core/TestRegistryUtil.java | 4 +- .../registry/FileSystemFlowRegistryClient.java | 34 -- .../apache/nifi/tests/system/NiFiClientUtil.java | 6 +-- .../tests/system/registry/RegistryClientIT.java| 35 +++ .../tests/system/stateless/StatelessBasicsIT.java | 4 +- .../cli/impl/command/nifi/pg/PGChangeVersion.java | 20 ++--- .../toolkit/cli/impl/command/nifi/pg/PGImport.java | 2 +- .../VersionedFlowSnapshotMetadataSetResult.java| 52 +- 51 files changed, 320 insertions(+), 249 deletions(-) copy minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/FunnelSchema.java => nifi-api/src/main/java/org/apache/nifi/registry/flow/RegisterAction.java (75%)
(nifi) branch main updated: NIFI-12300 Add OAuth2 Support to RestLookupService (#8462)
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 9098c013f2 NIFI-12300 Add OAuth2 Support to RestLookupService (#8462)
9098c013f2 is described below
commit 9098c013f2dbce7a73b5562598a7da0cda808489
Author: Greg Foreman
AuthorDate: Fri Apr 26 00:50:42 2024 -0400
NIFI-12300 Add OAuth2 Support to RestLookupService (#8462)
Signed-off-by: David Handermann
---
.../nifi-lookup-services/pom.xml | 4 ++
.../apache/nifi/lookup/AuthenticationStrategy.java | 51 +
.../org/apache/nifi/lookup/RestLookupService.java | 65 +++---
.../apache/nifi/lookup/TestRestLookupService.java | 32 +++
4 files changed, 143 insertions(+), 9 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
index 3926ae32a6..f4d43f0621 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
@@ -148,6 +148,10 @@
nifi-schema-registry-service-api
test
+
+org.apache.nifi
+nifi-oauth2-provider-api
+
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/AuthenticationStrategy.java
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/AuthenticationStrategy.java
new file mode 100644
index 00..854c47dd2c
--- /dev/null
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/AuthenticationStrategy.java
@@ -0,0 +1,51 @@
+/*
+ * 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.lookup;
+
+import org.apache.nifi.components.DescribedValue;
+
+public enum AuthenticationStrategy implements DescribedValue {
+
+NONE("None","No Authentication"),
+BASIC("Basic", "Basic Authentication"),
+OAUTH2("OAuth2", "OAuth2 Authentication");
+
+private final String displayName;
+private final String description;
+
+AuthenticationStrategy(final String displayName, final String description)
{
+this.displayName = displayName;
+this.description = description;
+}
+
+@Override
+public String getValue() {
+return name();
+}
+
+@Override
+public String getDisplayName() {
+return displayName;
+}
+
+@Override
+public String getDescription() {
+return description;
+}
+
+}
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/RestLookupService.java
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/RestLookupService.java
index aa3d0864b2..a319b1c761 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/RestLookupService.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/RestLookupService.java
@@ -41,6 +41,8 @@ import org.apache.nifi.components.Validator;
import org.apache.nifi.controller.AbstractControllerService;
import org.apache.nifi.controller.ConfigurationContext;
import org.apache.nifi.expression.ExpressionLanguageScope;
+import org.apache.nifi.migration.PropertyConfiguration;
+import org.apache.nifi.oauth2.OAuth2AccessTokenProvider;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.proxy.ProxyConfiguration;
import org
(nifi) branch support/nifi-1.x updated: NIFI-12960 Corrected default Protection Type in ExcelReader
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 13d4710545 NIFI-12960 Corrected default Protection Type in ExcelReader
13d4710545 is described below
commit 13d471054547eb3a8087f331d7bf62676112df5c
Author: exceptionfactory
AuthorDate: Wed Apr 24 23:40:45 2024 -0500
NIFI-12960 Corrected default Protection Type in ExcelReader
---
.../src/main/java/org/apache/nifi/excel/ExcelReader.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ExcelReader.java
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ExcelReader.java
index 24d47f3a75..3564c5af7b 100644
---
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ExcelReader.java
+++
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ExcelReader.java
@@ -118,7 +118,7 @@ public class ExcelReader extends SchemaRegistryService
implements RecordReaderFa
.description("Specifies whether an Excel spreadsheet is protected
by a password or not.")
.required(true)
.allowableValues(ProtectionType.class)
-.defaultValue(ProtectionType.UNPROTECTED)
+.defaultValue(ProtectionType.UNPROTECTED.getValue())
.build();
public static final PropertyDescriptor PASSWORD = new PropertyDescriptor
(nifi) branch main updated: NIFI-12885 Added Record Methods for Local and Offset Dates (#8502)
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 b6d044853c NIFI-12885 Added Record Methods for Local and Offset Dates
(#8502)
b6d044853c is described below
commit b6d044853cfcf568c246362bb5a337ea3bf2d951
Author: knguyen1
AuthorDate: Thu Apr 25 00:23:54 2024 -0400
NIFI-12885 Added Record Methods for Local and Offset Dates (#8502)
Signed-off-by: David Handermann
---
.../nifi/serialization/record/MapRecord.java | 24 +++-
.../apache/nifi/serialization/record/Record.java | 11 +-
.../record/ResultSetRecordSetTest.java | 5 +-
.../nifi/serialization/record/TestMapRecord.java | 126 +
.../serialization/record/util/TriFunction.java | 32 ++
.../nifi/processors/standard/TestQueryRecord.java | 2 +-
6 files changed, 167 insertions(+), 33 deletions(-)
diff --git
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/MapRecord.java
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/MapRecord.java
index ee5a5991d0..359d574990 100644
---
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/MapRecord.java
+++
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/MapRecord.java
@@ -32,11 +32,12 @@ import org.slf4j.LoggerFactory;
import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.Date;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
@@ -279,10 +280,23 @@ public class MapRecord implements Record {
}
@Override
-public Date getAsDate(final String fieldName, final String format) {
-final FieldConverter converter =
StandardFieldConverterRegistry.getRegistry().getFieldConverter(LocalDate.class);
-final LocalDate localDate =
converter.convertField(getValue(fieldName), Optional.ofNullable(format),
fieldName);
-return localDate == null ? null : java.sql.Date.valueOf(localDate);
+public LocalDate getAsLocalDate(final String fieldName, final String
format) {
+return convertFieldToDateTime(LocalDate.class, fieldName, format);
+}
+
+@Override
+public LocalDateTime getAsLocalDateTime(String fieldName, String format) {
+return convertFieldToDateTime(LocalDateTime.class, fieldName, format);
+}
+
+@Override
+public OffsetDateTime getAsOffsetDateTime(final String fieldName, final
String format) {
+return convertFieldToDateTime(OffsetDateTime.class, fieldName, format);
+}
+
+private T convertFieldToDateTime(Class clazz, String fieldName,
String format) {
+final FieldConverter converter =
StandardFieldConverterRegistry.getRegistry().getFieldConverter(clazz);
+return converter.convertField(getValue(fieldName),
Optional.ofNullable(format), fieldName);
}
@Override
diff --git
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/Record.java
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/Record.java
index 8aebe8275e..0133b0175c 100644
---
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/Record.java
+++
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/Record.java
@@ -17,10 +17,13 @@
package org.apache.nifi.serialization.record;
-import java.util.Date;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
+
import
org.apache.nifi.serialization.record.util.IllegalTypeConversionException;
public interface Record {
@@ -107,7 +110,11 @@ public interface Record {
Boolean getAsBoolean(String fieldName);
-Date getAsDate(String fieldName, String format);
+LocalDate getAsLocalDate(String fieldName, String format);
+
+LocalDateTime getAsLocalDateTime(String fieldName, String format);
+
+OffsetDateTime getAsOffsetDateTime(String fieldName, String format);
Object[] getAsArray(String fieldName);
diff --git
a/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/ResultSetRecordSetTest.java
b/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/ResultSetRecordSetTest.java
index fa594a85a6..b4fe5209dd 100644
---
a/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/ResultSetRecordSetTest.java
+++
b/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/ResultSetRecordSetTest.java
@@ -275,7 +275,6 @@ public class
(nifi) branch main updated: NIFI-13050 Add bundle dependencies info in NiFi Registry UI
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 bb44ffe357 NIFI-13050 Add bundle dependencies info in NiFi Registry UI
bb44ffe357 is described below
commit bb44ffe357e081077152357c3813dff696e89356
Author: Pierre Villard
AuthorDate: Mon Apr 15 21:26:02 2024 +0200
NIFI-13050 Add bundle dependencies info in NiFi Registry UI
This closes #8651
Signed-off-by: David Handermann
---
.../registry/nf-registry-grid-list-viewer.html | 14
.../src/main/webapp/services/nf-registry.api.js| 25 ++
.../main/webapp/services/nf-registry.service.js| 11 ++
.../explorer/grid-list/_structureElements.scss | 18
4 files changed, 68 insertions(+)
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.html
b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.html
index eeb73dd6d6..4a5e34e5b2 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.html
+++
b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.html
@@ -142,6 +142,20 @@ limitations under the License.
+
+
+
+
+
Dependencies:
+
+
+
+
+
{{dep.groupId}}:{{dep.artifactId}}:{{dep.version}}
+
+
+
+
{{snapshotMeta.comments}}
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/services/nf-registry.api.js
b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/services/nf-registry.api.js
index fbc6740afe..836a06ae6a 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/services/nf-registry.api.js
+++
b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/services/nf-registry.api.js
@@ -77,6 +77,31 @@ NfRegistryApi.prototype = {
);
},
+/**
+ * Retrieves the version details for an existing snapshot the registry has
stored.
+ *
+ * @param {string} versionUri The uri of the version to request.
+ * @returns {*}
+ */
+getDropletSnapshotVersionDetails: function (versionUri) {
+var self = this;
+var url = '../nifi-registry-api/' + versionUri;
+return this.http.get(url).pipe(
+map(function (response) {
+return response;
+}),
+catchError(function (error) {
+self.dialogService.openConfirm({
+title: 'Error',
+message: error.error,
+acceptButton: 'Ok',
+acceptButtonColor: 'fds-warn'
+});
+return of(error);
+})
+);
+},
+
/**
* Retrieves the specified versioned flow snapshot for an existing droplet
the registry has stored.
*
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/services/nf-registry.service.js
b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src
(nifi) branch support/nifi-1.x updated: NIFI-12960 Support reading password-protected files in ExcelReader
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 bf06ff4f0b NIFI-12960 Support reading password-protected files in
ExcelReader
bf06ff4f0b is described below
commit bf06ff4f0b3007c570b0efb5869103bf7c6bc183
Author: dan-s1
AuthorDate: Mon Apr 15 19:38:56 2024 +
NIFI-12960 Support reading password-protected files in ExcelReader
This closes #8658
Signed-off-by: David Handermann
(cherry picked from commit d54e85fab2464f72935421be58ccb76d14dfd49d)
---
.../java/org/apache/nifi/excel/ExcelReader.java| 52
.../org/apache/nifi/excel/ExcelRecordReader.java | 2 +-
.../nifi/excel/ExcelRecordReaderConfiguration.java | 25 ++
.../org/apache/nifi/excel/ExcelRecordSource.java | 8 +-
.../java/org/apache/nifi/excel/RowIterator.java| 7 +-
.../apache/nifi/excel/TestExcelRecordReader.java | 95 ++
6 files changed, 185 insertions(+), 4 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ExcelReader.java
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ExcelReader.java
index 25fcc449c9..24d47f3a75 100644
---
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ExcelReader.java
+++
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ExcelReader.java
@@ -21,6 +21,7 @@ import
org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnEnabled;
import org.apache.nifi.components.AllowableValue;
+import org.apache.nifi.components.DescribedValue;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.context.PropertyContext;
import org.apache.nifi.controller.ConfigurationContext;
@@ -61,6 +62,34 @@ import java.util.Map;
+ "(XSSF 2007 OOXML file format) Excel documents and not older .xls
(HSSF '97(-2007) file format) documents.")
public class ExcelReader extends SchemaRegistryService implements
RecordReaderFactory {
+public enum ProtectionType implements DescribedValue {
+UNPROTECTED("Unprotected", "An Excel spreadsheet not protected by a
password"),
+PASSWORD("Password Protected", "An Excel spreadsheet protected by a
password");
+
+ProtectionType(String displayName, String description) {
+this.displayName = displayName;
+this.description = description;
+}
+
+private final String displayName;
+private final String description;
+
+@Override
+public String getValue() {
+return name();
+}
+
+@Override
+public String getDisplayName() {
+return displayName;
+}
+
+@Override
+public String getDescription() {
+return description;
+}
+}
+
public static final PropertyDescriptor REQUIRED_SHEETS = new
PropertyDescriptor
.Builder().name("Required Sheets")
.displayName("Required Sheets")
@@ -83,6 +112,25 @@ public class ExcelReader extends SchemaRegistryService
implements RecordReaderFa
.addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR)
.build();
+public static final PropertyDescriptor PROTECTION_TYPE = new
PropertyDescriptor
+.Builder().name("Protection Type")
+.displayName("Protection Type")
+.description("Specifies whether an Excel spreadsheet is protected
by a password or not.")
+.required(true)
+.allowableValues(ProtectionType.class)
+.defaultValue(ProtectionType.UNPROTECTED)
+.build();
+
+public static final PropertyDescriptor PASSWORD = new PropertyDescriptor
+.Builder().name("Password")
+.displayName("Password")
+.description("The password for a password protected Excel
spreadsheet")
+.required(true)
+.sensitive(true)
+.addValidator(StandardValidators.NON_BLANK_VALIDATOR)
+.dependsOn(PROTECTION_TYPE, ProtectionType.PASSWORD)
+.build();
+
private volatile ConfigurationContext configurationContext;
private volatile String dateFormat;
private volatile String timeFormat;
@@ -106,6 +154,7 @@ public class ExcelReader extends SchemaRegistryService
implements RecordReaderFa
final List requiredSheets = getRequiredSheets(variables);
final int firstRow = getStartingRow(variables);
+final String pa
(nifi) branch main updated: NIFI-12960 Support reading password-protected files in ExcelReader
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 d54e85fab2 NIFI-12960 Support reading password-protected files in
ExcelReader
d54e85fab2 is described below
commit d54e85fab2464f72935421be58ccb76d14dfd49d
Author: dan-s1
AuthorDate: Mon Apr 15 19:38:56 2024 +
NIFI-12960 Support reading password-protected files in ExcelReader
This closes #8658
Signed-off-by: David Handermann
---
.../java/org/apache/nifi/excel/ExcelReader.java| 52
.../org/apache/nifi/excel/ExcelRecordReader.java | 2 +-
.../nifi/excel/ExcelRecordReaderConfiguration.java | 25 ++
.../org/apache/nifi/excel/ExcelRecordSource.java | 8 +-
.../java/org/apache/nifi/excel/RowIterator.java| 7 +-
.../apache/nifi/excel/TestExcelRecordReader.java | 95 ++
6 files changed, 185 insertions(+), 4 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ExcelReader.java
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ExcelReader.java
index 25fcc449c9..24d47f3a75 100644
---
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ExcelReader.java
+++
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ExcelReader.java
@@ -21,6 +21,7 @@ import
org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnEnabled;
import org.apache.nifi.components.AllowableValue;
+import org.apache.nifi.components.DescribedValue;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.context.PropertyContext;
import org.apache.nifi.controller.ConfigurationContext;
@@ -61,6 +62,34 @@ import java.util.Map;
+ "(XSSF 2007 OOXML file format) Excel documents and not older .xls
(HSSF '97(-2007) file format) documents.")
public class ExcelReader extends SchemaRegistryService implements
RecordReaderFactory {
+public enum ProtectionType implements DescribedValue {
+UNPROTECTED("Unprotected", "An Excel spreadsheet not protected by a
password"),
+PASSWORD("Password Protected", "An Excel spreadsheet protected by a
password");
+
+ProtectionType(String displayName, String description) {
+this.displayName = displayName;
+this.description = description;
+}
+
+private final String displayName;
+private final String description;
+
+@Override
+public String getValue() {
+return name();
+}
+
+@Override
+public String getDisplayName() {
+return displayName;
+}
+
+@Override
+public String getDescription() {
+return description;
+}
+}
+
public static final PropertyDescriptor REQUIRED_SHEETS = new
PropertyDescriptor
.Builder().name("Required Sheets")
.displayName("Required Sheets")
@@ -83,6 +112,25 @@ public class ExcelReader extends SchemaRegistryService
implements RecordReaderFa
.addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR)
.build();
+public static final PropertyDescriptor PROTECTION_TYPE = new
PropertyDescriptor
+.Builder().name("Protection Type")
+.displayName("Protection Type")
+.description("Specifies whether an Excel spreadsheet is protected
by a password or not.")
+.required(true)
+.allowableValues(ProtectionType.class)
+.defaultValue(ProtectionType.UNPROTECTED)
+.build();
+
+public static final PropertyDescriptor PASSWORD = new PropertyDescriptor
+.Builder().name("Password")
+.displayName("Password")
+.description("The password for a password protected Excel
spreadsheet")
+.required(true)
+.sensitive(true)
+.addValidator(StandardValidators.NON_BLANK_VALIDATOR)
+.dependsOn(PROTECTION_TYPE, ProtectionType.PASSWORD)
+.build();
+
private volatile ConfigurationContext configurationContext;
private volatile String dateFormat;
private volatile String timeFormat;
@@ -106,6 +154,7 @@ public class ExcelReader extends SchemaRegistryService
implements RecordReaderFa
final List requiredSheets = getRequiredSheets(variables);
final int firstRow = getStartingRow(variables);
+final String password =
configurationContext.getProperty(PASSWORD).getValue();
final ExcelR
(nifi) branch support/nifi-1.x updated: NIFI-13064: Upgrade commons-configuration2 to 2.10.1 for Registry
This is an automated email from the ASF dual-hosted git repository. exceptionfactory 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 eaca5b4fdd NIFI-13064: Upgrade commons-configuration2 to 2.10.1 for Registry eaca5b4fdd is described below commit eaca5b4fdd2f6245bbbd622a679a06372dc7fa23 Author: Mark Bathori AuthorDate: Thu Apr 18 14:55:17 2024 +0200 NIFI-13064: Upgrade commons-configuration2 to 2.10.1 for Registry This closes #8662 Signed-off-by: David Handermann --- nifi-registry/pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index aa0a7b0b5d..f9f0670861 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -215,6 +215,11 @@ nimbus-jose-jwt 9.37.3 + +org.apache.commons +commons-configuration2 +2.10.1 +
(nifi) branch main updated (90e7501a0a -> f42c2eb6bc)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 90e7501a0a [NIFI-13035] remove angular2jwt and update to node 21 except in registry (#8641) add f42c2eb6bc NIFI-13058 Corrected SeeAlso reference for JoltTransformRecord No new revisions were added by this update. Summary of changes: .../java/org/apache/nifi/processors/script/ScriptedTransformRecord.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(nifi) branch main updated: NIFI-13048 Added Build Info and NiFi API version for bundles to Registry
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 5eccc4c7e7 NIFI-13048 Added Build Info and NiFi API version for
bundles to Registry
5eccc4c7e7 is described below
commit 5eccc4c7e7825d844790f07291e79ebf815e0c19
Author: Pierre Villard
AuthorDate: Mon Apr 15 17:48:36 2024 +0200
NIFI-13048 Added Build Info and NiFi API version for bundles to Registry
This closes #8649
Signed-off-by: David Handermann
---
.../registry/nf-registry-grid-list-viewer.html | 38 --
.../main/webapp/services/nf-registry.service.js| 16 +++--
2 files changed, 49 insertions(+), 5 deletions(-)
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.html
b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.html
index 6eabf90ca3..eeb73dd6d6 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.html
+++
b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.html
@@ -102,7 +102,7 @@ limitations under the License.
-
+
-{{(snapshotMeta.timestamp/1000
| amFromUnix) | amDateFormat:'MMM-DD-'}} at {{(snapshotMeta.timestamp/1000
| amFromUnix) | amDateFormat:'h:mm A'}}
+{{(snapshotMeta.timestamp/1000
| amFromUnix) | amDateFormat:'-MM-DD'}} at {{(snapshotMeta.timestamp/1000 |
amFromUnix) | amDateFormat:'h:mm A'}}
+
+
+
+
+
+
+
+
+
+
+
+Build Information:
+
+NiFi API
Version: {{snapshotMeta.systemApiVersion}}
+Build
Branch: {{snapshotMeta.buildInfo.buildBranch}}
+Build
Flags: {{snapshotMeta.buildInfo.buildFlags}}
+Build
Revision: {{snapshotMeta.buildInfo.buildRevision}}
+Build Tag:
{{snapshotMeta.buildInfo.buildTag}}
+Build Tool:
{{snapshotMeta.buildInfo.buildTool}}
+Built By:
{{snapshotMeta.buildInfo.builtBy}}
+Built On:
{{(snapshotMeta.buildInfo.built/1000 | amFromUnix) |
amDateFormat:'-MM-DD'}} at {{(snapshotMeta.buildInfo.built/1000 |
amFromUnix) | amDateFormat:'h:mm A'}}
+
+
+
+
+{{snapshotMeta.comments}}
+
+
+No comments specified
+
+
+{{(snapshotMeta.timestamp/1000
| amFromUnix) | amDateFormat:'-MM-DD'}} at {{(snapshotMeta.timestamp/1000 |
amFromUnix) | amDateFormat:'h:mm A'}}
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/services/nf-registry.service.js
b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/services/nf-registry.service.js
index dec1a69130..c5d1a5cc88 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/services/nf-registry.service.js
+++
b/nifi-registry/nifi
(nifi) branch main updated: NIFI-13045 Support Bootstrap Listen Port property in MiNiFi
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 6eff8a9262 NIFI-13045 Support Bootstrap Listen Port property in MiNiFi
6eff8a9262 is described below
commit 6eff8a9262522b9458b195d15b01358538dba912
Author: Ferenc Kis
AuthorDate: Mon Apr 15 15:14:32 2024 +0200
NIFI-13045 Support Bootstrap Listen Port property in MiNiFi
This closes #8648
Signed-off-by: David Handermann
---
.../nifi/minifi/bootstrap/command/StartRunner.java | 25 +++---
.../service/MiNiFiExecCommandProvider.java | 3 ++-
.../minifi/bootstrap/service/MiNiFiListener.java | 6 +++---
.../nifi/minifi/bootstrap/BootstrapListener.java | 4 ++--
.../apache/nifi/minifi/StandardMiNiFiServer.java | 3 ++-
5 files changed, 31 insertions(+), 10 deletions(-)
diff --git
a/minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/command/StartRunner.java
b/minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/command/StartRunner.java
index af331fcc2b..f4d3ad8d18 100644
---
a/minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/command/StartRunner.java
+++
b/minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/command/StartRunner.java
@@ -25,6 +25,7 @@ import static
org.apache.nifi.minifi.bootstrap.RunMiNiFi.STATUS_FILE_PID_KEY;
import static org.apache.nifi.minifi.bootstrap.RunMiNiFi.UNINITIALIZED;
import static org.apache.nifi.minifi.bootstrap.Status.ERROR;
import static org.apache.nifi.minifi.bootstrap.Status.OK;
+import static
org.apache.nifi.minifi.bootstrap.service.MiNiFiExecCommandProvider.NIFI_BOOTSTRAP_LISTEN_PORT;
import static
org.apache.nifi.minifi.commons.api.MiNiFiCommandState.FULLY_APPLIED;
import static
org.apache.nifi.minifi.commons.api.MiNiFiCommandState.NOT_APPLIED_WITH_RESTART;
import static org.apache.nifi.minifi.commons.api.MiNiFiConstants.RAW_EXTENSION;
@@ -129,7 +130,7 @@ public class StartRunner implements CommandRunner {
generateMiNiFiProperties(bootstrapFileProvider.getProtectedBootstrapProperties(),
confDir);
regenerateFlowConfiguration(bootstrapProperties.getProperty(MiNiFiProperties.NIFI_MINIFI_FLOW_CONFIG.getKey()));
-Process process = startMiNiFi();
+Process process = startMiNiFi(bootstrapProperties);
try {
while (true) {
if (process.isAlive()) {
@@ -279,15 +280,33 @@ public class StartRunner implements CommandRunner {
}
}
-private Process startMiNiFi() throws IOException {
+private Process startMiNiFi(BootstrapProperties bootstrapProperties)
throws IOException {
+int bootstrapListenPort =
parseBootstrapListenPort(bootstrapProperties);
+
MiNiFiListener listener = new MiNiFiListener();
-listenPort = listener.start(runMiNiFi, bootstrapFileProvider,
configurationChangeListener);
+listenPort = listener.start(runMiNiFi, bootstrapListenPort,
bootstrapFileProvider, configurationChangeListener);
CMD_LOGGER.info("Starting Apache MiNiFi...");
return startMiNiFiProcess(getProcessBuilder());
}
+private int parseBootstrapListenPort(BootstrapProperties
bootstrapProperties) {
+String bootstrapListenPort =
bootstrapProperties.getProperty(NIFI_BOOTSTRAP_LISTEN_PORT);
+int parsedBootstrapListenPort =
Optional.ofNullable(bootstrapListenPort)
+.map(String::trim)
+.map(port -> {
+try {
+return Integer.parseInt(port);
+} catch (NumberFormatException e) {
+throw new IllegalArgumentException("Unable to parse
Bootstrap listen port, please provide a valid port for " +
NIFI_BOOTSTRAP_LISTEN_PORT);
+}
+})
+.orElse(0);
+CMD_LOGGER.info("Boostrap listen port {}", parsedBootstrapListenPort);
+return parsedBootstrapListenPort;
+}
+
private ProcessBuilder getProcessBuilder() throws IOException {
ProcessBuilder builder = new ProcessBuilder();
File workingDir = getWorkingDir();
diff --git
a/minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/service/MiNiFiExecCommandProvider.java
b/minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/service/MiNiFiExecCommandProvider.java
index 0e99379a6d..8c0035ff7c 100644
---
a/minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/service/MiNiFiExecCommandProvider.java
+++
b/minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/service/MiNiFiExecCommandProvider.java
@@ -45,6 +45,8 @@ public class MiNiFiExecCommandProvider {
public static final String DEFAULT_BOOTSTRAP_LOG_FILE_NAME =
"minifi-boots
(nifi) branch support/nifi-1.x updated: NIFI-13049 Upgraded nimbus-jose-jwt to 9.37.3 for Registry and Toolkit
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 86ddf7758c NIFI-13049 Upgraded nimbus-jose-jwt to 9.37.3 for Registry
and Toolkit
86ddf7758c is described below
commit 86ddf7758c33b813d895b7db4b593057ef8381da
Author: Mark Bathori
AuthorDate: Mon Apr 15 21:02:16 2024 +0200
NIFI-13049 Upgraded nimbus-jose-jwt to 9.37.3 for Registry and Toolkit
This closes #8650
Signed-off-by: David Handermann
---
nifi-registry/pom.xml | 5 +
nifi-toolkit/pom.xml | 5 +
2 files changed, 10 insertions(+)
diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml
index 7c2db7c69b..aa0a7b0b5d 100644
--- a/nifi-registry/pom.xml
+++ b/nifi-registry/pom.xml
@@ -210,6 +210,11 @@
sshd-sftp
${org.apache.sshd.version}
+
+com.nimbusds
+nimbus-jose-jwt
+9.37.3
+
diff --git a/nifi-toolkit/pom.xml b/nifi-toolkit/pom.xml
index 22c098e939..062099c5e1 100644
--- a/nifi-toolkit/pom.xml
+++ b/nifi-toolkit/pom.xml
@@ -74,6 +74,11 @@
netty
${netty.3.version}
+
+com.nimbusds
+nimbus-jose-jwt
+9.37.3
+
(nifi) branch main updated: NIFI-12970 Generate documentation for Python Processors
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 26e5f5a565 NIFI-12970 Generate documentation for Python Processors
26e5f5a565 is described below
commit 26e5f5a565950a4de8ded985df549c5b659a68a1
Author: Mark Bathori
AuthorDate: Thu Mar 28 18:34:11 2024 +0100
NIFI-12970 Generate documentation for Python Processors
This closes #8579
Signed-off-by: David Handermann
---
.../nifi-framework/nifi-documentation/pom.xml | 5 +
.../apache/nifi/documentation/DocGenerator.java| 55 +-
.../nifi/documentation/DocumentationWriter.java| 7 +-
.../html/AbstractHtmlDocumentationWriter.java | 355 +++
.../html/HtmlDocumentationWriter.java | 685 ++---
.../html/HtmlProcessorDocumentationWriter.java | 82 +--
.../HtmlPythonProcessorDocumentationWriter.java| 280 +
.../nifi/documentation/DocGeneratorTest.java | 1 +
...HtmlPythonProcessorDocumentationWriterTest.java | 187 ++
.../html/ProcessorDocumentationWriterTest.java | 30 +-
.../org/apache/nifi/web/server/JettyServer.java| 25 +-
.../nifi/web/docs/DocumentationController.java | 12 +-
12 files changed, 1152 insertions(+), 572 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml
index 9f9bdc60e3..86bacb3071 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml
@@ -26,6 +26,11 @@
org.apache.nifi
nifi-framework-api
+
+org.apache.nifi
+nifi-python-framework-api
+2.0.0-SNAPSHOT
+
org.apache.nifi
nifi-server-api
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/DocGenerator.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/DocGenerator.java
index e9cef0b5cb..e934302c0b 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/DocGenerator.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/DocGenerator.java
@@ -22,12 +22,14 @@ import org.apache.nifi.components.ConfigurableComponent;
import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.documentation.html.HtmlDocumentationWriter;
import org.apache.nifi.documentation.html.HtmlProcessorDocumentationWriter;
+import
org.apache.nifi.documentation.html.HtmlPythonProcessorDocumentationWriter;
import org.apache.nifi.flowanalysis.FlowAnalysisRule;
import org.apache.nifi.nar.ExtensionDefinition;
import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.nar.ExtensionMapping;
import org.apache.nifi.parameter.ParameterProvider;
import org.apache.nifi.processor.Processor;
+import org.apache.nifi.python.PythonProcessorDetails;
import org.apache.nifi.reporting.ReportingTask;
import org.apache.nifi.util.NiFiProperties;
import org.slf4j.Logger;
@@ -100,13 +102,26 @@ public class DocGenerator {
logger.debug("Documentation directory created [{}]",
componentDirectory);
}
-final Class extensionClass =
extensionManager.getClass(extensionDefinition);
-final Class componentClass =
extensionClass.asSubclass(ConfigurableComponent.class);
-try {
-logger.debug("Documentation generation started: Component
Class [{}]", componentClass);
-document(extensionManager, componentDirectory,
componentClass, coordinate);
-} catch (Exception e) {
-logger.warn("Documentation generation failed: Component
Class [{}]", componentClass, e);
+switch (extensionDefinition.getRuntime()) {
+case PYTHON -> {
+final String componentClass =
extensionDefinition.getImplementationClassName();
+final PythonProcessorDetails processorDetails =
extensionManager.getPythonProcessorDetails(componentClass,
extensionDefinition.getVersion());
+try {
+documentPython(componentDirectory,
processorDetails);
+} catch (Exception e) {
+logger.warn("Documentation generation failed:
Co
(nifi) branch main updated: NIFI-12986 Cleaned up JavaDoc in ProcessSession
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 d3ff1f53c4 NIFI-12986 Cleaned up JavaDoc in ProcessSession
d3ff1f53c4 is described below
commit d3ff1f53c473e021933fd15b45d0c61ff0a6269b
Author: EndzeitBegins <1115+endzeitbeg...@users.noreply.github.com>
AuthorDate: Mon Apr 1 18:12:13 2024 +0200
NIFI-12986 Cleaned up JavaDoc in ProcessSession
This closes #8620
Signed-off-by: David Handermann
---
.../org/apache/nifi/processor/ProcessSession.java | 1304 +---
1 file changed, 592 insertions(+), 712 deletions(-)
diff --git
a/nifi-api/src/main/java/org/apache/nifi/processor/ProcessSession.java
b/nifi-api/src/main/java/org/apache/nifi/processor/ProcessSession.java
index 9263eb8ac6..ecbb9a4019 100644
--- a/nifi-api/src/main/java/org/apache/nifi/processor/ProcessSession.java
+++ b/nifi-api/src/main/java/org/apache/nifi/processor/ProcessSession.java
@@ -38,123 +38,70 @@ import org.apache.nifi.processor.io.InputStreamCallback;
import org.apache.nifi.processor.io.OutputStreamCallback;
import org.apache.nifi.processor.io.StreamCallback;
import org.apache.nifi.provenance.ProvenanceReporter;
+import org.apache.nifi.provenance.ProvenanceEventType;
/**
- *
* A process session encompasses all the behaviors a processor can perform to
- * obtain, clone, read, modify remove FlowFiles in an atomic unit. A process
- * session is always tied to a single processor at any one time and ensures no
- * FlowFile can ever be accessed by any more than one processor at a given
time.
- * The session also ensures that all FlowFiles are always accounted for. The
- * creator of a ProcessSession is always required to manage the session.
- *
- *
+ * obtain, clone, read, modify remove {@link FlowFile}s in an atomic unit.
+ * A process session is always tied to a single {@link Processor} at any one
time
+ * and ensures no FlowFile can ever be accessed by any more than one processor
at a given time.
+ * The session also ensures that all FlowFiles are always accounted for.
+ * The creator of a process session is always required to manage the session.
*
- * A session is not considered thread safe. The session supports a unit of work
- * that is either committed or rolled back
- *
- *
+ * A session is not considered thread safe. The session supports a unit of
work that is either committed or rolled back.
*
- * As noted on specific methods and for specific exceptions automated rollback
- * will occur to ensure consistency of the repository. However, several
- * situations can result in exceptions yet not cause automated rollback. In
- * these cases the consistency of the repository will be retained but callers
- * will be able to indicate whether it should result in rollback or continue on
- * toward a commit.
- *
- *
+ * As noted on specific methods and for specific exceptions
+ * automated rollback will occur to ensure consistency of the repository.
+ * However, several situations can result in exceptions yet not cause
automated rollback.
+ * In these cases the consistency of the repository will be retained
+ * but callers will be able to indicate whether it should result in rollback
or continue on toward a commit.
*
- * A process session has two 'terminal' methods that will result in the
process session
- * being in a 'fresh', containing no knowledge or any FlowFile, as if the
session were newly
- * created. After one of these methods is called, the instance may be used
again. The terminal
- * methods for a Process Session are the {@link #commit()} and {@link
#rollback()}. Additionally,
- * the {@link #migrate(ProcessSession, Collection)} method results in {@code
this} containing
- * no knowledge of any of the FlowFiles that are provided, as if the FlowFiles
never existed in
- * this ProcessSession. After each commit or rollback, the session can be used
again. Note, however,
- * that even if all FlowFiles are migrated via the {@link
#migrate(ProcessSession, Collection)} method,
- * this Process Session is not entirely cleared, as it still has knowledge of
Counters that were adjusted
- * via the {@link #adjustCounter(String, long, boolean)} method. A commit or
rollback will clear these
- * counters, as well.
- *
+ * A process session has two types of 'terminal' methods that will result in
the session being in a 'fresh' state,
+ * containing no knowledge or any FlowFile, as if the session were newly
created.
+ * After one of these methods is called, the instance may be used again.
+ * The terminal methods for a process session are {@link #commitAsync()} and
{@link #rollback()} (and their overloads).
+ *
+ * Additionally, the {@link #migrate(ProcessSession, Collection)} method
transfers all knowledge of the provided FlowFiles
+ * to the other p
(nifi) branch support/nifi-1.x updated: NIFI-13025 Removed custom validation from NifiRegistryFlowRegistryClient
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 0e4b33ce4c NIFI-13025 Removed custom validation from
NifiRegistryFlowRegistryClient
0e4b33ce4c is described below
commit 0e4b33ce4c7db001d746fc61b94170752fd67987
Author: Pierre Villard
AuthorDate: Thu Apr 11 09:26:53 2024 +0200
NIFI-13025 Removed custom validation from NifiRegistryFlowRegistryClient
- NiFi Registry REST API enforces TLS handshake requirements
This closes #8629
Signed-off-by: David Handermann
(cherry picked from commit cc7af91f97dd1844cc6c8d30bd47d6865cb20aaa)
---
.../flow/NifiRegistryFlowRegistryClient.java| 21 -
1 file changed, 21 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-flow-registry-client-bundle/nifi-flow-registry-client-services/src/main/java/org/apache/nifi/registry/flow/NifiRegistryFlowRegistryClient.java
b/nifi-nar-bundles/nifi-flow-registry-client-bundle/nifi-flow-registry-client-services/src/main/java/org/apache/nifi/registry/flow/NifiRegistryFlowRegistryClient.java
index 8b7a45c801..03ee9ae3b0 100644
---
a/nifi-nar-bundles/nifi-flow-registry-client-bundle/nifi-flow-registry-client-services/src/main/java/org/apache/nifi/registry/flow/NifiRegistryFlowRegistryClient.java
+++
b/nifi-nar-bundles/nifi-flow-registry-client-bundle/nifi-flow-registry-client-services/src/main/java/org/apache/nifi/registry/flow/NifiRegistryFlowRegistryClient.java
@@ -17,8 +17,6 @@
package org.apache.nifi.registry.flow;
import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.components.ValidationContext;
-import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.flow.VersionedFlowCoordinates;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.registry.bucket.Bucket;
@@ -40,8 +38,6 @@ import javax.net.ssl.SSLContext;
import java.io.IOException;
import java.net.URI;
import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -127,23 +123,6 @@ public class NifiRegistryFlowRegistryClient extends
AbstractFlowRegistryClient {
this.registryClient = null;
}
-protected Collection customValidate(final
ValidationContext context) {
-final Collection result = new HashSet<>();
-if (context.getProperty(SSL_CONTEXT_SERVICE).isSet()) {
-final SSLContextService sslContextService =
context.getProperty(SSL_CONTEXT_SERVICE).asControllerService(SSLContextService.class);
-
-
-if (sslContextService.isTrustStoreConfigured() ^
sslContextService.isKeyStoreConfigured()) {
-result.add(new
ValidationResult.Builder().subject(this.getClass().getSimpleName())
-.valid(false)
-.explanation("It is expected to either set all the
properties for the SSLContext or set none")
-.build());
-}
-}
-
-return result;
-}
-
private String extractIdentity(final
FlowRegistryClientConfigurationContext context) {
return context.getNiFiUserIdentity().orElse(null);
}
(nifi) branch main updated: NIFI-13025 Removed custom validation from NifiRegistryFlowRegistryClient
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 cc7af91f97 NIFI-13025 Removed custom validation from
NifiRegistryFlowRegistryClient
cc7af91f97 is described below
commit cc7af91f97dd1844cc6c8d30bd47d6865cb20aaa
Author: Pierre Villard
AuthorDate: Thu Apr 11 09:26:53 2024 +0200
NIFI-13025 Removed custom validation from NifiRegistryFlowRegistryClient
- NiFi Registry REST API enforces TLS handshake requirements
This closes #8629
Signed-off-by: David Handermann
---
.../flow/NifiRegistryFlowRegistryClient.java| 21 -
1 file changed, 21 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-flow-registry-client-bundle/nifi-flow-registry-client-services/src/main/java/org/apache/nifi/registry/flow/NifiRegistryFlowRegistryClient.java
b/nifi-nar-bundles/nifi-flow-registry-client-bundle/nifi-flow-registry-client-services/src/main/java/org/apache/nifi/registry/flow/NifiRegistryFlowRegistryClient.java
index d33e89ef08..f3dc5a731d 100644
---
a/nifi-nar-bundles/nifi-flow-registry-client-bundle/nifi-flow-registry-client-services/src/main/java/org/apache/nifi/registry/flow/NifiRegistryFlowRegistryClient.java
+++
b/nifi-nar-bundles/nifi-flow-registry-client-bundle/nifi-flow-registry-client-services/src/main/java/org/apache/nifi/registry/flow/NifiRegistryFlowRegistryClient.java
@@ -17,8 +17,6 @@
package org.apache.nifi.registry.flow;
import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.components.ValidationContext;
-import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.flow.VersionedFlowCoordinates;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.registry.bucket.Bucket;
@@ -40,8 +38,6 @@ import javax.net.ssl.SSLContext;
import java.io.IOException;
import java.net.URI;
import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
@@ -128,23 +124,6 @@ public class NifiRegistryFlowRegistryClient extends
AbstractFlowRegistryClient {
this.registryClient = null;
}
-protected Collection customValidate(final
ValidationContext context) {
-final Collection result = new HashSet<>();
-if (context.getProperty(SSL_CONTEXT_SERVICE).isSet()) {
-final SSLContextService sslContextService =
context.getProperty(SSL_CONTEXT_SERVICE).asControllerService(SSLContextService.class);
-
-
-if (sslContextService.isTrustStoreConfigured() ^
sslContextService.isKeyStoreConfigured()) {
-result.add(new
ValidationResult.Builder().subject(this.getClass().getSimpleName())
-.valid(false)
-.explanation("It is expected to either set all the
properties for the SSLContext or set none")
-.build());
-}
-}
-
-return result;
-}
-
private String extractIdentity(final
FlowRegistryClientConfigurationContext context) {
return context.getNiFiUserIdentity().orElse(null);
}
(nifi) branch support/nifi-1.x updated: NIFI-12918 Corrected Nested Versioned Flows for Stateless
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 0e920c43f6 NIFI-12918 Corrected Nested Versioned Flows for Stateless
0e920c43f6 is described below
commit 0e920c43f626a9c6b34f12e80f5b30b01a202bd9
Author: slambrose <35692305+slambr...@users.noreply.github.com>
AuthorDate: Tue Mar 19 12:56:33 2024 -0500
NIFI-12918 Corrected Nested Versioned Flows for Stateless
This closes #8572
Signed-off-by: David Handermann
---
.../nifi/registry/flow/InMemoryFlowRegistry.java | 10 +-
.../apache/nifi/stateless/core/RegistryUtil.java | 33 ++-
.../nifi/stateless/core/TestRegistryUtil.java | 106 +
3 files changed, 146 insertions(+), 3 deletions(-)
diff --git
a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/registry/flow/InMemoryFlowRegistry.java
b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/registry/flow/InMemoryFlowRegistry.java
index 945de1da3c..3cb2bf081e 100644
---
a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/registry/flow/InMemoryFlowRegistry.java
+++
b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/registry/flow/InMemoryFlowRegistry.java
@@ -36,9 +36,17 @@ public class InMemoryFlowRegistry extends
AbstractFlowRegistryClient implements
private final Map>
flowSnapshots = new ConcurrentHashMap<>();
+/**
+ * Returns true regardless of the Flow Storage Location because this class
is the only Flow Registry Client configured for Stateless operation
+ *
+ * @param context Configuration context.
+ * @param location The location of versioned flow to check.
+ *
+ * @return true regardless of location
+ */
@Override
public boolean isStorageLocationApplicable(final
FlowRegistryClientConfigurationContext context, final String location) {
-return false;
+return true;
}
@Override
diff --git
a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/core/RegistryUtil.java
b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/core/RegistryUtil.java
index 1e0da7c559..cc265031d0 100644
---
a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/core/RegistryUtil.java
+++
b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/core/RegistryUtil.java
@@ -30,12 +30,17 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.net.ssl.SSLContext;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
public class RegistryUtil {
private static final Logger logger =
LoggerFactory.getLogger(RegistryUtil.class);
+private static final Pattern REGISTRY_URL_PATTERN =
Pattern.compile("^(https?://.+?)/?nifi-registry-api.*$");
+
private final String registryUrl;
private NiFiRegistryClient registryClient;
private final SSLContext sslContext;
@@ -45,6 +50,11 @@ public class RegistryUtil {
this.sslContext = sslContext;
}
+public RegistryUtil(final NiFiRegistryClient registryClient, final String
registryUrl, final SSLContext sslContext) {
+this.registryClient = registryClient;
+this.registryUrl = registryUrl;
+this.sslContext = sslContext;
+}
public VersionedFlowSnapshot getFlowByID(String bucketID, String flowID)
throws IOException, NiFiRegistryException {
return getFlowByID(bucketID, flowID, -1);
@@ -122,6 +132,14 @@ public class RegistryUtil {
return flowSnapshot;
}
+protected String getBaseRegistryUrl(final String storageLocation) {
+final Matcher matcher = REGISTRY_URL_PATTERN.matcher(storageLocation);
+if (matcher.matches()) {
+return matcher.group(1);
+} else {
+return storageLocation;
+}
+}
private void populateVersionedContentsRecursively(final
VersionedProcessGroup group, final NiFiUser user) throws NiFiRegistryException,
IOException {
if (group == null) {
@@ -130,12 +148,12 @@ public class RegistryUtil {
final VersionedFlowCoordinates coordinates =
group.getVersionedFlowCoordinates();
if (coordinates != null) {
-final String registryUrl = coordinates.getRegistryUrl();
+final String subRegistryUrl =
getBaseRegistryUrl(coordinates.getStorageLocation());
final String bucketId = coordinates.getBucketId();
final String flowI
(nifi) branch main updated (506ac835ad -> 9394d063f2)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 506ac835ad NIFI-13004 Removed include-grpc profile from documentation add 9394d063f2 NIFI-12918 Corrected Nested Versioned Flows for Stateless No new revisions were added by this update. Summary of changes: .../nifi/processors/standard/TestListFile.java | 3 - .../nifi/registry/flow/InMemoryFlowRegistry.java | 10 +- .../apache/nifi/stateless/core/RegistryUtil.java | 33 ++- .../nifi/stateless/core/TestRegistryUtil.java | 106 + 4 files changed, 146 insertions(+), 6 deletions(-) create mode 100644 nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/test/java/org/apache/nifi/stateless/core/TestRegistryUtil.java
(nifi) branch main updated (2ad9db18db -> 506ac835ad)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 2ad9db18db NIFI-12959: Support loading Python processors from NARs add 506ac835ad NIFI-13004 Removed include-grpc profile from documentation No new revisions were added by this update. Summary of changes: nifi-docs/src/main/asciidoc/developer-guide.adoc | 2 +- nifi-docs/src/main/asciidoc/walkthroughs.adoc| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
(nifi) branch main updated: NIFI-12959: Support loading Python processors from NARs
This is an automated email from the ASF dual-hosted git repository. exceptionfactory 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 2ad9db18db NIFI-12959: Support loading Python processors from NARs 2ad9db18db is described below commit 2ad9db18db3d0ef0a1c0e3a9241e418299de78c3 Author: Mark Payne AuthorDate: Tue Mar 26 10:55:02 2024 -0400 NIFI-12959: Support loading Python processors from NARs This closes #8573 Signed-off-by: David Handermann --- .../java/org/apache/nifi/util/NiFiProperties.java | 7 +- .../src/main/asciidoc/python-developer-guide.adoc | 88 ++--- .../components/ClassLoaderAwarePythonBridge.java | 4 +- .../org/apache/nifi/controller/FlowController.java | 15 ++- .../nifi/nar/ExtensionDiscoveringManager.java | 9 +- .../nar/StandardExtensionDiscoveringManager.java | 22 +++-- .../nifi/py4j/ProcessorCreationWorkflow.java | 13 +++ .../java/org/apache/nifi/py4j/PythonProcess.java | 53 -- .../org/apache/nifi/py4j/StandardPythonBridge.java | 51 -- .../nifi/py4j/StandardPythonProcessorBridge.java | 7 ++ .../org/apache/nifi/py4j/PythonProcessTest.java| 27 +++-- .../PythonControllerInteractionIT.java | 8 +- .../apache/nifi/python/DisabledPythonBridge.java | 2 +- .../java/org/apache/nifi/python/PythonBridge.java | 4 +- .../apache/nifi/python/PythonProcessConfig.java| 16 ++- .../apache/nifi/python/PythonProcessorDetails.java | 12 +++ .../src/main/python/framework/Controller.py| 2 - .../src/main/python/framework/ExtensionDetails.py | 10 ++ .../src/main/python/framework/ExtensionManager.py | 32 +++--- .../main/python/framework/ProcessorInspection.py | 15 ++- .../python/framework/TestPythonProcessorAdapter.py | 5 +- .../nifi-python-test-extensions-nar/pom.xml| 84 .../src/main/resources/WriteBech32Charset.py | 32 ++ nifi-system-tests/nifi-system-test-suite/pom.xml | 7 ++ .../src/test/assembly/dependencies.xml | 12 +++ .../nifi/tests/system/python/PythonNarIT.java | 110 + nifi-system-tests/pom.xml | 1 + 27 files changed, 541 insertions(+), 107 deletions(-) diff --git a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java index 2e3829fe36..8932760b14 100644 --- a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java +++ b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java @@ -16,6 +16,10 @@ */ package org.apache.nifi.util; +import org.apache.nifi.properties.ApplicationProperties; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; @@ -36,9 +40,6 @@ import java.util.Properties; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.apache.nifi.properties.ApplicationProperties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * The NiFiProperties class holds all properties which are needed for various diff --git a/nifi-docs/src/main/asciidoc/python-developer-guide.adoc b/nifi-docs/src/main/asciidoc/python-developer-guide.adoc index 8e52375e99..b798fb6d0f 100644 --- a/nifi-docs/src/main/asciidoc/python-developer-guide.adoc +++ b/nifi-docs/src/main/asciidoc/python-developer-guide.adoc @@ -516,37 +516,6 @@ environment for each Processor implementation (not for each instance of a Proces dependencies in that environment. -[[deploying]] -== Deploying a Developed Processor - -Once a Processor has been developed, it can be made available in NiFi by copying the source of the Python extension to the `$NIFI_HOME/python/extensions` directory by default. -The actual directory to look for extensions can be configured in `nifi.properties` via properties that have the prefix `nifi.python.extensions.source.directory.`. -For example, by default, `nifi.python.extensions.source.directory.default` is set to `./python/extensions`. However, additional paths may be added by replacing `default` -in the property name with some other value. - -Any `.py` file found in the directory will be parsed and examined in order to determine whether or not it is a valid NiFi Processor. -In order to be found, the Processor must have a valid parent (`FlowFileTransform` or `RecordTransform`) and must have an inner class named `Java` -with a `implements = ['org.apache.nifi.python.processor.FlowFileTransform']` or `implements = ['org.apache.nifi.python.processor.RecordFileTransform']`. -This will allow NiFi to automatically discover the Processor. - -Note, however, that if the Processor
(nifi) branch support/nifi-1.x updated: NIFI-13002 Restored zstd Compression Level in CompressContent
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 bf45bebbc0 NIFI-13002 Restored zstd Compression Level in
CompressContent
bf45bebbc0 is described below
commit bf45bebbc00b745c5d7ef81e95b6672a5dfd6900
Author: Joseph Witt
AuthorDate: Thu Apr 4 11:19:54 2024 -0700
NIFI-13002 Restored zstd Compression Level in CompressContent
This closes #8604
Signed-off-by: David Handermann
(cherry picked from commit 7f5680d1fed374666ee92fd9e43c9d660507c467)
---
.../main/java/org/apache/nifi/processors/standard/CompressContent.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java
index 90e190e8cb..306eeb7c4a 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java
@@ -348,7 +348,8 @@ public class CompressContent extends AbstractProcessor {
compressionOut = new
CompressorStreamFactory().createCompressorOutputStream(compressionFormat.toLowerCase(),
bufferedOut);
break;
case COMPRESSION_FORMAT_ZSTD:
-compressionOut = new
ZstdCompressorOutputStream(bufferedOut);
+final int zstdCompressionLevel =
context.getProperty(COMPRESSION_LEVEL).asInteger() * 2;
+compressionOut = new
ZstdCompressorOutputStream(bufferedOut, zstdCompressionLevel);
mimeTypeRef.set("application/zstd");
break;
case COMPRESSION_FORMAT_BROTLI:
(nifi) branch main updated: NIFI-13002 Restored zstd Compression Level in CompressContent
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 7f5680d1fe NIFI-13002 Restored zstd Compression Level in
CompressContent
7f5680d1fe is described below
commit 7f5680d1fed374666ee92fd9e43c9d660507c467
Author: Joseph Witt
AuthorDate: Thu Apr 4 11:19:54 2024 -0700
NIFI-13002 Restored zstd Compression Level in CompressContent
This closes #8604
Signed-off-by: David Handermann
---
.../main/java/org/apache/nifi/processors/standard/CompressContent.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java
index a910a4f875..1d95aebb9d 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java
@@ -349,7 +349,8 @@ public class CompressContent extends AbstractProcessor {
compressionOut = new
CompressorStreamFactory().createCompressorOutputStream(compressionFormat.toLowerCase(),
bufferedOut);
break;
case COMPRESSION_FORMAT_ZSTD:
-compressionOut = new
ZstdCompressorOutputStream(bufferedOut);
+final int zstdCompressionLevel =
context.getProperty(COMPRESSION_LEVEL).asInteger() * 2;
+compressionOut = new
ZstdCompressorOutputStream(bufferedOut, zstdCompressionLevel);
mimeTypeRef.set("application/zstd");
break;
case COMPRESSION_FORMAT_BROTLI: {
(nifi) branch main updated: NIFI-12875 Added Response Handling Strategy to RestLookupService
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 84df025ccf NIFI-12875 Added Response Handling Strategy to
RestLookupService
84df025ccf is described below
commit 84df025ccfe68bf9eefc0a43ad14fdc727e3723d
Author: Gregory M. Foreman
AuthorDate: Thu Mar 7 17:49:32 2024 -0600
NIFI-12875 Added Response Handling Strategy to RestLookupService
This closes #8484
Signed-off-by: David Handermann
---
.../nifi/lookup/ResponseHandlingStrategy.java | 49 ++
.../org/apache/nifi/lookup/RestLookupService.java | 21 +-
.../apache/nifi/lookup/TestRestLookupService.java | 27
3 files changed, 96 insertions(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/ResponseHandlingStrategy.java
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/ResponseHandlingStrategy.java
new file mode 100644
index 00..241737a1bc
--- /dev/null
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/ResponseHandlingStrategy.java
@@ -0,0 +1,49 @@
+/*
+ * 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.lookup;
+
+import org.apache.nifi.components.DescribedValue;
+
+public enum ResponseHandlingStrategy implements DescribedValue {
+RETURNED("Returned", "Successful and unsuccessful HTTP responses are
returned."),
+EVALUATED("Evaluated", "Successful HTTP responses are returned and
unsuccessful HTTP responses generate an exception.");
+
+private final String displayName;
+private final String description;
+
+ResponseHandlingStrategy(final String displayName, final String
description) {
+this.displayName = displayName;
+this.description = description;
+}
+
+@Override
+public String getValue() {
+return name();
+}
+
+@Override
+public String getDisplayName() {
+return displayName;
+}
+
+@Override
+public String getDescription() {
+return description;
+}
+
+}
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/RestLookupService.java
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/RestLookupService.java
index 30d7939f2d..aa3d0864b2 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/RestLookupService.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/RestLookupService.java
@@ -172,6 +172,15 @@ public class RestLookupService extends
AbstractControllerService implements Reco
.addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
.build();
+public static final PropertyDescriptor RESPONSE_HANDLING_STRATEGY = new
PropertyDescriptor.Builder()
+.name("rest-lookup-response-handling-strategy")
+.displayName("Response Handling Strategy")
+.description("Whether to return all responses or throw errors for
unsuccessful HTTP status codes.")
+.required(true)
+.defaultValue(ResponseHandlingStrategy.RETURNED)
+.allowableValues(ResponseHandlingStrategy.class)
+.build();
+
private static final ProxySpec[] PROXY_SPECS = {ProxySpec.HTTP_AUTH,
ProxySpec.SOCKS};
public static final PropertyDescriptor PROXY_CONFIGURATION_SERVICE
= ProxyConfiguration.createProxyConfigPropertyDescriptor(true,
PROXY_SPECS);
@@ -190,6 +199,7 @@ public class RestLookupService extends
AbstractControllerService implements Reco
URL,
(nifi) branch main updated (98c4061cfe -> 6939ffc08d)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 98c4061cfe NIFI-12996 Moved zstd-jni to standard-shared-nar add 6939ffc08d NIFI-12982 Extend test suite of MockProcessSession No new revisions were added by this update. Summary of changes: .../apache/nifi/util/TestMockProcessSession.java | 704 - 1 file changed, 555 insertions(+), 149 deletions(-)
(nifi) branch support/nifi-1.x updated: NIFI-12996 Moved zstd-jni to standard-shared-nar
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 d3ea429d25 NIFI-12996 Moved zstd-jni to standard-shared-nar
d3ea429d25 is described below
commit d3ea429d25db6f339ddd0701d2bb2616f054eed6
Author: Joseph Witt
AuthorDate: Wed Apr 3 18:32:40 2024 -0500
NIFI-12996 Moved zstd-jni to standard-shared-nar
- zstd-jni must be present in the same NAR as commons-compress
This closes #8598
Signed-off-by: David Handermann
(cherry picked from commit 98c4061cfee78590a7d391e53a835c5b87ca4bed)
---
.../nifi-standard-bundle/nifi-standard-processors/pom.xml | 8
.../java/org/apache/nifi/processors/standard/CompressContent.java | 3 +--
nifi-nar-bundles/nifi-standard-bundle/pom.xml | 5 -
.../nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml | 8
.../nifi-standard-shared-bundle/nifi-standard-shared-nar/pom.xml | 4
pom.xml | 6 ++
6 files changed, 23 insertions(+), 11 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
index 9e3be54474..85256174a7 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
@@ -141,6 +141,10 @@
org.apache.commons
commons-compress
+
+com.github.luben
+zstd-jni
+
org.apache.commons
commons-lang3
@@ -234,10 +238,6 @@
com.github.jponge
lzma-java
-
-com.github.luben
-zstd-jni
-
com.aayushatharva.brotli4j
brotli4j
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java
index dc83ca6686..90e190e8cb 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/CompressContent.java
@@ -348,8 +348,7 @@ public class CompressContent extends AbstractProcessor {
compressionOut = new
CompressorStreamFactory().createCompressorOutputStream(compressionFormat.toLowerCase(),
bufferedOut);
break;
case COMPRESSION_FORMAT_ZSTD:
-final int zstdcompressionLevel =
context.getProperty(COMPRESSION_LEVEL).asInteger() * 2;
-compressionOut = new
ZstdCompressorOutputStream(bufferedOut, zstdcompressionLevel);
+compressionOut = new
ZstdCompressorOutputStream(bufferedOut);
mimeTypeRef.set("application/zstd");
break;
case COMPRESSION_FORMAT_BROTLI:
diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index 6831c02407..e2cf9dbce5 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -133,11 +133,6 @@
lzma-java
1.3
-
-com.github.luben
-zstd-jni
-1.5.5-6
-
com.aayushatharva.brotli4j
brotli4j
diff --git
a/nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml
b/nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml
index 0081a6299c..3fab747209 100644
---
a/nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml
+++
b/nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml
@@ -31,12 +31,20 @@
${org.apache.commons.codec.version}
provided
+
org.apache.commons
commons-compress
${org.apache.commons.compress.version}
provided
+
+com.github.luben
+zstd-jni
+${com.github.luben.zstd-jni.version}
+
(nifi) branch main updated (3a03caa149 -> 98c4061cfe)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 3a03caa149 NIFI-12969: Fixed a typo in the #isTempDestinationNecessary method, where we were comparing existingConnection.getProcessGroup() to newDestination.getProcessGroup(), instead of comparing existingConnection.getDestination().getProcessGroup() to newDestination.getProcessGroup(). I.e., we were comparing the Destination's PG to the Connection's PG instead of comparing Destination's PG to Destination's PG. This resulted in using a temporary funnel when we shouldn't. And as [...] add 98c4061cfe NIFI-12996 Moved zstd-jni to standard-shared-nar No new revisions were added by this update. Summary of changes: .../nifi-standard-bundle/nifi-standard-processors/pom.xml | 8 .../java/org/apache/nifi/processors/standard/CompressContent.java | 3 +-- nifi-nar-bundles/nifi-standard-bundle/pom.xml | 5 - .../nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml | 8 .../nifi-standard-shared-bundle/nifi-standard-shared-nar/pom.xml | 4 pom.xml | 6 ++ 6 files changed, 23 insertions(+), 11 deletions(-)
(nifi) branch support/nifi-1.x updated: NIFI-12979 Upgraded Kotlin from 1.9.10 to 1.9.23
This is an automated email from the ASF dual-hosted git repository. exceptionfactory 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 b5e5848780 NIFI-12979 Upgraded Kotlin from 1.9.10 to 1.9.23 b5e5848780 is described below commit b5e58487802ebfe78cbdead76ed53a39b98006b1 Author: exceptionfactory AuthorDate: Sat Mar 30 12:12:03 2024 -0500 NIFI-12979 Upgraded Kotlin from 1.9.10 to 1.9.23 - Upgraded Okio from 3.8.0 to 3.9.0 This closes #8586 Signed-off-by: David Handermann (cherry picked from commit 9abafeb6df1c5ebb0da71acf0faf3c8d4be28f49) --- pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index ac1980f7d7..a06bd53d6b 100644 --- a/pom.xml +++ b/pom.xml @@ -107,10 +107,9 @@ 1.12.686 2.25.16 2.10.1 - 6.8.1 -1.9.10 +1.9.23 4.12.0 -3.8.0 +3.9.0 1.6.0 1.16.1 1.26.1
