[nifi] branch support/nifi-1.x updated (2ace153a7d -> 4fd8dd0bd4)
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a change to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git from 2ace153a7d NIFI-11156 Updated SchemaValidator to include error message for ValidateXml new a98fb9d81a NIFI-11200 - Upgrade aspectj to 1.9.19 new f7116f4a25 NIFI-11199 - Upgrade kotlin to 1.8.10 new 4fd8dd0bd4 NIFI-11198 - Upgrade snowflake-ingest-sdk to 1.0.3 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: nifi-nar-bundles/nifi-snowflake-bundle/pom.xml | 2 +- pom.xml| 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
[nifi] branch main updated: NIFI-11185 Removed GetTwitter Processor
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 0255c0c4ed NIFI-11185 Removed GetTwitter Processor 0255c0c4ed is described below commit 0255c0c4ed9f1f7e9efa2ca6c3084839f956871a Author: exceptionfactory AuthorDate: Wed Feb 15 09:18:00 2023 -0600 NIFI-11185 Removed GetTwitter Processor This closes #6958 Signed-off-by: Mike Thomsen --- .../nifi-twitter-processors/pom.xml| 32 +- .../apache/nifi/processors/twitter/GetTwitter.java | 487 - .../nifi/processors/twitter/LocationUtil.java | 93 .../services/org.apache.nifi.processor.Processor | 2 - .../nifi/processors/twitter/TestGetTwitter.java| 273 .../nifi/processors/twitter/TestLocationUtil.java | 76 6 files changed, 2 insertions(+), 961 deletions(-) diff --git a/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml b/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml index 8b5767571c..7624a7dafe 100644 --- a/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml +++ b/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml @@ -44,46 +44,18 @@ org.apache.oltu.oauth2 org.apache.oltu.oauth2.client - - - -com.twitter -hbc-core -2.2.0 - - -com.google.code.findbugs -jsr305 - - -org.twitter4j -twitter4j-core - -commons-logging -commons-logging +com.twitter +joauth - -org.slf4j -jcl-over-slf4j - - -com.github.stephenc.findbugs -findbugs-annotations -1.3.9-1 - org.apache.nifi nifi-mock 2.0.0-SNAPSHOT test - -com.squareup.okhttp3 -okhttp - com.squareup.okhttp3 mockwebserver diff --git a/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/src/main/java/org/apache/nifi/processors/twitter/GetTwitter.java b/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/src/main/java/org/apache/nifi/processors/twitter/GetTwitter.java deleted file mode 100644 index 0e17106a14..00 --- a/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/src/main/java/org/apache/nifi/processors/twitter/GetTwitter.java +++ /dev/null @@ -1,487 +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.processors.twitter; - -import com.twitter.hbc.ClientBuilder; -import com.twitter.hbc.core.Client; -import com.twitter.hbc.core.Constants; -import com.twitter.hbc.core.endpoint.Location; -import com.twitter.hbc.core.endpoint.Location.Coordinate; -import com.twitter.hbc.core.endpoint.StatusesFilterEndpoint; -import com.twitter.hbc.core.endpoint.StatusesFirehoseEndpoint; -import com.twitter.hbc.core.endpoint.StatusesSampleEndpoint; -import com.twitter.hbc.core.endpoint.StreamingEndpoint; -import com.twitter.hbc.core.event.Event; -import com.twitter.hbc.core.processor.StringDelimitedProcessor; -import com.twitter.hbc.httpclient.auth.Authentication; -import com.twitter.hbc.httpclient.auth.OAuth1; -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.behavior.SupportsBatching; -import org.apache.nifi.annotation.behavior.WritesAttribute; -import org.apache.nifi.annotation.documentation.CapabilityDescription; -import org.apache.nifi.annotation.documentation.Deprec
[nifi] 01/03: NIFI-11200 - Upgrade aspectj to 1.9.19
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 88813081e427b2ad7230c48f7ded55209f72fe14 Author: Pierre Villard AuthorDate: Sat Feb 18 19:01:03 2023 -0500 NIFI-11200 - Upgrade aspectj to 1.9.19 This closes #6974 Signed-off-by: Mike Thomsen --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f0fe6174a8..127935c59a 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ 3.3.4 1.2.1 2.1.5 -1.9.6 +1.9.19 2.36 2.18.0 1.3.5
[nifi] branch main updated (3115b9f28d -> 21394038cd)
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 3115b9f28d NIFI-10803 - Upgrade Dropbox SDK to 5.4.4 new 88813081e4 NIFI-11200 - Upgrade aspectj to 1.9.19 new 48af85f472 NIFI-11199 - Upgrade kotlin to 1.8.10 new 21394038cd NIFI-11198 - Upgrade snowflake-ingest-sdk to 1.0.3 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: nifi-nar-bundles/nifi-snowflake-bundle/pom.xml | 2 +- pom.xml| 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
[nifi] 03/03: NIFI-11198 - Upgrade snowflake-ingest-sdk to 1.0.3
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 21394038cd3b8f522184efcf9c85d2d5a11d5267 Author: Pierre Villard AuthorDate: Sat Feb 18 18:40:22 2023 -0500 NIFI-11198 - Upgrade snowflake-ingest-sdk to 1.0.3 This closes #6972 Signed-off-by: Mike Thomsen --- nifi-nar-bundles/nifi-snowflake-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-snowflake-bundle/pom.xml b/nifi-nar-bundles/nifi-snowflake-bundle/pom.xml index 61524dd156..b2270cbcdf 100644 --- a/nifi-nar-bundles/nifi-snowflake-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-snowflake-bundle/pom.xml @@ -36,7 +36,7 @@ net.snowflake snowflake-ingest-sdk -1.0.2-beta.7 +1.0.3-beta
[nifi] 02/03: NIFI-11199 - Upgrade kotlin to 1.8.10
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 48af85f472edc862379e376fc5d016e763a22372 Author: Pierre Villard AuthorDate: Sat Feb 18 18:52:50 2023 -0500 NIFI-11199 - Upgrade kotlin to 1.8.10 This closes #6973 Signed-off-by: Mike Thomsen --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 127935c59a..2fae67f0f4 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ 1.12.371 2.17.295 2.10.1 -1.7.20 +1.8.10 4.10.0 1.5.0 3.12.0
[nifi] branch main updated: NiFI-10922 Update testcontainers version to 1.17.6
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 3a1e4dbe92 NiFI-10922 Update testcontainers version to 1.17.6 3a1e4dbe92 is described below commit 3a1e4dbe921b6a2ba50f4abdc7eb1e768684b539 Author: mr1716 AuthorDate: Thu Jan 12 09:48:00 2023 -0500 NiFI-10922 Update testcontainers version to 1.17.6 This closes #6840 Signed-off-by: Mike Thomsen --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3edf8b6c3d..c07f8a5949 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ 4.5.13 4.4.15 1.71 -1.17.5 +1.17.6 1.7.36 2.3.0 9.4.50.v20221201
[nifi] branch main updated: NIFI-11052 Upgraded Netty from 4.1.85 to 4.1.87
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 765e5fc61e NIFI-11052 Upgraded Netty from 4.1.85 to 4.1.87 765e5fc61e is described below commit 765e5fc61e895379ba3f39d3900ef892bdb75fdd Author: exceptionfactory AuthorDate: Thu Jan 12 15:23:27 2023 -0600 NIFI-11052 Upgraded Netty from 4.1.85 to 4.1.87 This closes #6843 Signed-off-by: Mike Thomsen --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d2a6ceee6..3edf8b6c3d 100644 --- a/pom.xml +++ b/pom.xml @@ -142,7 +142,7 @@ 3.12.4 3.10.6.Final 1.33 -4.1.85.Final +4.1.87.Final 5.3.24 5.8.0 1.6.6
[nifi] branch main updated: NIFI-10996: Write out CSV header even if there are no records
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 a9baa21f87 NIFI-10996: Write out CSV header even if there are no
records
a9baa21f87 is described below
commit a9baa21f87eac5f2992c42ea4a45af00a3f19af6
Author: Matthew Burgess
AuthorDate: Tue Jan 3 09:12:14 2023 -0500
NIFI-10996: Write out CSV header even if there are no records
This closes #6818
Signed-off-by: Mike Thomsen
---
.../java/org/apache/nifi/csv/WriteCSVResult.java | 2 ++
.../org/apache/nifi/csv/TestWriteCSVResult.java| 22 ++
2 files changed, 24 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/csv/WriteCSVResult.java
b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/csv/WriteCSVResult.java
index 733d3a57b1..3523ab39ef 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/csv/WriteCSVResult.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/csv/WriteCSVResult.java
@@ -89,6 +89,8 @@ public class WriteCSVResult extends AbstractRecordSetWriter
implements RecordSet
@Override
protected Map onFinishRecordSet() throws IOException {
+// If the header has not yet been written (but should be), write it
out now
+includeHeaderIfNecessary(null, true);
return schemaWriter.getAttributes(recordSchema);
}
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/csv/TestWriteCSVResult.java
b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/csv/TestWriteCSVResult.java
index 96efe4a155..d03d8385f5 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/csv/TestWriteCSVResult.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/csv/TestWriteCSVResult.java
@@ -387,6 +387,28 @@ public class TestWriteCSVResult {
assertEquals("id,name\n1\\,John Doe\n", output);
}
+@Test
+public void testWriteHeaderWithNoRecords() throws IOException {
+final CSVFormat csvFormat =
CSVFormat.DEFAULT.builder().setEscape('\\').setQuoteMode(QuoteMode.NONE).setRecordSeparator(",").build();
+final List fields = new ArrayList<>();
+fields.add(new RecordField("id",
RecordFieldType.STRING.getDataType()));
+fields.add(new RecordField("name",
RecordFieldType.STRING.getDataType()));
+final RecordSchema schema = new SimpleRecordSchema(fields);
+
+final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+final String output;
+try (final WriteCSVResult writer = new WriteCSVResult(csvFormat,
schema, new SchemaNameAsAttribute(), baos,
+RecordFieldType.DATE.getDefaultFormat(),
RecordFieldType.TIME.getDefaultFormat(),
RecordFieldType.TIMESTAMP.getDefaultFormat(), true, "ASCII")) {
+
+writer.beginRecordSet();
+writer.finishRecordSet();
+writer.flush();
+output = baos.toString();
+}
+
+assertEquals("id,name,", output);
+}
+
private DateFormat getDateFormat(final String format) {
final DateFormat df = new SimpleDateFormat(format);
[nifi] branch main updated: NIFI-10897 Replaced Spring Security Base64 with java.util.Base64
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 de296b5e65 NIFI-10897 Replaced Spring Security Base64 with
java.util.Base64
de296b5e65 is described below
commit de296b5e659bd5826405c4ee7afdaa58e500ecaa
Author: exceptionfactory
AuthorDate: Wed Nov 23 09:45:40 2022 -0600
NIFI-10897 Replaced Spring Security Base64 with java.util.Base64
This closes #6728
Signed-off-by: Mike Thomsen
---
.../apache/nifi/web/security/kerberos/KerberosService.java | 8 +---
.../kerberos/KerberosSpnegoIdentityProvider.java | 14 --
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/kerberos/KerberosService.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/kerberos/KerberosService.java
index f3d57bbf3a..4e92a440eb 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/kerberos/KerberosService.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/kerberos/KerberosService.java
@@ -20,13 +20,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.authentication.AuthenticationDetailsSource;
import org.springframework.security.core.Authentication;
-import org.springframework.security.crypto.codec.Base64;
import
org.springframework.security.kerberos.authentication.KerberosServiceAuthenticationProvider;
import
org.springframework.security.kerberos.authentication.KerberosServiceRequestToken;
import
org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
import javax.servlet.http.HttpServletRequest;
import java.nio.charset.StandardCharsets;
+import java.util.Base64;
/**
*
@@ -39,8 +39,10 @@ public class KerberosService {
public static final String AUTHENTICATION_CHALLENGE_HEADER_NAME =
"WWW-Authenticate";
public static final String AUTHORIZATION_NEGOTIATE = "Negotiate";
+private static final Base64.Decoder decoder = Base64.getDecoder();
+
private KerberosServiceAuthenticationProvider
kerberosServiceAuthenticationProvider;
-private AuthenticationDetailsSource
authenticationDetailsSource = new WebAuthenticationDetailsSource();
+private final AuthenticationDetailsSource
authenticationDetailsSource = new WebAuthenticationDetailsSource();
public void
setKerberosServiceAuthenticationProvider(KerberosServiceAuthenticationProvider
kerberosServiceAuthenticationProvider) {
this.kerberosServiceAuthenticationProvider =
kerberosServiceAuthenticationProvider;
@@ -59,7 +61,7 @@ public class KerberosService {
logger.debug("Received Negotiate Header for request " +
request.getRequestURL() + ": " + header);
}
byte[] base64Token = header.substring(header.indexOf(" ") +
1).getBytes(StandardCharsets.UTF_8);
-byte[] kerberosTicket = Base64.decode(base64Token);
+byte[] kerberosTicket = decoder.decode(base64Token);
KerberosServiceRequestToken authenticationRequest = new
KerberosServiceRequestToken(kerberosTicket);
authenticationRequest.setDetails(authenticationDetailsSource.buildDetails(request));
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/kerberos/KerberosSpnegoIdentityProvider.java
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/kerberos/KerberosSpnegoIdentityProvider.java
index 2dc074fd85..65ef338aca 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/kerberos/KerberosSpnegoIdentityProvider.java
+++
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/kerberos/KerberosSpnegoIdentityProvider.java
@@ -35,13 +35,13 @@ import org.springframework.lang.Nullable;
import org.springframework.security.authentication.AuthenticationDetailsSource;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.crypto.codec.Base64;
import
org.springframework.security.kerberos.authentication.KerberosServiceAuthenticationProvider;
import
org.springframework.security.kerberos.a
[nifi] 01/05: NIFI-10806 - update snmp4j dependencies
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 85a95550bbf8455ab535e9931180b071e922985b Author: Pierre Villard AuthorDate: Fri Nov 18 11:57:46 2022 +0100 NIFI-10806 - update snmp4j dependencies This closes #6677 Signed-off-by: Mike Thomsen --- nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml index 263c8478fd..3e3982e15c 100644 --- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml +++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml @@ -20,8 +20,8 @@ language governing permissions and limitations under the License. --> jar -2.8.7 -2.7.4 +2.8.15 +2.7.8
[nifi] branch main updated (78f206a811 -> 2698282615)
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 78f206a811 NIFI-10820 Change Docker base image to eclipse-temurin new 85a95550bb NIFI-10806 - update snmp4j dependencies new 7374f9d2b2 NIFI-10810 - Update HTTPAsyncClient to 4.1.5 new 87f02d26d9 NIFI-10809 - Update greenmail to 1.6.11 new f717025380 NIFI-10807 - Update gson to 2.10 new 2698282615 NIFI-10804 - Update okhttp-digest to 2.7 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: nifi-commons/nifi-site-to-site-client/pom.xml | 2 +- nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml | 2 +- nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/pom.xml| 4 ++-- nifi-nar-bundles/nifi-standard-bundle/pom.xml | 2 +- .../nifi-lookup-services-bundle/nifi-lookup-services/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-)
[nifi] 05/05: NIFI-10804 - Update okhttp-digest to 2.7
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 2698282615ccf7fad03692badca9e2bceb86ea55 Author: Pierre Villard AuthorDate: Fri Nov 18 12:21:33 2022 +0100 NIFI-10804 - Update okhttp-digest to 2.7 This closes #6681 Signed-off-by: Mike Thomsen --- nifi-nar-bundles/nifi-standard-bundle/pom.xml | 2 +- .../nifi-lookup-services-bundle/nifi-lookup-services/pom.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/pom.xml index 3e7189eae7..da0becdcb4 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml @@ -213,7 +213,7 @@ io.github.rburgst okhttp-digest -2.5 +2.7 at.favre.lib 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 0e90ec6540..4e4f3e82c3 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 @@ -124,7 +124,7 @@ io.github.rburgst okhttp-digest -2.5 +2.7 compile
[nifi] 04/05: NIFI-10807 - Update gson to 2.10
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit f717025380fa0731a9be45179c9ca215bbe4c87e Author: Pierre Villard AuthorDate: Fri Nov 18 12:16:12 2022 +0100 NIFI-10807 - Update gson to 2.10 This closes #6680 Signed-off-by: Mike Thomsen --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 771b20a9a7..b6525413a6 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ 2014 1.12.299 2.17.270 -2.9.1 +2.10 1.7.20 4.10.0 1.5.0
[nifi] 02/05: NIFI-10810 - Update HTTPAsyncClient to 4.1.5
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 7374f9d2b2c25efc1acbc5b9f1689372b4a0d616 Author: Pierre Villard AuthorDate: Fri Nov 18 12:09:15 2022 +0100 NIFI-10810 - Update HTTPAsyncClient to 4.1.5 This closes #6678 Signed-off-by: Mike Thomsen --- nifi-commons/nifi-site-to-site-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-commons/nifi-site-to-site-client/pom.xml b/nifi-commons/nifi-site-to-site-client/pom.xml index 400b0636d7..73ce08b185 100644 --- a/nifi-commons/nifi-site-to-site-client/pom.xml +++ b/nifi-commons/nifi-site-to-site-client/pom.xml @@ -83,7 +83,7 @@ org.apache.httpcomponents httpasyncclient -4.1.4 +4.1.5 commons-logging
[nifi] 03/05: NIFI-10809 - Update greenmail to 1.6.11
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 87f02d26d9d7180699df1c87c0af6cad3f56ba33 Author: Pierre Villard AuthorDate: Fri Nov 18 12:12:08 2022 +0100 NIFI-10809 - Update greenmail to 1.6.11 This closes #6679 Signed-off-by: Mike Thomsen --- nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml index e54711b7ea..f3393068e6 100644 --- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml +++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml @@ -128,7 +128,7 @@ com.icegreen greenmail -1.6.10 +1.6.11 test
[nifi] branch main updated: [NIFI-10612] Initial check in of isJson code. [NIFI-10612] Made suggested change to only test subject value where it is formatted like a Json array or object.
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 2afe2b36b9 [NIFI-10612] Initial check in of isJson code. [NIFI-10612] Made suggested change to only test subject value where it is formatted like a Json array or object. 2afe2b36b9 is described below commit 2afe2b36b98135689232b6c66e02916dc7e96e05 Author: dan-s1 AuthorDate: Wed Oct 12 20:16:14 2022 + [NIFI-10612] Initial check in of isJson code. [NIFI-10612] Made suggested change to only test subject value where it is formatted like a Json array or object. This closes #6574 Signed-off-by: Mike Thomsen --- .../language/antlr/AttributeExpressionLexer.g | 1 + .../language/antlr/AttributeExpressionParser.g | 2 +- .../language/compile/ExpressionCompiler.java | 5 ++ .../evaluation/functions/IsJsonEvaluator.java | 64 ++ .../attribute/expression/language/TestQuery.java | 33 +++ .../main/asciidoc/expression-language-guide.adoc | 33 +++ 6 files changed, 137 insertions(+), 1 deletion(-) diff --git a/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g b/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g index e0cb4caf24..734794f3be 100644 --- a/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g +++ b/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g @@ -145,6 +145,7 @@ BASE64_ENCODE : 'base64Encode'; BASE64_DECODE : 'base64Decode'; GET_STATE_VALUE: 'getStateValue'; EVALUATE_EL_STRING: 'evaluateELString'; +IS_JSON: 'isJson'; // 1 arg functions SUBSTRING_AFTER: 'substringAfter'; diff --git a/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionParser.g b/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionParser.g index 997dbd834a..c71719b92c 100644 --- a/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionParser.g +++ b/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionParser.g @@ -85,7 +85,7 @@ threeArgString: ((JSON_PATH_PUT) LPAREN! anyArg COMMA! anyArg COMMA! anyArg RPAR fiveArgString : GET_DELIMITED_FIELD LPAREN! anyArg (COMMA! anyArg (COMMA! anyArg (COMMA! anyArg (COMMA! anyArg)?)?)?)? RPAREN!; // functions that return Booleans -zeroArgBool : (IS_NULL | NOT_NULL | IS_EMPTY | NOT) LPAREN! RPAREN!; +zeroArgBool : (IS_NULL | NOT_NULL | IS_EMPTY | NOT | IS_JSON) LPAREN! RPAREN!; oneArgBool : ((FIND | MATCHES | EQUALS_IGNORE_CASE) LPAREN! anyArg RPAREN!) | (GREATER_THAN | LESS_THAN | GREATER_THAN_OR_EQUAL | LESS_THAN_OR_EQUAL) LPAREN! anyArg RPAREN! | (EQUALS) LPAREN! anyArg RPAREN! | diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/compile/ExpressionCompiler.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/compile/ExpressionCompiler.java index 17a0173ec5..05bc23a2ac 100644 --- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/compile/ExpressionCompiler.java +++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/compile/ExpressionCompiler.java @@ -68,6 +68,7 @@ import org.apache.nifi.attribute.expression.language.evaluation.functions.InEval import org.apache.nifi.attribute.expression.language.evaluation.functions.IndexOfEvaluator; import org.apache.nifi.attribute.expression.language.evaluation.functions.InstantFormatEvaluator; import org.apache.nifi.attribute.expression.language.evaluation.functions.IsEmptyEvaluator; +import org.apache.nifi.attribute.expression.language.evaluation.functions.IsJsonEvaluator; import org.apache.nifi.attribute.expression.language.evaluation.functions.IsNullEvaluator; import org.apache.nifi.attribute.expression.language.evaluation.functions.JsonPathAddEvaluator; import org.apache.nifi.attribute.expression.language.evaluation.functions.JsonPathDeleteEvaluator; @@ -260,6 +261,7 @@ import static org.apache.nifi.attribute.expression.language.antlr.AttributeExpre import static org.apache.nifi.attribute.expression.language.antlr.AttributeExpressionParser.UUID5; import static
[nifi] branch main updated: NIFI-10725 Update ICU4J to 72.1
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 8d2789dbc4 NIFI-10725 Update ICU4J to 72.1 8d2789dbc4 is described below commit 8d2789dbc408398da18bb12b765f5324458eab5e Author: mr1716 AuthorDate: Sat Oct 29 09:02:23 2022 -0400 NIFI-10725 Update ICU4J to 72.1 This closes #6603 Signed-off-by: Mike Thomsen --- nifi-nar-bundles/nifi-framework-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml index 068ba54628..12efd7ad92 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml @@ -233,7 +233,7 @@ com.ibm.icu icu4j -68.2 +72.1 org.apache.tika
[nifi] branch main updated: NIFI-10718 Update mongo.driver.version to 4.7.2
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 557a1a7869 NIFI-10718 Update mongo.driver.version to 4.7.2 557a1a7869 is described below commit 557a1a7869a181a9ea857a15f10bdbe487cdd655 Author: UcanInfosec <107478475+ucaninfo...@users.noreply.github.com> AuthorDate: Fri Oct 28 07:39:42 2022 -0400 NIFI-10718 Update mongo.driver.version to 4.7.2 This closes #6599 Signed-off-by: Mike Thomsen --- nifi-nar-bundles/nifi-mongodb-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml b/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml index 351b2eb64a..c28f22216e 100644 --- a/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml @@ -35,7 +35,7 @@ -4.7.1 +4.7.2
[nifi] branch main updated: NIFI-10688 Update javax.json-api & javax.json
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 438d8ec1eb NIFI-10688 Update javax.json-api & javax.json 438d8ec1eb is described below commit 438d8ec1eb0a6d1f3a0695d2f7b7f02f592a6326 Author: mr1716 AuthorDate: Mon Oct 24 15:37:20 2022 -0400 NIFI-10688 Update javax.json-api & javax.json This closes #6572 Signed-off-by: Mike Thomsen --- .../nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml | 2 +- .../nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml | 4 ++-- nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/pom.xml| 4 ++-- .../nifi-site-to-site-reporting-task/pom.xml | 4 ++-- nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml index 9ec3a67a0e..b7c03249cf 100644 --- a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml +++ b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml @@ -32,7 +32,7 @@ javax.json javax.json-api -1.0 +1.1.4 org.apache.nifi diff --git a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml index 5d6cbdd54d..f461fe9b0a 100644 --- a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml +++ b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml @@ -32,12 +32,12 @@ org.glassfish javax.json -1.0.4 +1.1.4 javax.json javax.json-api -1.0 +1.1.4 org.apache.nifi diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/pom.xml index f41a6e4f19..90ff59a126 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/pom.xml +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/pom.xml @@ -37,7 +37,7 @@ org.glassfish javax.json -1.0.4 +1.1.4 org.apache.nifi @@ -46,4 +46,4 @@ compile - \ No newline at end of file + diff --git a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/pom.xml b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/pom.xml index 1afb7d391b..9fd457745e 100644 --- a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/pom.xml +++ b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/pom.xml @@ -73,12 +73,12 @@ org.glassfish javax.json -1.0.4 +1.1.4 javax.json javax.json-api -1.0 +1.1.4 diff --git a/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml b/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml index 48fd4d1206..4059a0caef 100644 --- a/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml +++ b/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml @@ -29,12 +29,12 @@ javax.json javax.json-api -1.0 +1.1.4 org.glassfish javax.json -1.0.4 +1.1.4 org.apache.httpcomponents
[nifi] branch main updated: NIFI-10303 route GetElasticsearch to failure if _id is blank after attribute evaluation
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 b6026f5709 NIFI-10303 route GetElasticsearch to failure if _id is
blank after attribute evaluation
b6026f5709 is described below
commit b6026f57095d00b1ef63f96eeed03d3fc8eaa861
Author: Chris Sampson
AuthorDate: Mon Oct 24 20:44:17 2022 +0100
NIFI-10303 route GetElasticsearch to failure if _id is blank after
attribute evaluation
This closes #6573
Signed-off-by: Mike Thomsen
---
.../processors/elasticsearch/GetElasticsearch.java | 43 ++
.../elasticsearch/GetElasticsearchTest.groovy | 12 ++
2 files changed, 39 insertions(+), 16 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/GetElasticsearch.java
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/GetElasticsearch.java
index ae75d08310..45d818afcf 100644
---
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/GetElasticsearch.java
+++
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/GetElasticsearch.java
@@ -35,8 +35,10 @@ import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Relationship;
+import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.util.StopWatch;
+import org.apache.nifi.util.StringUtils;
import java.util.Arrays;
import java.util.Collections;
@@ -161,6 +163,10 @@ public class GetElasticsearch extends AbstractProcessor
implements Elasticsearch
final String attributeName =
context.getProperty(ATTRIBUTE_NAME).evaluateAttributeExpressions(input).getValue();
try {
+if (StringUtils.isBlank(id)) {
+throw new ProcessException(ID.getDisplayName() + " is blank
(after evaluating attribute expressions), cannot GET document");
+}
+
final StopWatch stopWatch = new StopWatch(true);
final Map doc = clientService.get(index, type, id,
getUrlQueryParameters(context, input));
@@ -182,22 +188,7 @@ public class GetElasticsearch extends AbstractProcessor
implements Elasticsearch
session.getProvenanceReporter().receive(documentFlowFile,
clientService.getTransitUrl(index, type),
stopWatch.getElapsed(TimeUnit.MILLISECONDS));
session.transfer(documentFlowFile, REL_DOC);
} catch (final ElasticsearchException ese) {
-if (ese.isNotFound()) {
-if (input != null) {
-session.transfer(input, REL_NOT_FOUND);
-} else {
-getLogger().warn("Document with _id {} not found in index
{} (and type {})", id, index, type);
-}
-} else {
-final String msg = String.format("Encountered a server-side
problem with Elasticsearch. %s",
-ese.isElastic() ? "Routing to retry." : "Routing to
failure");
-getLogger().error(msg, ese);
-if (input != null) {
-session.penalize(input);
-input = session.putAttribute(input,
"elasticsearch.get.error", ese.getMessage());
-session.transfer(input, ese.isElastic() ? REL_RETRY :
REL_FAILURE);
-}
-}
+handleElasticsearchException(ese, input, session, index, type, id);
} catch (final Exception ex) {
getLogger().error("Could not fetch document.", ex);
if (input != null) {
@@ -207,4 +198,24 @@ public class GetElasticsearch extends AbstractProcessor
implements Elasticsearch
context.yield();
}
}
+
+private void handleElasticsearchException(final ElasticsearchException
ese, FlowFile input, final ProcessSession session,
+ final String index, final
String type, final String id) {
+if (ese.isNotFound()) {
+if (input != null) {
+session.transfer(input, REL_NOT_FOUND);
+} else {
+getLogger().warn("Document with _id {} not found in index {}
(and type {})", id, index, type);
+}
+} else {
+final String msg = String.format("Encountered a server-side
problem with Elasticsearch. %
[nifi] branch main updated: NIFI-10687 set Elasticsearch document _id to null if ID attribute evaluated to blank String for PutElasticsearchRecord or PutElasticsearchJson; use @timestamp default value
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 db49a861b3 NIFI-10687 set Elasticsearch document _id to null if ID
attribute evaluated to blank String for PutElasticsearchRecord or
PutElasticsearchJson; use @timestamp default value if @timestamp record path
evaluates to blank String in PutElasticsearchRecord
db49a861b3 is described below
commit db49a861b3ab2e555ae0bf94e8237dd1d5fb462a
Author: Chris Sampson
AuthorDate: Mon Oct 24 21:28:01 2022 +0100
NIFI-10687 set Elasticsearch document _id to null if ID attribute evaluated
to blank String for PutElasticsearchRecord or PutElasticsearchJson; use
@timestamp default value if @timestamp record path evaluates to blank String in
PutElasticsearchRecord
This closes #6575
Signed-off-by: Mike Thomsen
---
.../elasticsearch/PutElasticsearchJson.java| 2 +-
.../elasticsearch/PutElasticsearchRecord.java | 6 +--
.../elasticsearch/PutElasticsearchJsonTest.groovy | 9 +++-
.../PutElasticsearchRecordTest.groovy | 51 ++
4 files changed, 63 insertions(+), 5 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchJson.java
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchJson.java
index 4f35994276..7b23d1a22d 100644
---
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchJson.java
+++
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchJson.java
@@ -167,7 +167,7 @@ public class PutElasticsearchJson extends
AbstractPutElasticsearch {
final String indexOp =
context.getProperty(INDEX_OP).evaluateAttributeExpressions(input).getValue();
final String index =
context.getProperty(INDEX).evaluateAttributeExpressions(input).getValue();
final String type =
context.getProperty(TYPE).evaluateAttributeExpressions(input).getValue();
-final String id = StringUtils.isNotBlank(idAttribute) ?
input.getAttribute(idAttribute) : null;
+final String id = StringUtils.isNotBlank(idAttribute) &&
StringUtils.isNotBlank(input.getAttribute(idAttribute)) ?
input.getAttribute(idAttribute) : null;
final String charset =
context.getProperty(CHARSET).evaluateAttributeExpressions(input).getValue();
diff --git
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecord.java
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecord.java
index 332c16720f..1b572815d3 100644
---
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecord.java
+++
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecord.java
@@ -333,10 +333,10 @@ public class PutElasticsearchRecord extends
AbstractPutElasticsearch {
final String atTimestampPath =
context.getProperty(AT_TIMESTAMP_RECORD_PATH).evaluateAttributeExpressions(input).getValue();
final RecordPath ioPath = indexOpPath != null ?
recordPathCache.getCompiled(indexOpPath) : null;
-final RecordPath path = idPath != null ?
recordPathCache.getCompiled(idPath) : null;
+final RecordPath path = StringUtils.isNotBlank(idPath) ?
recordPathCache.getCompiled(idPath) : null;
final RecordPath iPath = indexPath != null ?
recordPathCache.getCompiled(indexPath) : null;
final RecordPath tPath = typePath != null ?
recordPathCache.getCompiled(typePath) : null;
-final RecordPath atPath = atTimestampPath != null ?
recordPathCache.getCompiled(atTimestampPath) : null;
+final RecordPath atPath = StringUtils.isNotBlank(atTimestampPath) ?
recordPathCache.getCompiled(atTimestampPath) : null;
final boolean retainId =
context.getProperty(RETAIN_ID_FIELD).evaluateAttributeExpressions(input).asBoolean();
final boolean retainTimestamp =
context.getProperty(RETAIN_AT_TIMESTAMP_FIELD).evaluateAttributeExpressions(input).asBoolean();
@@ -562,7 +562,7 @@ public class PutElasticsearchRecord extends
AbstractPutElasticsearch {
fieldValue.updateValue(null);
}
-
[nifi] branch main updated: NIFI-10653 Removed duplicate dependency from minifi-assembly
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 e32993846e NIFI-10653 Removed duplicate dependency from minifi-assembly e32993846e is described below commit e32993846e84db6f1fa026b93191a25d9fd7eb50 Author: exceptionfactory AuthorDate: Fri Oct 14 11:44:03 2022 -0500 NIFI-10653 Removed duplicate dependency from minifi-assembly This closes #6536 Signed-off-by: Mike Thomsen --- minifi/minifi-assembly/pom.xml | 5 - 1 file changed, 5 deletions(-) diff --git a/minifi/minifi-assembly/pom.xml b/minifi/minifi-assembly/pom.xml index 8cf7381d65..ff8f205b1c 100644 --- a/minifi/minifi-assembly/pom.xml +++ b/minifi/minifi-assembly/pom.xml @@ -192,11 +192,6 @@ limitations under the License. nifi-distributed-cache-services-nar nar - -org.apache.nifi -nifi-distributed-cache-services-nar -nar - org.apache.nifi nifi-proxy-configuration-nar
[nifi] branch main updated: NIFI-10626 Update jruby-complete to 9.3.8.0
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 14a2249c0e NIFI-10626 Update jruby-complete to 9.3.8.0 14a2249c0e is described below commit 14a2249c0e3e1946bbfc9b810dd2b56b51a26997 Author: UcanInfosec <107478475+ucaninfo...@users.noreply.github.com> AuthorDate: Tue Oct 11 10:50:00 2022 -0400 NIFI-10626 Update jruby-complete to 9.3.8.0 This closes #6510 Signed-off-by: Mike Thomsen --- .../nifi-scripting-bundle/nifi-scripting-processors/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml index 298e14be4f..ba2e61577e 100644 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml @@ -88,7 +88,7 @@ org.jruby jruby-complete -9.3.4.0 +9.3.8.0 org.clojure
[nifi] branch main updated: NIFI-10596 Update Test Containers
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 a721e03000 NIFI-10596 Update Test Containers a721e03000 is described below commit a721e030005d52db559651300e34bbd31dbd8739 Author: UcanInfosec <107478475+ucaninfo...@users.noreply.github.com> AuthorDate: Wed Oct 5 13:56:47 2022 -0400 NIFI-10596 Update Test Containers This closes #6488 Signed-off-by: Mike Thomsen --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 041bb5c333..d8ee172dc8 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ 4.5.13 4.4.15 1.70 -1.17.3 +1.17.5 1.7.36 2.3.0 9.4.49.v20220914
[nifi] 02/02: NIFI-10570 Upgrade SnakeYaml to 1.33
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 209ca78abcb78d2f9f9c47abfcd9f318182ac0a2 Author: UcanInfosec <107478475+ucaninfo...@users.noreply.github.com> AuthorDate: Sat Oct 1 20:09:43 2022 -0400 NIFI-10570 Upgrade SnakeYaml to 1.33 This closes #6468 Signed-off-by: Mike Thomsen --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 602cc54a43..041bb5c333 100644 --- a/pom.xml +++ b/pom.xml @@ -138,7 +138,7 @@ 1.2.11 3.11.2 3.10.6.Final -1.32 +1.33 4.1.81.Final 5.3.23 5.7.3
[nifi] branch main updated (f0d8a4d007 -> 209ca78abc)
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from f0d8a4d007 NIFI-10555 Add controller services support for minifi standard processors new 01b2cda35c NIFI-10590 Upgrade Groovy From 2.5.14 To 2.5.18 new 209ca78abc NIFI-10570 Upgrade SnakeYaml to 1.33 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: nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml | 4 ++-- pom.xml| 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
[nifi] 01/02: NIFI-10590 Upgrade Groovy From 2.5.14 To 2.5.18
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 01b2cda35cfa14ca574ac50826aa299a6b6f8a8f Author: mr1716 AuthorDate: Tue Oct 4 15:02:13 2022 -0400 NIFI-10590 Upgrade Groovy From 2.5.14 To 2.5.18 This closes #6485 Signed-off-by: Mike Thomsen --- nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml index 8c4960071e..274af3a669 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml +++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml @@ -476,13 +476,13 @@ org.codehaus.groovy groovy-json -2.5.14 +2.5.18 test org.codehaus.groovy groovy -2.5.14 +2.5.18 test
[nifi] branch main updated: NIFI-10192 Caffeine cache schema request for reuse
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 4b691b133b NIFI-10192 Caffeine cache schema request for reuse
4b691b133b is described below
commit 4b691b133b231cdec04290afaf1fe433b6047717
Author: Aerilym
AuthorDate: Fri Sep 9 12:47:49 2022 +1000
NIFI-10192 Caffeine cache schema request for reuse
This closes #6364
Signed-off-by: Mike Thomsen
---
.../nifi/processors/standard/LookupRecord.java | 43 +-
1 file changed, 41 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LookupRecord.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LookupRecord.java
index 7301c26f63..7e4285ad2f 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LookupRecord.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LookupRecord.java
@@ -17,6 +17,8 @@
package org.apache.nifi.processors.standard;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
import org.apache.nifi.annotation.behavior.DynamicProperty;
import org.apache.nifi.annotation.behavior.EventDriven;
import org.apache.nifi.annotation.behavior.InputRequirement;
@@ -45,6 +47,7 @@ import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Relationship;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processor.io.InputStreamCallback;
+import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.record.path.FieldValue;
import org.apache.nifi.record.path.RecordPath;
import org.apache.nifi.record.path.RecordPathResult;
@@ -194,6 +197,18 @@ public class LookupRecord extends AbstractProcessor {
.required(true)
.build();
+static final PropertyDescriptor CACHE_SIZE = new
PropertyDescriptor.Builder()
+.name("record-path-lookup-miss-result-cache-size")
+.displayName("Cache Size")
+.description("Specifies how many lookup values/records should be
cached."
++ "Setting this property to zero means no caching will be done
and the table will be queried for each lookup value in each record. If the
lookup "
++ "table changes often or the most recent data must be
retrieved, do not use the cache.")
+.addValidator(StandardValidators.NON_NEGATIVE_INTEGER_VALIDATOR)
+.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
+.defaultValue("0")
+.required(true)
+.build();
+
static final Relationship REL_MATCHED = new Relationship.Builder()
.name("matched")
.description("All records for which the lookup returns a value will be
routed to this relationship")
@@ -238,6 +253,7 @@ public class LookupRecord extends AbstractProcessor {
properties.add(ROUTING_STRATEGY);
properties.add(RESULT_CONTENTS);
properties.add(REPLACEMENT_STRATEGY);
+properties.add(CACHE_SIZE);
return properties;
}
@@ -451,7 +467,7 @@ public class LookupRecord extends AbstractProcessor {
if (isInPlaceReplacement) {
return new InPlaceReplacementStrategy();
} else {
-return new RecordPathReplacementStrategy();
+return new RecordPathReplacementStrategy(context);
}
}
@@ -536,6 +552,19 @@ public class LookupRecord extends AbstractProcessor {
private class RecordPathReplacementStrategy implements ReplacementStrategy
{
private int lookupCount = 0;
+private volatile Cache, Optional> cache;
+
+public RecordPathReplacementStrategy(ProcessContext context) {
+
+final int cacheSize =
context.getProperty(CACHE_SIZE).evaluateAttributeExpressions().asInteger();
+
+if (this.cache == null || cacheSize > 0) {
+this.cache = Caffeine.newBuilder()
+.maximumSize(cacheSize)
+.build();
+}
+}
+
@Override
public Set lookup(final Record record, final
ProcessContext context, final LookupContext lookupContext) {
lookupCount++;
@@ -548,8 +577,15 @@ public class LookupRecord extends AbstractProcessor {
final FlowFile flowFile = lookupContext.getOriginalFlowFile();
final Optional lookupValueOption;
+final Optional lookupValueCacheOption;
+
try {
-
[nifi] branch main updated: NIFI-10436 Initial basic brotli support NIFI-10436 Add Brotli-compressed SampleFile.txt.br for unit testing NIFI-10436 Fixup basic usage of Brotli4j API NIFI-10436 NOTICE o
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 3e60414d48 NIFI-10436 Initial basic brotli support NIFI-10436 Add
Brotli-compressed SampleFile.txt.br for unit testing NIFI-10436 Fixup basic
usage of Brotli4j API NIFI-10436 NOTICE ok, LICENSE updated NIFI-10436 style
fixup CompressContent.java NIFI-10436 Update CompressContent.java
3e60414d48 is described below
commit 3e60414d486342ee59cee65818c79f3612946d3d
Author: Matthew Hawkins
AuthorDate: Sat Sep 17 21:13:30 2022 +1000
NIFI-10436 Initial basic brotli support
NIFI-10436 Add Brotli-compressed SampleFile.txt.br for unit testing
NIFI-10436 Fixup basic usage of Brotli4j API
NIFI-10436 NOTICE ok, LICENSE updated
NIFI-10436 style fixup CompressContent.java
NIFI-10436 Update CompressContent.java
This closes #6432
Signed-off-by: Mike Thomsen
---
nifi-assembly/LICENSE | 5 +++-
.../nifi-standard-processors/pom.xml | 5
.../nifi/processors/standard/CompressContent.java | 29 +---
.../processors/standard/TestCompressContent.java | 30 +
.../resources/CompressedData/SampleFile.txt.br | Bin 0 -> 71 bytes
nifi-nar-bundles/nifi-standard-bundle/pom.xml | 5
6 files changed, 69 insertions(+), 5 deletions(-)
diff --git a/nifi-assembly/LICENSE b/nifi-assembly/LICENSE
index 4ecd35df8a..e6842290a4 100644
--- a/nifi-assembly/LICENSE
+++ b/nifi-assembly/LICENSE
@@ -3120,4 +3120,7 @@ which is available under an MIT license.
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
+THE SOFTWARE.
+
+This product bundles 'Brotli4j' which is available under the Apache License 2.0
+
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 3ea60c1647..0a7b197ae8 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
@@ -229,6 +229,11 @@
com.github.luben
zstd-jni
+
+com.aayushatharva.brotli4j
+brotli4j
+1.8.0
+
org.tukaani
xz
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 6ad4192cd1..605b25cf97 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
@@ -25,6 +25,10 @@ import
org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
import
org.apache.commons.compress.compressors.lz4.FramedLZ4CompressorInputStream;
import
org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream;
import
org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream;
+import com.aayushatharva.brotli4j.decoder.BrotliInputStream;
+import com.aayushatharva.brotli4j.encoder.BrotliOutputStream;
+import com.aayushatharva.brotli4j.Brotli4jLoader;
+import com.aayushatharva.brotli4j.encoder.Encoder;
import org.apache.nifi.annotation.behavior.EventDriven;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
@@ -84,7 +88,7 @@ import java.util.zip.InflaterInputStream;
@SideEffectFree
@SupportsBatching
@InputRequirement(Requirement.INPUT_REQUIRED)
-@Tags({"content", "compress", "decompress", "gzip", "bzip2", "lzma",
"xz-lzma2", "snappy", "snappy-hadoop", "snappy framed", "lz4-framed",
"deflate", "zstd"})
+@Tags({"content", "compress", "decompress", "gzip", "bzip2", "lzma",
"xz-lzma2", "snappy", "snappy-hadoop", "snappy framed", "lz4-framed",
"deflate", "zstd", "brotli"})
@CapabilityDescription("Compresses or decompresses the contents of FlowFiles
using a user-specified compression algorithm and updates the mime.type &
[nifi] branch main updated: NIFI-10557 Upgrade MongoDB driver to 4.7.1
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 8c2b8cb6bc NIFI-10557 Upgrade MongoDB driver to 4.7.1 8c2b8cb6bc is described below commit 8c2b8cb6bc089f91ba37d5b0619232272795cfb5 Author: Lance Kinley AuthorDate: Wed Sep 28 10:49:31 2022 -0700 NIFI-10557 Upgrade MongoDB driver to 4.7.1 This closes #6455 Fully supports MongoDB 6.0 Signed-off-by: Mike Thomsen --- nifi-nar-bundles/nifi-mongodb-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml b/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml index 5493e55981..5d4481e953 100644 --- a/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml @@ -35,7 +35,7 @@ -4.5.0 +4.7.1
[nifi] 02/02: NIFI-10548 Updated Jetty version
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 85d08d39665e7a85f6a9028a5b7c603f372b7d0a Author: mr1716 AuthorDate: Mon Sep 26 09:32:53 2022 -0400 NIFI-10548 Updated Jetty version This closes #6449 Signed-off-by: Mike Thomsen --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e85b30fc95..ffeaaca13a 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ 1.17.3 1.7.36 2.3.0 -9.4.48.v20220622 +9.4.49.v20220914 2.13.4 1.11.1 2.3.5
[nifi] 01/02: NIFI-10517 Updated Flyway-Core version
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 9ad898f4d7225620ddb739831ea2ad78fb433aa3 Author: UcanInfosec <107478475+ucaninfo...@users.noreply.github.com> AuthorDate: Fri Sep 16 19:47:08 2022 -0400 NIFI-10517 Updated Flyway-Core version This closes #6427 Signed-off-by: Mike Thomsen --- nifi-registry/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index a6a9492193..1afe72f87b 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -37,7 +37,7 @@ 2.1 2.7.2 -8.4.2 +8.5.13 7.0.0 3.12.0 3.4.0-01
[nifi] branch main updated (0dec6bfbe1 -> 85d08d3966)
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 0dec6bfbe1 NIFI-10560 This closes #6459. Excluded Elasticsearch and Solr Auto Configuration from Registry new 9ad898f4d7 NIFI-10517 Updated Flyway-Core version new 85d08d3966 NIFI-10548 Updated Jetty version 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: nifi-registry/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[nifi] branch main updated: NIFI-10480 Upgraded gson to 2.9.1
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 86f01af60e NIFI-10480 Upgraded gson to 2.9.1 86f01af60e is described below commit 86f01af60ea7d328d62758e29d34c855bb176b9f Author: UcanInfosec <107478475+ucaninfo...@users.noreply.github.com> AuthorDate: Sun Sep 11 09:25:57 2022 -0400 NIFI-10480 Upgraded gson to 2.9.1 This closes #6399 Signed-off-by: Mike Thomsen --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4c704c313b..df1ca7f83b 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ UTF-8 UTF-8 2014 -2.9.0 +2.9.1 1.7.10 4.10.0 3.12.0
[nifi] branch main updated: NIFI-10479 Update junit-bom to 5.9.0
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 1befa0630e NIFI-10479 Update junit-bom to 5.9.0 1befa0630e is described below commit 1befa0630ea94ac04dff6dcfeb54cb0f90b09c8f Author: mr1716 AuthorDate: Sat Sep 10 19:43:56 2022 -0400 NIFI-10479 Update junit-bom to 5.9.0 This closes #6398 Signed-off-by: Mike Thomsen --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 78871c765b..4c704c313b 100644 --- a/pom.xml +++ b/pom.xml @@ -275,7 +275,7 @@ org.junit junit-bom -5.8.2 +5.9.0 pom import
[nifi] branch main updated: NIFI-10477 Upgraded Apache Calcite from 1.31 to 1.32
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 dfa18b848f NIFI-10477 Upgraded Apache Calcite from 1.31 to 1.32
dfa18b848f is described below
commit dfa18b848f84d5789ee224bb099fa7dc792f5c9d
Author: exceptionfactory
AuthorDate: Sat Sep 10 20:05:26 2022 -0500
NIFI-10477 Upgraded Apache Calcite from 1.31 to 1.32
This closes #6396
Signed-off-by: Mike Thomsen
---
nifi-nar-bundles/nifi-hive-bundle/pom.xml | 2 +-
.../nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml | 2 +-
nifi-nar-bundles/nifi-standard-bundle/pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/nifi-nar-bundles/nifi-hive-bundle/pom.xml
b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
index adecabea4d..439943a03f 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
@@ -114,7 +114,7 @@
3.1.3
${hive3.version}
1.22.0
-1.31.0
+1.32.0
1.6.0
diff --git
a/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml
b/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml
index 373b9fa4df..ec57b973b5 100644
---
a/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml
+++
b/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml
@@ -62,7 +62,7 @@
org.apache.calcite
calcite-core
-1.31.0
+1.32.0
commons-logging
diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index 3e3e95b4fe..1890838f68 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -283,7 +283,7 @@
org.apache.calcite
calcite-core
-1.31.0
+1.32.0
log4j
[nifi] 01/02: NIFI-10474 Update kotlin to 1.7.10
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 5cb12511dd8aa60b27d89dae2b53a80d3070ecff Author: mr1716 AuthorDate: Sat Sep 10 10:39:47 2022 -0400 NIFI-10474 Update kotlin to 1.7.10 This closes #6393 Signed-off-by: Mike Thomsen --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6665cfeb9a..3133671570 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,7 @@ UTF-8 2014 2.9.0 -1.6.20 +1.7.10 4.10.0 3.12.0 2.11.0
[nifi] 02/02: NIFI-10476 Update jackson bom to 2.13.4
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 806151b967a9b7463d9baf80ba3873b21128d73b Author: UcanInfosec <107478475+ucaninfo...@users.noreply.github.com> AuthorDate: Sat Sep 10 10:52:22 2022 -0400 NIFI-10476 Update jackson bom to 2.13.4 This closes #6395 Signed-off-by: Mike Thomsen --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3133671570..78871c765b 100644 --- a/pom.xml +++ b/pom.xml @@ -116,7 +116,7 @@ 1.7.36 2.3.0 9.4.48.v20220622 -2.13.3 +2.13.4 1.11.1 2.3.5 1.3.2
[nifi] branch main updated (ccebf2b271 -> 806151b967)
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from ccebf2b271 NIFI-10466 Updated questdb to 6.5.2-jdk8 new 5cb12511dd NIFI-10474 Update kotlin to 1.7.10 new 806151b967 NIFI-10476 Update jackson bom to 2.13.4 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[nifi] branch main updated: NIFI-10466 Updated questdb to 6.5.2-jdk8
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 ccebf2b271 NIFI-10466 Updated questdb to 6.5.2-jdk8 ccebf2b271 is described below commit ccebf2b271c16ca07834dd7ef2f14d7ceb9c360c Author: mr1716 AuthorDate: Fri Sep 9 07:31:07 2022 -0400 NIFI-10466 Updated questdb to 6.5.2-jdk8 This closes #6384 Signed-off-by: Mike Thomsen --- .../nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml index 5896827e4c..36f79d5399 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml @@ -153,7 +153,7 @@ org.questdb questdb -6.2.1-jdk8 +6.5.2-jdk8 org.apache.nifi
[nifi] 03/03: NIFI-10470 Upgraded SSHJ from 0.33.0 to 0.34.0
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 1370295bd3fea8cf090bee8e4e708e06e3c409fb Author: exceptionfactory AuthorDate: Fri Sep 9 12:06:01 2022 -0500 NIFI-10470 Upgraded SSHJ from 0.33.0 to 0.34.0 This closes #6387 Signed-off-by: Mike Thomsen --- nifi-nar-bundles/nifi-standard-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/pom.xml index bd586c4f58..3e3e95b4fe 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml @@ -127,7 +127,7 @@ com.hierynomus sshj -0.33.0 +0.34.0 jakarta.activation
[nifi] 02/03: NIFI-10469 Updated byte-buddy-agent to 1.12.14
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit ea44af0642b585dda2045f40891e2dc7bcda915c Author: UcanInfosec <107478475+ucaninfo...@users.noreply.github.com> AuthorDate: Fri Sep 9 11:09:51 2022 -0400 NIFI-10469 Updated byte-buddy-agent to 1.12.14 This closes #6386 Signed-off-by: Mike Thomsen --- nifi-registry/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index 8b52eb969f..a6a9492193 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -186,13 +186,13 @@ net.bytebuddy byte-buddy -1.9.10 +1.12.14 net.bytebuddy byte-buddy-agent -1.9.10 +1.12.14
[nifi] 01/03: NIFI-10468 Upgraded Netty from 4.1.79 to 4.1.81
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit c3925c6b9a6452a2f54518bf2212c78cc0d63916 Author: exceptionfactory AuthorDate: Fri Sep 9 11:10:51 2022 -0500 NIFI-10468 Upgraded Netty from 4.1.79 to 4.1.81 This closes #6385 Signed-off-by: Mike Thomsen --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f743101574..6665cfeb9a 100644 --- a/pom.xml +++ b/pom.xml @@ -136,8 +136,8 @@ 1.2.11 3.11.2 3.10.6.Final -4.1.79.Final 1.31 +4.1.81.Final 5.3.22 5.7.3 1.6.6
[nifi] branch main updated (5b3601f50f -> 1370295bd3)
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 5b3601f50f NIFI-10472 Upgraded SnakeYAML from 1.29 to 1.31 new c3925c6b9a NIFI-10468 Upgraded Netty from 4.1.79 to 4.1.81 new ea44af0642 NIFI-10469 Updated byte-buddy-agent to 1.12.14 new 1370295bd3 NIFI-10470 Upgraded SSHJ from 0.33.0 to 0.34.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: nifi-nar-bundles/nifi-standard-bundle/pom.xml | 2 +- nifi-registry/pom.xml | 4 ++-- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
[nifi] branch main updated: NIFI-10472 Upgraded SnakeYAML from 1.29 to 1.31
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 5b3601f50f NIFI-10472 Upgraded SnakeYAML from 1.29 to 1.31
5b3601f50f is described below
commit 5b3601f50fb71f7c3b53cbfbcd3a2cccf45b06ee
Author: exceptionfactory
AuthorDate: Fri Sep 9 14:19:11 2022 -0500
NIFI-10472 Upgraded SnakeYAML from 1.29 to 1.31
- Replaced module overrides with root managed dependency version
This closes #6389
Signed-off-by: Mike Thomsen
---
minifi/pom.xml | 5 -
.../nifi-easyrules-bundle/nifi-easyrules-service/pom.xml| 1 -
nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml | 6 --
nifi-nar-bundles/nifi-graph-bundle/pom.xml | 6 --
nifi-nar-bundles/nifi-hive-bundle/pom.xml | 6 --
nifi-nar-bundles/nifi-ranger-bundle/pom.xml | 6 --
nifi-nar-bundles/nifi-rules-action-handler-bundle/pom.xml | 6 --
nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml | 6 --
.../nifi-standard-bundle/nifi-standard-content-viewer/pom.xml | 1 -
nifi-nar-bundles/nifi-standard-bundle/pom.xml | 5 -
nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml| 5 -
nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml | 6 --
pom.xml | 6 ++
13 files changed, 6 insertions(+), 59 deletions(-)
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 9b367f8336..bf0c402b55 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -203,11 +203,6 @@ limitations under the License.
2.3.3
provided
-
-org.yaml
-snakeyaml
-1.29
-
diff --git
a/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml
b/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml
index a0845f25e9..0747295d9c 100644
--- a/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml
+++ b/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml
@@ -35,7 +35,6 @@
org.yaml
snakeyaml
-1.29
org.apache.nifi
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml
b/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml
index 0b68388318..78c90e5023 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml
@@ -34,12 +34,6 @@ language governing permissions and limitations under the
License. -->
-
-
-org.yaml
-snakeyaml
-1.29
-
org.apache.nifi
nifi-elasticsearch-processors
diff --git a/nifi-nar-bundles/nifi-graph-bundle/pom.xml
b/nifi-nar-bundles/nifi-graph-bundle/pom.xml
index 2d1377c287..af96efa5e7 100644
--- a/nifi-nar-bundles/nifi-graph-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-graph-bundle/pom.xml
@@ -41,12 +41,6 @@
-
-
-org.yaml
-snakeyaml
-1.29
-
org.apache.nifi
nifi-graph-processors
diff --git a/nifi-nar-bundles/nifi-hive-bundle/pom.xml
b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
index d31ad02b5a..adecabea4d 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
@@ -67,12 +67,6 @@
avatica
${avatica.version}
-
-
-org.yaml
-snakeyaml
-1.29
-
org.apache.commons
diff --git a/nifi-nar-bundles/nifi-ranger-bundle/pom.xml
b/nifi-nar-bundles/nifi-ranger-bundle/pom.xml
index 355e0ae87f..bbc87fb9dc 100644
--- a/nifi-nar-bundles/nifi-ranger-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-ranger-bundle/pom.xml
@@ -43,12 +43,6 @@
zookeeper
${zookeeper.version}
-
-
-org.yaml
-snakeyaml
-1.29
-
org.apache.commons
diff --git a/nifi-nar-bundles/nifi-rules-action-handler-bundle/pom.xml
b/nifi-nar-bundles/nifi-rules-action-handler-bundle/pom.xml
index d6531d988b..cf68f6ed8c 100644
--- a/nifi-nar-bundles/nifi-rules-action-handler-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-rules-action-handler-bundle/pom.xml
@@ -35,12 +3
[nifi] branch main updated: NIFI-2827 Adding zstd-jni to the necessary pom.xml. It's already in the LICENSE. NIFI-2827 Update CompressContent.java to use zstd compression format NIFI-2827 Update test
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 64acd8b1c5 NIFI-2827 Adding zstd-jni to the necessary pom.xml. It's
already in the LICENSE. NIFI-2827 Update CompressContent.java to use zstd
compression format NIFI-2827 Update test cases for CompressContent.java to
include zstd format NIFI-2827 Update JsonRecordSetWriter.java to enable zstd
compression format
64acd8b1c5 is described below
commit 64acd8b1c5f84473e3d07e23450570a9dc8c4242
Author: Matthew Hawkins
AuthorDate: Fri Aug 12 02:36:27 2022 +1000
NIFI-2827 Adding zstd-jni to the necessary pom.xml. It's already in the
LICENSE.
NIFI-2827 Update CompressContent.java to use zstd compression format
NIFI-2827 Update test cases for CompressContent.java to include zstd format
NIFI-2827 Update JsonRecordSetWriter.java to enable zstd compression format
This closes #6294
Signed-off-by: Mike Thomsen
---
minifi/pom.xml | 5
.../nifi-standard-processors/pom.xml | 4 +++
.../nifi/processors/standard/CompressContent.java | 23 +---
.../processors/standard/TestCompressContent.java | 30 +
.../resources/CompressedData/SampleFile.txt.zst| Bin 0 -> 80 bytes
nifi-nar-bundles/nifi-standard-bundle/pom.xml | 5
.../org/apache/nifi/json/JsonRecordSetWriter.java | 9 +--
7 files changed, 70 insertions(+), 6 deletions(-)
diff --git a/minifi/pom.xml b/minifi/pom.xml
index e06e6543f9..9b367f8336 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -504,6 +504,11 @@ limitations under the License.
lzma-java
1.3
+
+com.github.luben
+zstd-jni
+1.5.2-3
+
org.tukaani
xz
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 b191e369be..9956a75881 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
@@ -221,6 +221,10 @@
com.github.jponge
lzma-java
+
+com.github.luben
+zstd-jni
+
org.tukaani
xz
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 60fb4c3653..6ad4192cd1 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
@@ -23,6 +23,8 @@ import
org.apache.commons.compress.compressors.CompressorStreamFactory;
import
org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
import
org.apache.commons.compress.compressors.lz4.FramedLZ4CompressorInputStream;
+import
org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream;
+import
org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream;
import org.apache.nifi.annotation.behavior.EventDriven;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
@@ -82,7 +84,7 @@ import java.util.zip.InflaterInputStream;
@SideEffectFree
@SupportsBatching
@InputRequirement(Requirement.INPUT_REQUIRED)
-@Tags({"content", "compress", "decompress", "gzip", "bzip2", "lzma",
"xz-lzma2", "snappy", "snappy-hadoop", "snappy framed", "lz4-framed",
"deflate"})
+@Tags({"content", "compress", "decompress", "gzip", "bzip2", "lzma",
"xz-lzma2", "snappy", "snappy-hadoop", "snappy framed", "lz4-framed",
"deflate", "zstd"})
@CapabilityDescription("Compresses or decompresses the contents of FlowFiles
using a user-specified compression algorithm and updates the mime.type "
+ "attribute as appropriate. This processor operates in a very memory
efficient way so very large objects well beyond the heap size "
+ "are generally fine to process"
[nifi] branch main updated: NIFI-10433 Updated javassist
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 6ac7bfe0fa NIFI-10433 Updated javassist 6ac7bfe0fa is described below commit 6ac7bfe0faa65758d0ce542d77705ecafc34c82a Author: UcanInfosec <107478475+ucaninfo...@users.noreply.github.com> AuthorDate: Sat Sep 3 11:09:53 2022 -0400 NIFI-10433 Updated javassist This closes #6363 Signed-off-by: Mike Thomsen --- .../nifi-windows-event-log-processors/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-windows-event-log-bundle/nifi-windows-event-log-processors/pom.xml b/nifi-nar-bundles/nifi-windows-event-log-bundle/nifi-windows-event-log-processors/pom.xml index 1c50beea25..7cf912fdfe 100644 --- a/nifi-nar-bundles/nifi-windows-event-log-bundle/nifi-windows-event-log-processors/pom.xml +++ b/nifi-nar-bundles/nifi-windows-event-log-bundle/nifi-windows-event-log-processors/pom.xml @@ -22,7 +22,7 @@ language governing permissions and limitations under the License. --> 5.10.0 -3.23.1-GA +3.29.1-GA
[nifi] branch main updated: NIFI-10393 Update the lucene version
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 60a6578a70 NIFI-10393 Update the lucene version 60a6578a70 is described below commit 60a6578a70e892a4998b6e61fedc8e46654193b4 Author: mr1716 AuthorDate: Wed Aug 24 09:44:20 2022 -0400 NIFI-10393 Update the lucene version This closes #6333 Signed-off-by: Mike Thomsen --- nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml b/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml index d9c7825ba5..a1f916257f 100644 --- a/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-provenance-repository-bundle/pom.xml @@ -27,7 +27,7 @@ nifi-provenance-repository-nar -8.8.2 +8.11.1
[nifi] branch main updated: NIFI-9984 Allow 200-series responses in OAuth2 Access Token Provider
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 64f9b66141 NIFI-9984 Allow 200-series responses in OAuth2 Access Token
Provider
64f9b66141 is described below
commit 64f9b66141f89439923250bf2c263d5af022badb
Author: exceptionfactory
AuthorDate: Wed May 4 11:13:57 2022 -0500
NIFI-9984 Allow 200-series responses in OAuth2 Access Token Provider
This closes #6016
Signed-off-by: Mike Thomsen
---
.../nifi/oauth2/StandardOauth2AccessTokenProvider.java | 17 -
.../oauth2/StandardOauth2AccessTokenProviderTest.java | 15 +--
2 files changed, 17 insertions(+), 15 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/main/java/org/apache/nifi/oauth2/StandardOauth2AccessTokenProvider.java
b/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/main/java/org/apache/nifi/oauth2/StandardOauth2AccessTokenProvider.java
index c09ecc9e96..af3a96dd68 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/main/java/org/apache/nifi/oauth2/StandardOauth2AccessTokenProvider.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/main/java/org/apache/nifi/oauth2/StandardOauth2AccessTokenProvider.java
@@ -315,19 +315,18 @@ public class StandardOauth2AccessTokenProvider extends
AbstractControllerService
this.accessDetails = getAccessDetails(refreshRequest);
}
-private AccessToken getAccessDetails(Request newRequest) {
+private AccessToken getAccessDetails(final Request newRequest) {
try {
-Response response = httpClient.newCall(newRequest).execute();
-String responseBody = response.body().string();
-if (response.code() != 200) {
+final Response response = httpClient.newCall(newRequest).execute();
+final String responseBody = response.body().string();
+if (response.isSuccessful()) {
+getLogger().debug("OAuth2 Access Token retrieved [HTTP {}]",
response.code());
+return ACCESS_DETAILS_MAPPER.readValue(responseBody,
AccessToken.class);
+} else {
getLogger().error(String.format("OAuth2 access token request
failed [HTTP %d], response:%n%s", response.code(), responseBody));
throw new ProcessException(String.format("OAuth2 access token
request failed [HTTP %d]", response.code()));
}
-
-AccessToken accessDetails =
ACCESS_DETAILS_MAPPER.readValue(responseBody, AccessToken.class);
-
-return accessDetails;
-} catch (IOException e) {
+} catch (final IOException e) {
throw new UncheckedIOException("OAuth2 access token request
failed", e);
}
}
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/test/java/org/apache/nifi/oauth2/StandardOauth2AccessTokenProviderTest.java
b/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/test/java/org/apache/nifi/oauth2/StandardOauth2AccessTokenProviderTest.java
index cbc485aaf6..20054bcad3 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/test/java/org/apache/nifi/oauth2/StandardOauth2AccessTokenProviderTest.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/test/java/org/apache/nifi/oauth2/StandardOauth2AccessTokenProviderTest.java
@@ -64,6 +64,9 @@ public class StandardOauth2AccessTokenProviderTest {
private static final String CLIENT_SECRET = "clientSecret";
private static final long FIVE_MINUTES = 300;
+private static final int HTTP_OK = 200;
+private static final int HTTP_ACCEPTED = 201;
+
private StandardOauth2AccessTokenProvider testSubject;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -146,7 +149,7 @@ public class StandardOauth2AccessTokenProviderTest {
// GIVEN
Response response = buildResponse(
-200,
+HTTP_OK,
"{ \"access_token\":\"" + accessTokenValue + "\" }"
);
@@ -166,12 +169,12 @@ public class StandardOauth2AccessTokenProviderTest {
String expectedToken = "second_token";
Response response1 = buildResponse(
-200,
+HTTP_OK,
"{ \"access_token\":\"" + firstToken + "\", \"expires_in\":\"0\"
[nifi] branch main updated: NIFI-9952 Upgraded Jackson BOM to 2.13.2.20220328
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 4f423a59ba NIFI-9952 Upgraded Jackson BOM to 2.13.2.20220328 4f423a59ba is described below commit 4f423a59ba6ef40cbed8dda225c6cbba7bc94dc6 Author: exceptionfactory AuthorDate: Fri Apr 22 13:52:43 2022 -0500 NIFI-9952 Upgraded Jackson BOM to 2.13.2.20220328 - Removed unnecessary references to jackson.version property - Removed unnecessary dependency management references to Jackson libraries This closes #5992 Signed-off-by: Mike Thomsen --- .../minifi-c2-provider-nifi-rest/pom.xml | 1 - minifi/pom.xml | 5 --- nifi-commons/nifi-expression-language/pom.xml | 1 - nifi-commons/nifi-json-utils/pom.xml | 2 -- nifi-commons/nifi-property-protection-aws/pom.xml | 1 - nifi-commons/nifi-record-path/pom.xml | 1 - nifi-commons/nifi-site-to-site-client/pom.xml | 1 - nifi-commons/nifi-web-utils/pom.xml| 3 -- nifi-external/nifi-spark-receiver/pom.xml | 1 - nifi-manifest/nifi-runtime-manifest-core/pom.xml | 1 - .../nifi-avro-bundle/nifi-avro-processors/pom.xml | 1 - .../nifi-aws-abstract-processors/pom.xml | 13 .../nifi-aws-parameter-value-providers/pom.xml | 1 - .../nifi-aws-bundle/nifi-aws-service-api/pom.xml | 13 nifi-nar-bundles/nifi-aws-bundle/pom.xml | 8 - .../nifi-azure-processors/pom.xml | 39 -- .../nifi-azure-services-api/pom.xml| 21 nifi-nar-bundles/nifi-azure-bundle/pom.xml | 37 .../pom.xml| 1 - nifi-nar-bundles/nifi-cassandra-bundle/pom.xml | 11 -- nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml | 1 - .../nifi-datadog-reporting-task/pom.xml| 1 - nifi-nar-bundles/nifi-druid-bundle/pom.xml | 22 .../nifi-easyrules-service/pom.xml | 1 - .../nifi-elasticsearch-client-service-api/pom.xml | 1 - .../nifi-elasticsearch-client-service/pom.xml | 1 - .../nifi-elasticsearch-processors/pom.xml | 2 -- .../nifi-elasticsearch-restapi-processors/pom.xml | 1 - .../nifi-enrich-processors/pom.xml | 1 - nifi-nar-bundles/nifi-enrich-bundle/pom.xml| 16 - .../nifi-extension-utils/nifi-hadoop-utils/pom.xml | 11 -- .../nifi-listed-entity/pom.xml | 1 - .../nifi-hadoop-record-utils/pom.xml | 11 -- .../nifi-flume-processors/pom.xml | 1 - .../nifi-framework-cluster-protocol/pom.xml| 1 - .../nifi-framework/nifi-framework-cluster/pom.xml | 3 -- .../nifi-web/nifi-web-security/pom.xml | 1 - nifi-nar-bundles/nifi-framework-bundle/pom.xml | 5 --- .../nifi-gcp-bundle/nifi-gcp-services-api/pom.xml | 1 - nifi-nar-bundles/nifi-gcp-bundle/pom.xml | 16 - .../nifi-graph-processors/pom.xml | 1 - nifi-nar-bundles/nifi-hadoop-bundle/pom.xml| 6 .../nifi-hadoop-libraries-bundle/pom.xml | 26 --- .../nifi-hbase-processors/pom.xml | 2 -- nifi-nar-bundles/nifi-hive-bundle/pom.xml | 11 -- .../nifi-jms-bundle/nifi-jms-processors/pom.xml| 1 - .../nifi-jolt-record-processors/pom.xml| 1 - .../nifi-kudu-bundle/nifi-kudu-processors/pom.xml | 1 - .../nifi-mongodb-services/pom.xml | 1 - .../nifi-network-processors/pom.xml| 1 - .../nifi-network-bundle/nifi-network-utils/pom.xml | 1 - .../nifi-parquet-processors/pom.xml| 1 - .../nifi-ranger-bundle/nifi-ranger-plugin/pom.xml | 1 - nifi-nar-bundles/nifi-ranger-bundle/pom.xml| 6 .../nifi-redis-extensions/pom.xml | 1 - .../nifi-rules-action-handler-bundle/pom.xml | 11 -- .../nifi-salesforce-processors/pom.xml | 2 -- .../nifi-solr-bundle/nifi-solr-processors/pom.xml | 1 - .../nifi-livy-controller-service/pom.xml | 1 - .../nifi-splunk-processors/pom.xml | 1 - nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml | 6 .../nifi-standard-utils/pom.xml| 7 nifi-nar-bundles/nifi-standard-bundle/pom.xml | 34 --- .../nifi-hadoop-dbcp-service-bundle/pom.xml| 11 -- .../nifi-hwx-schema-registry-service/pom.xml | 25 -- .../nifi-lookup-services-bundle/pom.xml| 11 -- .../nifi-oauth2-provider-service/pom.xml | 1 - .../nifi-record-serialization-services/pom.xml | 2 -- .../nifi-stateless-processor/pom.xml | 1
[nifi] branch main updated: NIFI-9927 Initial Commit to clean up all extraneous version/group declarations.
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 84340962d4 NIFI-9927 Initial Commit to clean up all extraneous version/group declarations. 84340962d4 is described below commit 84340962d452a9b883f14de1f8f594eeb89bd80f Author: Joe Witt AuthorDate: Thu Apr 14 15:24:27 2022 -0700 NIFI-9927 Initial Commit to clean up all extraneous version/group declarations. This closes #5969 Signed-off-by: Mike Thomsen --- minifi/minifi-docker/pom.xml | 1 - minifi/minifi-nar-bundles/pom.xml | 1 - minifi/pom.xml | 1 - nifi-commons/nifi-json-utils/pom.xml | 1 - nifi-commons/nifi-rocksdb-utils/pom.xml| 1 - nifi-commons/nifi-utils/pom.xml| 1 - nifi-commons/nifi-uuid5/pom.xml| 12 +-- nifi-commons/nifi-xml-processing/pom.xml | 1 - nifi-commons/pom.xml | 1 - nifi-external/pom.xml | 1 - nifi-h2/nifi-h2-database/pom.xml | 1 - .../nifi-accumulo-bundle/nifi-accumulo-nar/pom.xml | 1 - .../nifi-accumulo-services-api-nar/pom.xml | 1 - .../nifi-accumulo-services-nar/pom.xml | 1 - nifi-nar-bundles/nifi-accumulo-bundle/pom.xml | 1 - .../nifi-amqp-bundle/nifi-amqp-nar/pom.xml | 1 - nifi-nar-bundles/nifi-amqp-bundle/pom.xml | 1 - .../nifi-avro-bundle/nifi-avro-nar/pom.xml | 1 - nifi-nar-bundles/nifi-avro-bundle/pom.xml | 2 - .../nifi-beats-bundle/nifi-beats-nar/pom.xml | 1 - nifi-nar-bundles/nifi-beats-bundle/pom.xml | 1 - .../pom.xml| 2 - .../nifi-cassandra-services-api-nar/pom.xml| 1 - .../nifi-couchbase-nar/pom.xml | 1 - .../nifi-couchbase-services-api-nar/pom.xml| 1 - nifi-nar-bundles/nifi-couchbase-bundle/pom.xml | 2 - .../nifi-cybersecurity-nar/pom.xml | 1 - nifi-nar-bundles/nifi-cybersecurity-bundle/pom.xml | 2 - nifi-nar-bundles/nifi-druid-bundle/pom.xml | 1 - .../nifi-easyrules-nar/pom.xml | 1 - .../pom.xml| 1 - .../nifi-elasticsearch-client-service-nar/pom.xml | 1 - .../nifi-elasticsearch-nar/pom.xml | 1 - .../nifi-elasticsearch-restapi-nar/pom.xml | 1 - nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml | 1 - nifi-nar-bundles/nifi-evtx-bundle/pom.xml | 1 - .../nifi-extension-utils/nifi-hadoop-utils/pom.xml | 1 - .../nifi-hadoop-record-utils/pom.xml | 1 - .../nifi-reporting-utils/pom.xml | 1 - .../nifi-flume-bundle/nifi-flume-nar/pom.xml | 1 - nifi-nar-bundles/nifi-flume-bundle/pom.xml | 1 - .../nifi-web/nifi-web-content-access/pom.xml | 1 - .../nifi-web/nifi-web-content-viewer/pom.xml | 1 - .../nifi-framework/nifi-web/nifi-web-docs/pom.xml | 1 - .../nifi-framework/nifi-web/nifi-web-error/pom.xml | 1 - .../nifi-web/nifi-web-optimistic-locking/pom.xml | 1 - .../nifi-gcp-services-api-nar/pom.xml | 1 - nifi-nar-bundles/nifi-gcp-bundle/pom.xml | 1 - .../nifi-grpc-bundle/nifi-grpc-nar/pom.xml | 1 - nifi-nar-bundles/nifi-grpc-bundle/pom.xml | 1 - .../nifi-hadoop-libraries-bundle/pom.xml | 1 - .../nifi-hazelcast-services-api-nar/pom.xml| 1 - .../nifi-hazelcast-services-nar/pom.xml| 1 - .../nifi-hazelcast-services/pom.xml| 1 - nifi-nar-bundles/nifi-hazelcast-bundle/pom.xml | 1 - .../nifi-hive-bundle/nifi-hive-nar/pom.xml | 1 - .../nifi-hive-services-api-nar/pom.xml | 1 - .../nifi-hive-bundle/nifi-hive3-nar/pom.xml| 1 - .../nifi-hive-bundle/nifi-hive_1_1-nar/pom.xml | 1 - nifi-nar-bundles/nifi-jms-bundle/pom.xml | 1 - .../nifi-jolt-record-nar/pom.xml | 1 - nifi-nar-bundles/nifi-jolt-record-bundle/pom.xml | 1 - .../nifi-kudu-bundle/nifi-kudu-nar/pom.xml | 1 - nifi-nar-bundles/nifi-kudu-bundle/pom.xml | 2 - .../nifi-media-bundle/nifi-media-nar/pom.xml | 1 - nifi-nar-bundles/nifi-media-bundle/pom.xml | 1 - .../nifi-parquet-bundle/nifi-parquet-nar/pom.xml | 1 - nifi-nar-bundles/nifi-parquet-bundle/pom.xml | 2 - .../nifi-pgp-bundle/nifi-pgp-nar/pom.xml | 1 - .../nifi-pgp-service-api-nar/pom.xml | 1 - .../nifi-pgp-bundle/nifi-pgp-service-nar/pom.xml | 1 - nifi-nar-bundles/nifi-pgp-bundle/pom.xml | 1 - .../nifi-poi-bundle/nifi-poi-nar/pom.xml
[nifi] branch main updated: NIFI-9902 - Improve handling of charsets when performing string/byte conversions
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 900a34971c NIFI-9902 - Improve handling of charsets when performing
string/byte conversions
900a34971c is described below
commit 900a34971ce5e93f8a457a56979775aefc4dd5f7
Author: Paul Grey
AuthorDate: Mon Apr 11 11:35:37 2022 -0400
NIFI-9902 - Improve handling of charsets when performing string/byte
conversions
This closes #5954
Signed-off-by: Mike Thomsen
---
nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java | 2 +-
.../apache/nifi/jasn1/TestJASN1RecordReaderWithSimpleTypes.java | 3 ++-
.../org/apache/nifi/serialization/record/MockRecordWriter.java | 9 +
.../apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java | 5 +++--
.../apache/nifi/processors/slack/PostSlackTextMessageTest.java | 4 +++-
5 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
b/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
index 7ee30a7c00..36c95652eb 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockFlowFile.java
@@ -272,7 +272,7 @@ public class MockFlowFile implements FlowFileRecord {
}
public void assertContentEquals(final String data) {
-assertContentEquals(data, "UTF-8");
+assertContentEquals(data, StandardCharsets.UTF_8);
}
public void assertContentEquals(final String data, final String charset) {
diff --git
a/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/test/java/org/apache/nifi/jasn1/TestJASN1RecordReaderWithSimpleTypes.java
b/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/test/java/org/apache/nifi/jasn1/TestJASN1RecordReaderWithSimpleTypes.java
index c6cb13a638..67cf5c6419 100644
---
a/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/test/java/org/apache/nifi/jasn1/TestJASN1RecordReaderWithSimpleTypes.java
+++
b/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/test/java/org/apache/nifi/jasn1/TestJASN1RecordReaderWithSimpleTypes.java
@@ -46,6 +46,7 @@ import org.apache.nifi.serialization.record.RecordSchema;
import org.junit.jupiter.api.Test;
import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
@@ -156,7 +157,7 @@ public class TestJASN1RecordReaderWithSimpleTypes
implements JASN1ReadRecordTest
String dataFile = "target/bmpstring_wrapper.dat";
BMPStringWrapper berValue = new BMPStringWrapper();
-berValue.setValue(new BerBMPString("Some UTF-8 String.
こんにちは世界。".getBytes()));
+berValue.setValue(new BerBMPString("Some UTF-8 String.
こんにちは世界。".getBytes(StandardCharsets.UTF_8)));
Map expectedValues = new HashMap() {{
put("value", "Some UTF-8 String. こんにちは世界。");
diff --git
a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/src/main/java/org/apache/nifi/serialization/record/MockRecordWriter.java
b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/src/main/java/org/apache/nifi/serialization/record/MockRecordWriter.java
index 523510900c..fe7bde523f 100644
---
a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/src/main/java/org/apache/nifi/serialization/record/MockRecordWriter.java
+++
b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/src/main/java/org/apache/nifi/serialization/record/MockRecordWriter.java
@@ -28,6 +28,7 @@ import org.apache.nifi.serialization.WriteResult;
import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.Map;
@@ -85,7 +86,7 @@ public class MockRecordWriter extends
AbstractControllerService implements Recor
@Override
public WriteResult write(final RecordSet rs) throws IOException {
if (header != null && !headerWritten) {
-out.write(header.getBytes());
+out.write(header.getBytes(StandardCharsets.UTF_8));
out.write("\n".getBytes());
headerWritten = true;
}
@@ -105,10 +106,10 @@ public class MockRecordWriter extends
AbstractControllerService implements Recor
if (val != null) {
if (quoteValues) {
out.write("\"".getBytes());
-out.write(val.getBytes());
+
[nifi] branch main updated: NIFI-9896: Fixed bug with overwriting Script Body value in InvokeScriptedProcessor
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 252a8abadd NIFI-9896: Fixed bug with overwriting Script Body value in
InvokeScriptedProcessor
252a8abadd is described below
commit 252a8abadd5b37cc40aad0d0fb10b44bd065ad6b
Author: Matthew Burgess
AuthorDate: Fri Apr 8 12:52:44 2022 -0400
NIFI-9896: Fixed bug with overwriting Script Body value in
InvokeScriptedProcessor
This closes #5948
Signed-off-by: Mike Thomsen
---
.../java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java | 2 --
1 file changed, 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java
index 65146dff24..93a9984c83 100644
---
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java
+++
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java
@@ -256,8 +256,6 @@ public class InvokeScriptedProcessor extends
AbstractSessionFactoryProcessor {
scriptingComponentHelper.setScriptPath(newValue);
} else if (ScriptingComponentUtils.SCRIPT_BODY.equals(descriptor))
{
scriptingComponentHelper.setScriptBody(newValue);
-} else if (ScriptingComponentUtils.MODULES.equals(descriptor)) {
-scriptingComponentHelper.setScriptBody(newValue);
} else if
(scriptingComponentHelper.SCRIPT_ENGINE.equals(descriptor)) {
scriptingComponentHelper.setScriptEngineName(newValue);
}
[nifi] branch main updated: NIFI-9887 Set minimum Java build version to 1.8.0-251
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 af3375669c NIFI-9887 Set minimum Java build version to 1.8.0-251 af3375669c is described below commit af3375669c374ab0ca703aee42d4ae32cea10efc Author: exceptionfactory AuthorDate: Wed Apr 6 18:24:31 2022 -0500 NIFI-9887 Set minimum Java build version to 1.8.0-251 - Set minimalJavaBuildVersion property for maven-enforcer-plugin configuration - Updated README to mention Java 8 Update 251 in Minimum Requirements - Disabled site-plugin from parent configuration This closes #5942 Signed-off-by: Mike Thomsen --- README.md | 2 +- pom.xml | 4 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 19272084f2..a1120dfa38 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Apache NiFi was made for dataflow. It supports highly configurable directed grap - Multiple teams can manage and share specific portions of the flow ## Minimum Requirements -* JDK 8 +* JDK 8 Update 251 * Apache Maven 3.6.0 ## Getting Started diff --git a/pom.xml b/pom.xml index f295fae127..ad6c37f439 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,11 @@ 1.8 1.8 true + +1.8.0-251 + +true v16.13.2 1.12.1 1647889104
[nifi] branch main updated: NIFI-9886 Upgrade MongoDB driver to version 4.5.0
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 324e4797e6 NIFI-9886 Upgrade MongoDB driver to version 4.5.0 324e4797e6 is described below commit 324e4797e688d0f68593a395a66ed1425f6743e0 Author: Lance Kinley AuthorDate: Wed Apr 6 13:23:04 2022 -0700 NIFI-9886 Upgrade MongoDB driver to version 4.5.0 Resolves performance issues that impact versions 4.4 and 4.3 of the driver and adds support up through MongoDB 5.1 Add support for Java 17 This closes #5940 Signed-off-by: Mike Thomsen --- nifi-nar-bundles/nifi-mongodb-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml b/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml index 19c19eecf5..df96e8b7e4 100644 --- a/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml @@ -35,7 +35,7 @@ -4.3.2 +4.5.0
[nifi] branch main updated: NIFI-9882 Updated HtmlDocumentationWriter to avoid writing null characters
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 74a4104259 NIFI-9882 Updated HtmlDocumentationWriter to avoid writing
null characters
74a4104259 is described below
commit 74a4104259e83b302d139fbc4216f9e3b2fe3c3e
Author: exceptionfactory
AuthorDate: Wed Apr 6 11:26:08 2022 -0500
NIFI-9882 Updated HtmlDocumentationWriter to avoid writing null characters
This closes #5935
Signed-off-by: Mike Thomsen
---
.../html/HtmlDocumentationWriter.java | 22 ++---
.../html/HtmlDocumentationWriterTest.java | 28 --
2 files changed, 28 insertions(+), 22 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
index 90209cc571..8464143ce1 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/main/java/org/apache/nifi/documentation/html/HtmlDocumentationWriter.java
@@ -843,16 +843,20 @@ public class HtmlDocumentationWriter implements
DocumentationWriter {
protected final static void writeSimpleElement(final XMLStreamWriter
writer, final String elementName,
final String characters, boolean strong, String id) throws
XMLStreamException {
writer.writeStartElement(elementName);
-if (id != null) {
-writer.writeAttribute("id", id);
-}
-if (strong) {
-writer.writeStartElement("strong");
-}
-writer.writeCharacters(characters);
-if (strong) {
-writer.writeEndElement();
+
+if (characters != null) {
+if (id != null) {
+writer.writeAttribute("id", id);
+}
+if (strong) {
+writer.writeStartElement("strong");
+}
+writer.writeCharacters(characters);
+if (strong) {
+writer.writeEndElement();
+}
}
+
writer.writeEndElement();
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/html/HtmlDocumentationWriterTest.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/html/HtmlDocumentationWriterTest.java
index c37ebeb36b..89bd6a566d 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/html/HtmlDocumentationWriterTest.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/src/test/java/org/apache/nifi/documentation/html/HtmlDocumentationWriterTest.java
@@ -32,21 +32,20 @@ import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.nar.StandardExtensionDiscoveringManager;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.reporting.ReportingTask;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import static org.apache.nifi.documentation.html.XmlValidator.assertContains;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class HtmlDocumentationWriterTest {
private ExtensionManager extensionManager;
-@Before
+@BeforeEach
public void setup() {
extensionManager = new StandardExtensionDiscoveringManager();
}
@@ -89,6 +88,9 @@ public class HtmlDocumentationWriterTest {
assertContains(results, "PKCS12");
assertContains(results, "Sensitive Property: true");
+// property with null default value
+assertContains(results, "Keystore Password");
+
// restricted
assertContains(results, "controller service restriction description");
@@ -101,11 +103,11 @@ public class HtmlDocumentationWriterTest {
assertContains(results, "Not Specified");
// verify the right OnRemoved and OnShutdown methods were called
-Assert.assertEquals(0, controllerService.getOnRemovedArgs());
-Assert.assertEquals(0, controllerService.getOnRemovedNoArgs());
+assertEquals(0, controllerService.getOnRemovedArgs());
+
[nifi] branch main updated: NIFI-9873 Upgraded Kotlin to 1.6.20
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 dd612a861a NIFI-9873 Upgraded Kotlin to 1.6.20
dd612a861a is described below
commit dd612a861a5d5a457297202edabee704872699dd
Author: exceptionfactory
AuthorDate: Mon Apr 4 20:21:52 2022 -0500
NIFI-9873 Upgraded Kotlin to 1.6.20
This closes #5930
Signed-off-by: Mike Thomsen
---
pom.xml | 8
1 file changed, 8 insertions(+)
diff --git a/pom.xml b/pom.xml
index 51c2ac12fb..c4eb4d7478 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,6 +99,7 @@
UTF-8
UTF-8
2014
+1.6.20
4.9.3
3.12.0
4.5.13
@@ -551,6 +552,13 @@
import
pom
+
+org.jetbrains.kotlin
+kotlin-bom
+${kotlin.version}
+import
+pom
+
[nifi] branch main updated: NIFI-9872 Upgraded azure-sdk-bom to 1.2.0 for Sensitive Properties
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 e052cf81ba NIFI-9872 Upgraded azure-sdk-bom to 1.2.0 for Sensitive Properties e052cf81ba is described below commit e052cf81ba040cf761b1ac33719e51fa4d2afe71 Author: exceptionfactory AuthorDate: Mon Apr 4 17:09:10 2022 -0500 NIFI-9872 Upgraded azure-sdk-bom to 1.2.0 for Sensitive Properties - Replaced individual Azure dependencies with azure-sdk-bom in nifi-property-protection-azure - Removed woodstox-core and stax2-api exclusions - Refactored TemplateDeserializer test class to avoid dependency on specific XML implementation This closes #5929 Signed-off-by: Mike Thomsen --- .../nifi-property-protection-azure/pom.xml | 39 - .../persistence/TemplateDeserializerTest.groovy| 66 -- .../nifi/persistence/TestTemplateDeserializer.java | 36 3 files changed, 47 insertions(+), 94 deletions(-) diff --git a/nifi-commons/nifi-property-protection-azure/pom.xml b/nifi-commons/nifi-property-protection-azure/pom.xml index 2e71d0f580..6637fa39b2 100644 --- a/nifi-commons/nifi-property-protection-azure/pom.xml +++ b/nifi-commons/nifi-property-protection-azure/pom.xml @@ -21,6 +21,17 @@ 1.17.0-SNAPSHOT nifi-property-protection-azure + + + +com.azure +azure-sdk-bom +1.2.0 +import +pom + + + org.apache.nifi @@ -35,20 +46,11 @@ com.azure azure-security-keyvault-secrets -4.3.3 com.azure azure-core-http-netty - -com.fasterxml.woodstox -woodstox-core - - -org.codehaus.woodstox -stax2-api - io.netty netty-tcnative-boringssl-static @@ -58,20 +60,11 @@ com.azure azure-security-keyvault-keys -4.3.3 com.azure azure-core-http-netty - -com.fasterxml.woodstox -woodstox-core - - -org.codehaus.woodstox -stax2-api - io.netty netty-tcnative-boringssl-static @@ -81,26 +74,16 @@ com.azure azure-identity -1.3.4 com.azure azure-core-http-netty - -com.fasterxml.woodstox -woodstox-core - - -org.codehaus.woodstox -stax2-api - com.azure azure-core-http-okhttp -1.7.1 org.mockito diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/groovy/org/apache/nifi/persistence/TemplateDeserializerTest.groovy b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/groovy/org/apache/nifi/persistence/TemplateDeserializerTest.groovy deleted file mode 100644 index c90868b3d9..00 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/groovy/org/apache/nifi/persistence/TemplateDeserializerTest.groovy +++ /dev/null @@ -1,66 +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.persistence - -import org.apache.nifi.web.api.dto.TemplateDTO -import org.junit.After -import org.
[nifi] branch main updated: NIFI-9869 Upgraded Apache POI from 5.0.0 to 5.2.2
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 c02b4feee2 NIFI-9869 Upgraded Apache POI from 5.0.0 to 5.2.2
c02b4feee2 is described below
commit c02b4feee25c84098ab5a7f0c1cafefa8e442675
Author: exceptionfactory
AuthorDate: Mon Apr 4 13:46:49 2022 -0500
NIFI-9869 Upgraded Apache POI from 5.0.0 to 5.2.2
- Upgraded direct dependencies in nifi-email-processors and
nifi-poi-processors
- Upgraded transitive dependency in nifi-media-bundle
This closes #5927
Signed-off-by: Mike Thomsen
---
.../nifi-email-bundle/nifi-email-processors/pom.xml | 3 ++-
nifi-nar-bundles/nifi-media-bundle/pom.xml| 19 +++
.../nifi-poi-bundle/nifi-poi-processors/pom.xml | 2 +-
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
index 697baa9c53..be5383c722 100644
--- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
@@ -26,6 +26,7 @@
jar
5.5.7
+5.2.2
@@ -117,7 +118,7 @@
org.apache.poi
poi-scratchpad
-5.0.0
+${poi.version}
org.apache.nifi
diff --git a/nifi-nar-bundles/nifi-media-bundle/pom.xml
b/nifi-nar-bundles/nifi-media-bundle/pom.xml
index f6586fc5c7..7e831bfa96 100644
--- a/nifi-nar-bundles/nifi-media-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-media-bundle/pom.xml
@@ -26,6 +26,10 @@
1.17.0-SNAPSHOT
pom
+
+5.2.2
+
+
nifi-media-processors
nifi-media-nar
@@ -46,6 +50,21 @@
jsoup
1.14.2
+
+org.apache.poi
+poi
+${poi.version}
+
+
+org.apache.poi
+poi-scratchpad
+${poi.version}
+
+
+org.apache.poi
+poi-ooxml
+${poi.version}
+
diff --git a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/pom.xml
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/pom.xml
index c42e6ec487..ea6f760ef2 100644
--- a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/pom.xml
@@ -17,7 +17,7 @@
4.0.0
-5.0.0
+5.2.2
[nifi] branch main updated: NIFI-9823 Removed VolatileContentRepository
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 bf51687 NIFI-9823 Removed VolatileContentRepository bf51687 is described below commit bf5168729142168d2549d898e6752a2f83b58067 Author: exceptionfactory AuthorDate: Thu Mar 17 15:29:33 2022 -0500 NIFI-9823 Removed VolatileContentRepository - Removed Volatile Content Repository documentation references This closes #5889 Signed-off-by: Mike Thomsen --- .../src/test/resources/MINIFI-245/config.yml | 2 +- .../src/main/asciidoc/administration-guide.adoc| 12 +- .../repository/VolatileContentRepository.java | 694 - ...he.nifi.controller.repository.ContentRepository | 1 - .../repository/TestVolatileContentRepository.java | 188 -- .../resources/flowcontrollertest.nifi.properties | 2 +- 6 files changed, 4 insertions(+), 895 deletions(-) diff --git a/minifi/minifi-bootstrap/src/test/resources/MINIFI-245/config.yml b/minifi/minifi-bootstrap/src/test/resources/MINIFI-245/config.yml index d72f19a..f76a561 100644 --- a/minifi/minifi-bootstrap/src/test/resources/MINIFI-245/config.yml +++ b/minifi/minifi-bootstrap/src/test/resources/MINIFI-245/config.yml @@ -34,7 +34,7 @@ FlowFile Repository: out period: 5 sec out threads: 4 Content Repository: - implementation: org.apache.nifi.controller.repository.VolatileContentRepository + implementation: org.apache.nifi.controller.repository.OtherContentRepository content claim max appendable size: 10 MB content claim max flow files: 100 always sync: false diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc b/nifi-docs/src/main/asciidoc/administration-guide.adoc index d2f7d76..da65d93 100644 --- a/nifi-docs/src/main/asciidoc/administration-guide.adoc +++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc @@ -3318,14 +3318,14 @@ FlowFile Repository, if also on that disk, could become corrupt. To avoid this s | |*Property*|*Description* -|`nifi.content.repository.implementation`|The Content Repository implementation. The default value is `org.apache.nifi.controller.repository.FileSystemRepository` and should only be changed with caution. To store flowfile content in memory instead of on disk (at the risk of data loss in the event of power/machine failure), set this property to `org.apache.nifi.controller.repository.VolatileContentRepository`. +|`nifi.content.repository.implementation`|The Content Repository implementation. The default value is `org.apache.nifi.controller.repository.FileSystemRepository`. | === File System Content Repository Properties | |*Property*|*Description* -|`nifi.content.repository.implementation`|The Content Repository implementation. The default value is `org.apache.nifi.controller.repository.FileSystemRepository` and should only be changed with caution. To store flowfile content in memory instead of on disk (at the risk of data loss in the event of power/machine failure), set this property to `org.apache.nifi.controller.repository.VolatileContentRepository`. +|`nifi.content.repository.implementation`|The Content Repository implementation. The default value is `org.apache.nifi.controller.repository.FileSystemRepository`. |`nifi.content.claim.max.appendable.size`|When NiFi processes many small FlowFiles, the contents of those FlowFiles are stored in the content repository, but we do not store the content of each individual FlowFile as a separate file in the content repository. Doing so would be very detrimental to performance, if each 120 byte FlowFile, for instance, was written to its own file. Instead, we continue writing to the same file until it reaches some threshold. This property configures that threshold. Setting the value too small can result in poor performance due to reading from and @@ -3376,14 +3376,6 @@ All of the properties defined above (see <http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.nifi.controller.repository; - -import org.apache.commons.io.IOUtils; -import org.apache.nifi.controller.repository.claim.ContentClaim; -import org.apache.nifi.controller.repository.claim.ResourceClaim; -import org.apache.nifi.controller.repository.claim.ResourceClaimManager; -import org.apache.nifi.controller.repository.claim.StandardContentClaim; -import org.apache.nifi.controller.repository.io.ArrayManagedOutputStream; -import org.apache.nifi.controller.repository.io.MemoryMan
[nifi] branch main updated: NIFI-9842 Refactored nifi-commons using JUnit 5
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 0fa4490 NIFI-9842 Refactored nifi-commons using JUnit 5
0fa4490 is described below
commit 0fa4490a9857f67427d21397f7292fdfeaeac77d
Author: exceptionfactory
AuthorDate: Mon Mar 28 11:44:13 2022 -0500
NIFI-9842 Refactored nifi-commons using JUnit 5
- Refactored nifi-bootstrap using JUnit 5
- Refactored nifi-maven-archetypes using JUnit 5
- Refactored nifi-stateless using JUnit 5
This closes #5912
Signed-off-by: Mike Thomsen
---
.../http/HttpNotificationServiceTest.java | 16
.../bootstrap/util/TestSecureNiFiConfigUtil.java | 46 --
...sSecretsManagerSensitivePropertyProviderIT.java | 25 ++--
...zureKeyVaultKeySensitivePropertyProviderIT.java | 25 ++--
.../GcpKmsSensitivePropertyProviderIT.java | 25 ++--
.../nifi/security/krb/TestKerberosKeytabUser.java | 6 +--
.../security/krb/TestKerberosPasswordUser.java | 6 +--
.../security/krb/TestKerberosTicketCacheUser.java | 8 ++--
.../nifi/security/krb/TestKeytabConfiguration.java | 6 +--
.../stream/io/TestNonFlushableOutputStream.java| 2 +-
.../filter/SanitizeContextPathFilterTest.groovy| 34 +---
.../apache/nifi/web/util/WebUtilsGroovyTest.groovy | 34 +++-
.../org/apache/nifi/web/util/WebUtilsTest.java | 16 +++-
.../jaxb/TestJAXBExtensionManifestParser.java | 16
.../nifi/runtime/manifest/TestRuntimeManifest.java | 10 ++---
.../nifi-__artifactBaseName__-processors/pom.xml | 9 -
.../src/test/java/MyProcessorTest.java | 6 +--
.../nifi-__artifactBaseName__/pom.xml | 9 -
.../src/test/java/TestStandardMyService.java | 6 +--
...ropertiesFileEngineConfigurationParserTest.java | 2 +-
.../engine/TestStandardStatelessEngine.java| 6 +--
.../TestStatelessFileSystemContentRepository.java | 2 +-
22 files changed, 148 insertions(+), 167 deletions(-)
diff --git
a/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/http/HttpNotificationServiceTest.java
b/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/http/HttpNotificationServiceTest.java
index 27cbd73..96575a9 100644
---
a/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/http/HttpNotificationServiceTest.java
+++
b/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/http/HttpNotificationServiceTest.java
@@ -31,9 +31,9 @@ import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.security.util.SslContextFactory;
import org.apache.nifi.security.util.TemporaryKeyStoreBuilder;
import org.apache.nifi.security.util.TlsConfiguration;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocketFactory;
@@ -56,9 +56,9 @@ import static
org.apache.nifi.bootstrap.notification.http.HttpNotificationServic
import static
org.apache.nifi.bootstrap.notification.http.HttpNotificationService.PROP_TRUSTSTORE_TYPE;
import static
org.apache.nifi.bootstrap.notification.http.HttpNotificationService.NOTIFICATION_SUBJECT_KEY;
import static
org.apache.nifi.bootstrap.notification.http.HttpNotificationService.NOTIFICATION_TYPE_KEY;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class HttpNotificationServiceTest {
@@ -76,12 +76,12 @@ public class HttpNotificationServiceTest {
private MockWebServer mockWebServer;
-@Before
+@BeforeEach
public void startServer() {
mockWebServer = new MockWebServer();
}
-@After
+@AfterEach
public void shutdownServer() throws IOException {
mockWebServer.shutdown();
}
diff --git
a/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/util/TestSecureNiFiConfigUtil.java
b/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/util/TestSecureNiFiConfigUtil.java
index 82cfdd3..65d62f4 100644
---
a/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/util/TestSecureNiFiConfigUtil.java
+++
b/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/util/TestSecureNiFiConfigUtil.java
@@ -25,10 +25,9 @@ import org.apache.nifi.util.NiFiProperties;
import org.apache.nifi.util.StringUtils;
import org.bouncycastle.asn1.x509.GeneralName;
import org.bouncycastle.util.IPAddress;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before
[nifi] branch main updated: NIFI-9773 Refactored nifi-system-tests using JUnit 5
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 105890e NIFI-9773 Refactored nifi-system-tests using JUnit 5 105890e is described below commit 105890ef37ee12edfd082cadc74abf0513cf86a4 Author: exceptionfactory AuthorDate: Thu Mar 24 21:10:39 2022 -0500 NIFI-9773 Refactored nifi-system-tests using JUnit 5 - Enabled system-tests workflow on push and pull requests This closes #5901 Signed-off-by: Mike Thomsen --- .github/workflows/system-tests.yml | 24 ++--- .../apache/nifi/stateless/StatelessSystemIT.java | 24 ++--- .../nifi/stateless/VersionedFlowBuilder.java | 6 +- .../stateless/basics/AsyncCommitCallbackIT.java| 21 +++-- .../nifi/stateless/basics/BatchOutputIT.java | 6 +- .../stateless/basics/CancelFlowExecutionIT.java| 6 +- .../nifi/stateless/basics/CloneFlowFileIT.java | 12 ++- .../nifi/stateless/basics/CreatesFlowFileIT.java | 6 +- .../nifi/stateless/basics/InputOutputIT.java | 6 +- .../apache/nifi/stateless/basics/LoopingIT.java| 6 +- .../apache/nifi/stateless/basics/MergingIT.java| 6 +- .../stateless/basics/PartitioningContentIT.java| 6 +- .../stateless/basics/ProcessorLifecycleIT.java | 2 +- .../basics/RequiresAdditionalInputIT.java | 13 ++- .../stateless/basics/RollbackOnExceptionIT.java| 10 ++- .../apache/nifi/stateless/basics/SplittingIT.java | 6 +- .../nifi/stateless/basics/StateStorageIT.java | 10 +-- .../nifi/stateless/basics/StatelessRetryIT.java| 6 +- .../classloader/InstanceClassLoaderIT.java | 4 +- .../StatelessControllerServiceSystemIT.java| 6 +- .../stateless/parameters/ParameterContextIT.java | 18 ++-- .../performance/StatelessPerformanceIT.java| 6 +- .../apache/nifi/tests/system/NiFiClientUtil.java | 20 ++--- ...ocessGroupIT.java => NiFiInstanceProvider.java} | 28 +++--- .../org/apache/nifi/tests/system/NiFiSystemIT.java | 100 +++-- .../SpawnedStandaloneNiFiInstanceFactory.java | 2 +- .../tests/system/TroubleshootingTestWatcher.java | 68 ++ .../classloaders/ClassloaderIsolationKeyIT.java| 4 +- .../system/clustering/FlowSynchronizationIT.java | 10 +-- .../clustering/JoinClusterAdjustStateIT.java | 6 +- .../clustering/JoinClusterWithDifferentFlow.java | 8 +- .../JoinClusterWithMissingConnectionNoData.java| 4 +- .../JoinClusterWithMissingConnectionWithData.java | 4 +- .../clustering/NodeRestartWithNewNodeIdIT.java | 10 +-- .../nifi/tests/system/clustering/OffloadIT.java| 4 +- .../clustering/RestartWithDifferentPort.java | 8 +- .../system/clustering/SimpleNodeRestartIT.java | 6 +- .../ControllerServiceApiValidationIT.java | 4 +- .../DependentControllerServiceIT.java | 2 +- .../tests/system/loadbalance/LoadBalanceIT.java| 14 ++- .../parameters/ClusteredParameterContextIT.java| 2 +- .../system/parameters/ParameterContextIT.java | 16 ++-- .../tests/system/pg/BatchFlowBetweenGroupsIT.java | 2 +- .../system/pg/SingleFlowFileConcurrencyIT.java | 8 +- .../nifi/tests/system/processor/RetryIT.java | 4 +- .../nifi/tests/system/processor/RunOnceIT.java | 8 +- .../system/provenance/ProvenanceRepositoryIT.java | 4 +- .../system/reportingtask/ReportingTaskIT.java | 2 +- .../tests/system/repositories/ContentAccessIT.java | 4 +- .../system/restart/FlowFileRestorationIT.java | 19 ++-- .../system/rpg/ClusteredRemoteProcessGroupIT.java | 2 +- .../tests/system/rpg/RemoteProcessGroupIT.java | 7 +- .../validation/DependentPropertyValidationIT.java | 6 +- .../system/variables/ProcessGroupVariablesIT.java | 4 +- ...usteredVerifiableControllerServiceSystemIT.java | 6 +- .../ClusteredVerifiableProcessorSystemIT.java | 6 +- .../ClusteredVerifiableReportingTaskSystemIT.java | 6 +- .../VerifiableControllerServiceSystemIT.java | 18 ++-- .../verification/VerifiableProcessorSystemIT.java | 16 ++-- .../VerifiableReportingTaskSystemIT.java | 8 +- 60 files changed, 333 insertions(+), 327 deletions(-) diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml index 4c45365..2cb2b5d 100644 --- a/.github/workflows/system-tests.yml +++ b/.github/workflows/system-tests.yml @@ -19,6 +19,12 @@ on: # Run every day at 00:00 schedule: - cron: "0 0 * * *" + push: +paths: + - 'nifi-system-tests/**' + pull_request: +paths: + - 'nifi-system-tests/**' env: DEFAULT_MAVEN_OPTS: >- @@ -52,19 +58,12 @@ jobs: steps: - name: Checkout Code uses: actions/checkout@v2 - - n
[nifi] branch main updated: NIFI-9818 fix flaky tests
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 8d5de6b NIFI-9818 fix flaky tests
8d5de6b is described below
commit 8d5de6b292981818e81ffd6cb3b8773c710884ca
Author: 在红尘中成仙 <68594013+mundaneimmor...@users.noreply.github.com>
AuthorDate: Sun Mar 20 22:43:34 2022 -0500
NIFI-9818 fix flaky tests
This closes #5883
Signed-off-by: Mike Thomsen
---
.../org/apache/nifi/serialization/record/util/DataTypeUtils.java | 2 +-
.../org/apache/nifi/serialization/record/TestDataTypeUtils.java | 5 +++--
.../java/org/apache/nifi/serialization/record/TestMapRecord.java | 9 +
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
index 5a8649e..1416b97 100644
---
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
+++
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
@@ -548,7 +548,7 @@ public class DataTypeUtils {
map = (Map) value;
} else {
final Map m = (Map) value;
-map = new HashMap<>(m.size());
+map = new LinkedHashMap<>(m.size());
m.forEach((k, v) -> map.put(k == null ? null : k.toString(),
v));
}
return inferRecordDataType(map);
diff --git
a/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
b/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
index 21ec919..8d9f13a 100644
---
a/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
+++
b/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
@@ -43,6 +43,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -611,7 +612,7 @@ public class TestDataTypeUtils {
@Test
public void testInferTypeWithMapStringKeys() {
-Map map = new HashMap<>();
+Map map = new LinkedHashMap<>();
map.put("a", "Hello");
map.put("b", "World");
@@ -626,7 +627,7 @@ public class TestDataTypeUtils {
@Test
public void testInferTypeWithMapNonStringKeys() {
-Map map = new HashMap<>();
+Map map = new LinkedHashMap<>();
map.put(1, "Hello");
map.put(2, "World");
diff --git
a/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestMapRecord.java
b/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestMapRecord.java
index 9250d5f..2240e57 100644
---
a/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestMapRecord.java
+++
b/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestMapRecord.java
@@ -24,7 +24,8 @@ import org.junit.jupiter.api.Test;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -78,7 +79,7 @@ public class TestMapRecord {
}
private Set set(final String... values) {
-final Set set = new HashSet<>();
+final Set set = new LinkedHashSet<>();
for (final String value : values) {
set.add(value);
}
@@ -122,7 +123,7 @@ public class TestMapRecord {
fields.add(new RecordField("foo",
RecordFieldType.STRING.getDataType(), null, set("bar", "baz")));
final RecordSchema schema = new SimpleRecordSchema(fields);
-final Map values = new HashMap<>();
+final Map values = new LinkedHashMap<>();
values.put("baz", 1);
values.put("bar", 33);
@@ -161,7 +162,7 @@ public class TestMapRecord {
fields.add(new RecordField("foo",
RecordFieldType.STRING.getDataType(), "hello", set("bar", "baz")));
final RecordSchema schema = new SimpleRecordSchema(fields);
-final Map values = new HashMap<>();
+final Map values = new LinkedHashMap<>();
values.put("baz", 1);
values.put("bar", 33);
[nifi] branch main updated: NIFI-9815 Corrected log message formatting in multiple classes
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 7823156 NIFI-9815 Corrected log message formatting in multiple classes
7823156 is described below
commit 7823156606ca541ef9cae7192b092efd2cfe4e9a
Author: exceptionfactory
AuthorDate: Fri Mar 18 11:46:43 2022 -0500
NIFI-9815 Corrected log message formatting in multiple classes
This closes #5879
Signed-off-by: Mike Thomsen
---
.../src/main/java/org/apache/nifi/bootstrap/RunNiFi.java | 2 +-
.../apache/nifi/authorization/CompositeUserGroupProvider.java | 2 +-
.../nifi/registry/extension/NiFiRegistryNarProvider.java | 2 +-
.../java/org/apache/nifi/remote/SocketRemoteSiteListener.java | 2 +-
.../nifi/remote/protocol/AbstractFlowFileServerProtocol.java | 2 +-
.../java/org/apache/nifi/web/api/DataTransferResource.java | 2 --
.../main/java/org/apache/nifi/web/api/OIDCAccessResource.java | 9 +++--
.../apache/nifi/provenance/PersistentProvenanceRepository.java | 2 +-
.../nifi/provenance/index/lucene/IndexDirectoryManager.java| 8
.../org/apache/nifi/registry/db/CustomFlywayConfiguration.java | 7 ---
.../nifi/registry/provider/hook/ScriptEventHookProvider.java | 4 ++--
.../security/authorization/CompositeUserGroupProvider.java | 2 +-
.../org/apache/nifi/registry/service/AuthorizationService.java | 2 +-
.../nifi/registry/properties/util/IdentityMappingUtil.java | 10 +-
.../kerberos/KerberosSpnegoIdentityProvider.java | 6 +-
.../main/java/org/apache/nifi/toolkit/tls/util/TlsHelper.java | 2 +-
16 files changed, 28 insertions(+), 36 deletions(-)
diff --git
a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
index 9fd972d..9894b7f 100644
--- a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
+++ b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
@@ -1032,7 +1032,7 @@ public class RunNiFi {
final long waitSeconds = TimeUnit.NANOSECONDS.toSeconds(waitNanos);
if (waitSeconds >= gracefulShutdownSeconds &&
gracefulShutdownSeconds > 0) {
if (isProcessRunning(pid, logger)) {
-logger.warn("NiFi PID [{}] shutdown not completed after {}
seconds: Killing process", gracefulShutdownSeconds);
+logger.warn("NiFi PID [{}] shutdown not completed after {}
seconds: Killing process", pid, gracefulShutdownSeconds);
try {
killProcessTree(pid, logger);
} catch (final IOException ioe) {
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/main/java/org/apache/nifi/authorization/CompositeUserGroupProvider.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/main/java/org/apache/nifi/authorization/CompositeUserGroupProvider.java
index ca0888b..a877d61 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/main/java/org/apache/nifi/authorization/CompositeUserGroupProvider.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/main/java/org/apache/nifi/authorization/CompositeUserGroupProvider.java
@@ -181,7 +181,7 @@ public class CompositeUserGroupProvider implements
UserGroupProvider {
compositeUserAndGroups.setUser(userAndGroups.getUser());
providerClassForUser =
userGroupProvider.getClass().getName();
} else {
-logger.warn("Multiple UserGroupProviders are claiming to
provide user '{}': [{} and {}] ",
+logger.warn("Multiple UserGroupProviders are claiming to
provide identity [{}] user '{}': [{} and {}] ",
identity,
userAndGroups.getUser(),
providerClassForUser,
userGroupProvider.getClass().getName());
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/extension/NiFiRegistryNarProvider.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/extension/NiFiRegistryNarProvider.java
index 6689d31..f8b8bff 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/extension/NiFiRegistryNarProvider.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/re
[nifi] branch main updated: NIFI-9807 Added Refresh Window Property to OAuth2 Token Provider
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 ab0d2c2 NIFI-9807 Added Refresh Window Property to OAuth2 Token
Provider
ab0d2c2 is described below
commit ab0d2c2f72d51fd78dd9dfe1d976153a56aff8fd
Author: exceptionfactory
AuthorDate: Thu Mar 17 10:30:49 2022 -0500
NIFI-9807 Added Refresh Window Property to OAuth2 Token Provider
- Removed hard-coded expiry margin from AccessToken.isExpired()
determination
This closes #5876
Signed-off-by: Mike Thomsen
---
.../java/org/apache/nifi/oauth2/AccessToken.java | 11 ++--
.../org/apache/nifi/oauth2/AccessTokenTest.java| 19 ++---
.../oauth2/StandardOauth2AccessTokenProvider.java | 33 ++
.../StandardOauth2AccessTokenProviderTest.java | 16 ---
4 files changed, 45 insertions(+), 34 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-api/src/main/java/org/apache/nifi/oauth2/AccessToken.java
b/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-api/src/main/java/org/apache/nifi/oauth2/AccessToken.java
index 5c76c79..e2d289e 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-api/src/main/java/org/apache/nifi/oauth2/AccessToken.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-api/src/main/java/org/apache/nifi/oauth2/AccessToken.java
@@ -20,8 +20,6 @@ package org.apache.nifi.oauth2;
import java.time.Instant;
public class AccessToken {
-private static final int EXPIRY_MARGIN_SECONDS = 300;
-
private String accessToken;
private String refreshToken;
private String tokenType;
@@ -31,7 +29,7 @@ public class AccessToken {
private final Instant fetchTime;
public AccessToken() {
-this.fetchTime = now();
+this.fetchTime = Instant.now();
}
public AccessToken(String accessToken, String refreshToken, String
tokenType, long expiresIn, String scopes) {
@@ -88,11 +86,8 @@ public class AccessToken {
}
public boolean isExpired() {
-final Instant expirationTime =
fetchTime.plusSeconds(expiresIn).minusSeconds(EXPIRY_MARGIN_SECONDS);
-
-boolean expired = now().isAfter(expirationTime);
-
-return expired;
+final Instant expirationTime = fetchTime.plusSeconds(expiresIn);
+return now().isAfter(expirationTime);
}
Instant now() {
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-api/src/test/java/org/apache/nifi/oauth2/AccessTokenTest.java
b/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-api/src/test/java/org/apache/nifi/oauth2/AccessTokenTest.java
index 2130c82..5312055 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-api/src/test/java/org/apache/nifi/oauth2/AccessTokenTest.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-api/src/test/java/org/apache/nifi/oauth2/AccessTokenTest.java
@@ -25,6 +25,10 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class AccessTokenTest {
+private static final long FIVE_MINUTES_AGO = -300;
+
+private static final long IN_FIVE_MINUTES = 300;
+
private Instant now;
@BeforeEach
@@ -33,22 +37,15 @@ public class AccessTokenTest {
}
@Test
-public void testIsExpiredInLessThan5Minutes() {
-final AccessToken accessToken = getAccessToken(299);
+public void testIsExpiredFiveMinutesAgo() {
+final AccessToken accessToken = getAccessToken(FIVE_MINUTES_AGO);
assertTrue(accessToken.isExpired());
}
@Test
-public void testIsExpiredInExactly5Minutes() {
-final AccessToken accessToken = getAccessToken(300);
-
-assertFalse(accessToken.isExpired());
-}
-
-@Test
-public void testIsExpiredInMoreThan5Minutes() {
-final AccessToken accessToken = getAccessToken(301);
+public void testIsExpiredInFiveMinutes() {
+final AccessToken accessToken = getAccessToken(IN_FIVE_MINUTES);
assertFalse(accessToken.isExpired());
}
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/main/java/org/apache/nifi/oauth2/StandardOauth2AccessTokenProvider.java
b/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/main/java/org/apache/nifi/oauth2/StandardOauth2AccessTokenProvider.java
index 6c1b05e..48e47ff 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-service/src/main/java/org/apache/nifi/oauth2/StandardOauth2AccessTokenProvider.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider
[nifi] branch main updated: NIFI-9801 Fixed error in previous correction of AccessToken.isExpired() margin calculation NIFI-9801 Stabilized shaky AccessTokenTest.
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 fc30b64 NIFI-9801 Fixed error in previous correction of
AccessToken.isExpired() margin calculation NIFI-9801 Stabilized shaky
AccessTokenTest.
fc30b64 is described below
commit fc30b649cccbbecaf8b861def94b6a3a75e532ea
Author: Tamas Palfy
AuthorDate: Wed Mar 16 19:28:32 2022 +0100
NIFI-9801 Fixed error in previous correction of AccessToken.isExpired()
margin calculation
NIFI-9801 Stabilized shaky AccessTokenTest.
This closes #5872
Signed-off-by: Mike Thomsen
---
.../java/org/apache/nifi/oauth2/AccessToken.java | 15 +--
.../org/apache/nifi/oauth2/AccessTokenTest.java| 47 +++---
.../StandardOauth2AccessTokenProviderTest.java | 36 -
3 files changed, 69 insertions(+), 29 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-api/src/main/java/org/apache/nifi/oauth2/AccessToken.java
b/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-api/src/main/java/org/apache/nifi/oauth2/AccessToken.java
index d0a6dff..5c76c79 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-api/src/main/java/org/apache/nifi/oauth2/AccessToken.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-api/src/main/java/org/apache/nifi/oauth2/AccessToken.java
@@ -20,7 +20,7 @@ package org.apache.nifi.oauth2;
import java.time.Instant;
public class AccessToken {
-private static final int EXPIRY_MARGIN_SECONDS = 5;
+private static final int EXPIRY_MARGIN_SECONDS = 300;
private String accessToken;
private String refreshToken;
@@ -31,7 +31,7 @@ public class AccessToken {
private final Instant fetchTime;
public AccessToken() {
-this.fetchTime = Instant.now();
+this.fetchTime = now();
}
public AccessToken(String accessToken, String refreshToken, String
tokenType, long expiresIn, String scopes) {
@@ -88,7 +88,14 @@ public class AccessToken {
}
public boolean isExpired() {
-final Instant expirationTime =
fetchTime.plusSeconds(expiresIn).plusSeconds(EXPIRY_MARGIN_SECONDS);
-return Instant.now().isAfter(expirationTime);
+final Instant expirationTime =
fetchTime.plusSeconds(expiresIn).minusSeconds(EXPIRY_MARGIN_SECONDS);
+
+boolean expired = now().isAfter(expirationTime);
+
+return expired;
+}
+
+Instant now() {
+return Instant.now();
}
}
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-api/src/test/java/org/apache/nifi/oauth2/AccessTokenTest.java
b/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-api/src/test/java/org/apache/nifi/oauth2/AccessTokenTest.java
index 6f77e62..2130c82 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-api/src/test/java/org/apache/nifi/oauth2/AccessTokenTest.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-api/src/test/java/org/apache/nifi/oauth2/AccessTokenTest.java
@@ -16,54 +16,55 @@
*/
package org.apache.nifi.oauth2;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import java.time.Instant;
+
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class AccessTokenTest {
-private static final String ACCESS_TOKEN = "ACCESS";
-
-private static final String REFRESH_TOKEN = "REFRESH";
-
-private static final String TOKEN_TYPE = "Bearer";
-
-private static final String SCOPES = "default";
+private Instant now;
-private static final long TWO_SECONDS_AGO = -2;
-
-private static final long TEN_SECONDS_AGO = -10;
-
-private static final long IN_SIXTY_SECONDS = 60;
+@BeforeEach
+void setUp() {
+now = Instant.now();
+}
@Test
-public void testIsExpiredTenSecondsAgo() {
-final AccessToken accessToken = getAccessToken(TEN_SECONDS_AGO);
+public void testIsExpiredInLessThan5Minutes() {
+final AccessToken accessToken = getAccessToken(299);
assertTrue(accessToken.isExpired());
}
@Test
-public void testIsExpiredTwoSecondsAgo() {
-final AccessToken accessToken = getAccessToken(TWO_SECONDS_AGO);
+public void testIsExpiredInExactly5Minutes() {
+final AccessToken accessToken = getAccessToken(300);
assertFalse(accessToken.isExpired());
}
@Test
-public void testIsExpiredInSixtySeconds() {
-final AccessToken accessToken = getAccessToken(IN_SIXTY_SECONDS);
+public void testIsExpiredInMoreThan5Minutes() {
+final AccessToken accessToken = getAccessToken(301);
assertFalse(accessT
[nifi] branch main updated: NIFI-9662 Remove unused mail-1.4.7 dependency from nifi-framework-bundle
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 e17a436 NIFI-9662 Remove unused mail-1.4.7 dependency from nifi-framework-bundle e17a436 is described below commit e17a436797bb7075c5747cb7b3bcdd62620a7875 Author: exceptionfactory AuthorDate: Wed Mar 16 19:52:20 2022 -0500 NIFI-9662 Remove unused mail-1.4.7 dependency from nifi-framework-bundle This closes #5873 Signed-off-by: Mike Thomsen --- .../nifi-framework-nar/src/main/resources/META-INF/NOTICE| 1 - .../nifi-headless-server-nar/src/main/resources/META-INF/NOTICE | 1 - .../nifi-server-nar/src/main/resources/META-INF/NOTICE | 1 - nifi-nar-bundles/nifi-framework-bundle/pom.xml | 5 - 4 files changed, 8 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE index 20c0905..38fd03e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE @@ -234,7 +234,6 @@ The following binary components are provided under the Common Development and Di (CDDL 1.1) (GPL2 w/ CPE) aopalliance-repackaged (org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) (CDDL 1.1) (GPL2 w/ CPE) javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:javax.inject:jar:2.4.0-b25 - https://hk2.java.net/external/javax.inject) (CDDL 1.1) (GPL2 w/ CPE) MIME Streaming Extension (org.jvnet.mimepull:mimepull:jar:1.9.3 - http://mimepull.java.net) -(CDDL 1.1) (GPL2 w/ CPE) JavaMail API (compat) (javax.mail:mail:jar:1.4.7 - http://kenai.com/projects/javamail/mail) (CDDL 1.1) (GPL2 w/ CPE) javax.ws.rs-api (javax.ws.rs:javax.ws.rs-api:jar:2.1 - http://jax-rs-spec.java.net) (CDDL 1.1) (GPL2 w/ CPE) javax.annotation API (javax.annotation:javax.annotation-api:jar:1.2 - http://jcp.org/en/jsr/detail?id=250) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-headless-server-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-framework-bundle/nifi-headless-server-nar/src/main/resources/META-INF/NOTICE index a68..354934b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-headless-server-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-headless-server-nar/src/main/resources/META-INF/NOTICE @@ -196,7 +196,6 @@ The following binary components are provided under the Common Development and Di (CDDL 1.1) (GPL2 w/ CPE) aopalliance-repackaged (org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) (CDDL 1.1) (GPL2 w/ CPE) javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:javax.inject:jar:2.4.0-b25 - https://hk2.java.net/external/javax.inject) (CDDL 1.1) (GPL2 w/ CPE) MIME Streaming Extension (org.jvnet.mimepull:mimepull:jar:1.9.3 - http://mimepull.java.net) -(CDDL 1.1) (GPL2 w/ CPE) JavaMail API (compat) (javax.mail:mail:jar:1.4.7 - http://kenai.com/projects/javamail/mail) (CDDL 1.1) (GPL2 w/ CPE) javax.ws.rs-api (javax.ws.rs:javax.ws.rs-api:jar:2.1 - http://jax-rs-spec.java.net) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-server-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-framework-bundle/nifi-server-nar/src/main/resources/META-INF/NOTICE index 1e079d7..4e4a716 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-server-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-server-nar/src/main/resources/META-INF/NOTICE @@ -196,7 +196,6 @@ The following binary components are provided under the Common Development and Di (CDDL 1.1) (GPL2 w/ CPE) aopalliance-repackaged (org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42 - https://javaee.github.io/glassfish/) (CDDL 1.1) (GPL2 w/ CPE) javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:javax.inject:jar:2.4.0-b25 - https://hk2.java.net/external/javax.inject) (CDDL 1.1) (GPL2 w/ CPE) MIME Streaming Extension (org.jvnet.mimepull:mimepull:jar:1.9.3 - http://mimepull.java.net) -(CDDL 1.1) (GPL2 w/ CPE) JavaMail API (compat) (javax.mail:mail:jar:1.4.7 - http://kenai.com/projects/javamail/mail) (CDDL 1.1) (GPL2 w/ CPE) javax.ws.rs-api (javax.ws.rs:javax.ws.rs-api:jar:2.1 - http://jax-rs-spec.java.net) diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml index 86f483b..4d2d441 100644 --- a/nifi-nar-bundles/nifi
[nifi] branch main updated: NIFI-9281 Enabled building on Java 17
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 412e21b NIFI-9281 Enabled building on Java 17
412e21b is described below
commit 412e21be977a6eb04cc247ceb3f9b178d6b19d97
Author: exceptionfactory
AuthorDate: Tue Mar 15 09:09:13 2022 -0500
NIFI-9281 Enabled building on Java 17
- Added Ubuntu Zulu JDK 17 GitHub build
- Adjusted MiNiFi C2 FileSystemConfigurationCache test to avoid using
environment variables
- Adjusted MiNiFi StatusLogger and StatusLoggerTest to avoid overriding
private logger
- Adjusted failure reason attribute check in TestGetIgniteCache
- Adjusted TestRangerAuthorizer and TestRangerNiFiAuthorizer to avoid
checking nested exceptions
- Adjusted encrypt-config TestUtil to avoid unnecessary comparison of
different types
- Disabled Javascript tests on Java 15 and higher
- Disabled several Hive 3 tests on Java 17 for StringInternUtils illegal
access
- Refactored nifi-enrich-processors tests to use Mockito without Powermock
- Refactored nifi-toolkit-tls tests to avoid illegal reflective access
- Removed deprecated X509Certificate test in CertificateUtilsTest
- Removed kryo serialization from nifi-site-to-site-client test
- Updated TestHashContent to use SHA-1 instead of SHA for hash algorithm
- Upgraded maven-war-plugin from 2.5 to 3.3.2
- Upgraded nifi-graph-bundle dependencies from Groovy 2.5.14 to 3.0.8
- Upgraded QuestDB from 4.2.1 to 6.2.1 in nifi-framework-core
This closes #5870
Signed-off-by: Mike Thomsen
---
.github/workflows/ci-workflow.yml | 59 ++
.../bootstrap/status/reporters/StatusLogger.java | 2 +-
.../status/reporters/StatusLoggerTest.java | 53 +++--
.../filesystem/FileSystemConfigurationCache.java | 4 +-
.../FileSystemConfigurationCacheTest.java | 48 ++---
.../nifi/security/util/CertificateUtilsTest.groovy | 19 --
nifi-commons/nifi-site-to-site-client/pom.xml | 6 -
.../remote/client/socket/TestSiteToSiteClient.java | 74 +--
.../nifi-enrich-processors/pom.xml | 57 +-
.../apache/nifi/processors/TestGeoEnrichIP.java| 32 +--
.../apache/nifi/processors/TestISPEnrichIP.java| 34 +---
.../nifi/processors/enrich/TestQueryWhois.java | 48 ++---
.../nifi-framework/nifi-framework-core/pom.xml | 4 +-
.../EmbeddedQuestDbStatusHistoryRepository.java| 3 +-
.../status/history/questdb/QuestDbContext.java | 9 +-
.../history/questdb/QuestDbDatabaseManager.java| 11 +-
.../history/questdb/QuestDbWritingTemplate.java| 2 +-
.../EmbeddedQuestDbRolloverHandlerTest.java| 11 +-
...DbStatusHistoryRepositoryForComponentsTest.java | 4 +-
...dQuestDbStatusHistoryRepositoryForNodeTest.java | 4 +-
.../test/resources/{qlog.conf => log-stdout.conf} | 0
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml| 2 +-
.../nifi-graph-test-clients/pom.xml| 4 -
.../nifi-other-graph-services/pom.xml | 4 -
nifi-nar-bundles/nifi-graph-bundle/pom.xml | 24 +++
.../apache/hive/streaming/TestNiFiRecordSerDe.java | 3 +
.../processors/hive/TestPutHive3Streaming.java | 3 +
.../ignite/cache/TestGetIgniteCache.java | 5 +-
.../authorization/TestRangerNiFiAuthorizer.java| 39 +---
.../processors/script/TestExecuteJavascript.java | 3 +
.../processors/script/TestInvokeJavascript.java| 3 +
.../nifi/processors/standard/TestHashContent.java | 2 +-
.../nifi-registry-web-api/pom.xml | 11 +-
.../nifi-registry-web-ui/pom.xml | 2 +-
.../nifi/registry/ranger/TestRangerAuthorizer.java | 139 ++---
nifi-registry/pom.xml | 2 +-
.../nifi/toolkit/encryptconfig/TestUtil.groovy | 1 -
.../apache/nifi/toolkit/tls/util/TlsHelper.java| 13 +-
.../TlsToolkitStandaloneGroovyTest.groovy | 86 ++--
.../toolkit/tls/util/TlsHelperGroovyTest.groovy| 52 +
.../TlsToolkitStandaloneCommandLineTest.java | 9 +-
.../nifi/toolkit/tls/util/PasswordUtilTest.java| 35 +---
.../nifi/toolkit/tls/util/TlsHelperTest.java | 216 +
43 files changed, 318 insertions(+), 824 deletions(-)
diff --git a/.github/workflows/ci-workflow.yml
b/.github/workflows/ci-workflow.yml
index 9d49ef8..107e406 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -51,6 +51,65 @@ concurrency:
cancel-in-progress: true
jobs:
+ ubuntu-build:
+timeout-minutes: 120
+runs-on: ubuntu-latest
+name: Ubuntu Zulu JDK 17 EN
+steps:
+ - name: System Information
+run: |
+ hostname
+ cat /proc/cpuinfo
+ cat /proc/memi
[nifi] branch main updated: NIFI-9791 Use maven.build.timestamp during manifest generation instead of buildhelper timestamp
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 e226d3b NIFI-9791 Use maven.build.timestamp during manifest
generation instead of buildhelper timestamp
e226d3b is described below
commit e226d3be525e40c42d9b42835757790063b5a504
Author: Bryan Bende
AuthorDate: Sat Mar 12 10:13:08 2022 -0500
NIFI-9791 Use maven.build.timestamp during manifest generation instead of
buildhelper timestamp
This closes #5861
Signed-off-by: Mike Thomsen
---
.../runtime/manifest/impl/RuntimeManifestGenerator.java| 14 +-
.../src/main/resources/build.properties| 2 +-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git
a/nifi-manifest/nifi-runtime-manifest-core/src/main/java/org/apache/nifi/runtime/manifest/impl/RuntimeManifestGenerator.java
b/nifi-manifest/nifi-runtime-manifest-core/src/main/java/org/apache/nifi/runtime/manifest/impl/RuntimeManifestGenerator.java
index 5954b77..334a4a1 100644
---
a/nifi-manifest/nifi-runtime-manifest-core/src/main/java/org/apache/nifi/runtime/manifest/impl/RuntimeManifestGenerator.java
+++
b/nifi-manifest/nifi-runtime-manifest-core/src/main/java/org/apache/nifi/runtime/manifest/impl/RuntimeManifestGenerator.java
@@ -34,6 +34,8 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.Properties;
/**
@@ -47,6 +49,7 @@ public class RuntimeManifestGenerator {
private static final String PROJECT_VERSION_PROPERTY = "Project-Version";
private static final String BUILD_REVISION = "Build-Revision";
private static final String BUILD_TIMESTAMP = "Build-Timestamp";
+private static final String BUILD_TIMESTAMP_FORMAT =
"-MM-dd'T'HH:mm:ss'Z'";
private static final String BUILD_JDK = "Build-Jdk";
private static final String BUILD_JDK_VENDOR = "Build-Jdk-Vendor";
@@ -75,10 +78,19 @@ public class RuntimeManifestGenerator {
final String buildJdk = buildProperties.getProperty(BUILD_JDK);
final String buildJdkVendor =
buildProperties.getProperty(BUILD_JDK_VENDOR);
+long buildTimestampMillis;
+try {
+final SimpleDateFormat buildTimestampFormat = new
SimpleDateFormat(BUILD_TIMESTAMP_FORMAT);
+final Date buildTimestampDate =
buildTimestampFormat.parse(buildTimestamp);
+buildTimestampMillis = buildTimestampDate.getTime();
+} catch (Exception e) {
+buildTimestampMillis = System.currentTimeMillis();
+}
+
final BuildInfo buildInfo = new BuildInfo();
buildInfo.setVersion(runtimeVersion);
buildInfo.setRevision(buildRevision);
-buildInfo.setTimestamp(Long.valueOf(buildTimestamp));
+buildInfo.setTimestamp(buildTimestampMillis);
buildInfo.setCompiler(buildJdkVendor + " " + buildJdk);
final RuntimeManifest runtimeManifest = new
StandardRuntimeManifestBuilder()
diff --git
a/nifi-manifest/nifi-runtime-manifest/src/main/resources/build.properties
b/nifi-manifest/nifi-runtime-manifest/src/main/resources/build.properties
index aaf21ca..988b887 100644
--- a/nifi-manifest/nifi-runtime-manifest/src/main/resources/build.properties
+++ b/nifi-manifest/nifi-runtime-manifest/src/main/resources/build.properties
@@ -16,7 +16,7 @@
Project-Version:${project.version}
Build-Branch:${buildBranch}
Build-Revision:${buildRevision}
-Build-Timestamp:${timestamp}
+Build-Timestamp:${maven.build.timestamp}
Built-By:${user.name}
Maven-Home:${maven.home}
Maven-Version:${maven.version}
[nifi] branch main updated: NIFI-9789 Upgraded Logback from 1.2.10 to 1.2.11
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 6e974a1 NIFI-9789 Upgraded Logback from 1.2.10 to 1.2.11 6e974a1 is described below commit 6e974a1fd21dc95f78450ced7a4811e1b6e60466 Author: exceptionfactory AuthorDate: Fri Mar 11 06:54:42 2022 -0600 NIFI-9789 Upgraded Logback from 1.2.10 to 1.2.11 This closes #5858 Signed-off-by: Mike Thomsen --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4654fc9..dc5f85a 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ 2.1.5 1.9.6 2.35 -1.2.10 +1.2.11 3.11.2 3.10.6.Final 4.1.74.Final
[nifi] branch main updated: NIFI-9774 Upgraded Netty from 4.1.73 to 4.1.74
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 c8f8747 NIFI-9774 Upgraded Netty from 4.1.73 to 4.1.74 c8f8747 is described below commit c8f8747dbc6075be4feb3549fa5cc4b2e8a0fb7c Author: exceptionfactory AuthorDate: Tue Mar 8 12:27:14 2022 -0600 NIFI-9774 Upgraded Netty from 4.1.73 to 4.1.74 This closes #5851 Signed-off-by: Mike Thomsen --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ec59fc0..3d6c253 100644 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,7 @@ 1.2.10 3.11.2 3.10.6.Final -4.1.73.Final +4.1.74.Final 5.3.16 5.6.2 2.1.210
[nifi] branch main updated: NIFI-9756 Add documentation for framework-level retry in Processors and update processor tab images
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 9782a51 NIFI-9756 Add documentation for framework-level retry in Processors and update processor tab images 9782a51 is described below commit 9782a5156433f036079d930d9b92231764cd1cab Author: Andrew Lim AuthorDate: Fri Mar 4 15:01:54 2022 -0500 NIFI-9756 Add documentation for framework-level retry in Processors and update processor tab images This closes #5837 Signed-off-by: Mike Thomsen --- .../src/main/asciidoc/images/allow-weak-crypto.png | Bin 62111 -> 65019 bytes .../images/autocomplete-parameter-example.png | Bin 173374 -> 123963 bytes .../src/main/asciidoc/images/comments-tab.png | Bin 27732 -> 26526 bytes .../images/configure-parameter-on-the-fly.png | Bin 131883 -> 112424 bytes ...onfigure-processor-with-version-information.png | Bin 61205 -> 59869 bytes .../images/convert-property-to-parameter.png | Bin 171069 -> 134652 bytes .../asciidoc/images/edit-property-dropdown.png | Bin 54487 -> 46811 bytes .../asciidoc/images/edit-property-textarea.png | Bin 45199 -> 39620 bytes .../asciidoc/images/el-param-support-help-text.png | Bin 187659 -> 143979 bytes .../images/existing-parameter-selected.png | Bin 165231 -> 127719 bytes .../images/existing-parameters-example.png | Bin 103913 -> 85104 bytes .../asciidoc/images/new-parameter-referenced.png | Bin 166341 -> 128579 bytes .../asciidoc/images/processor-cs-version-match.png | Bin 42501 -> 40647 bytes .../processor-cs-version-mismatch-config.png | Bin 45439 -> 43638 bytes .../src/main/asciidoc/images/properties-tab.png| Bin 36781 -> 33388 bytes .../reference-parameter-available-parameters.png | Bin 83156 -> 60376 bytes .../asciidoc/images/reference-parameter-option.png | Bin 71003 -> 54408 bytes .../src/main/asciidoc/images/relationships-tab.png | Bin 0 -> 43445 bytes .../src/main/asciidoc/images/scheduling-tab.png| Bin 54320 -> 43830 bytes .../src/main/asciidoc/images/settings-tab.png | Bin 72140 -> 50039 bytes .../asciidoc/images/variable-putfile-property.png | Bin 67481 -> 52102 bytes nifi-docs/src/main/asciidoc/user-guide.adoc| 37 +++-- 22 files changed, 26 insertions(+), 11 deletions(-) diff --git a/nifi-docs/src/main/asciidoc/images/allow-weak-crypto.png b/nifi-docs/src/main/asciidoc/images/allow-weak-crypto.png index 5100152..137703c 100644 Binary files a/nifi-docs/src/main/asciidoc/images/allow-weak-crypto.png and b/nifi-docs/src/main/asciidoc/images/allow-weak-crypto.png differ diff --git a/nifi-docs/src/main/asciidoc/images/autocomplete-parameter-example.png b/nifi-docs/src/main/asciidoc/images/autocomplete-parameter-example.png index 99605d6..679e1e7 100644 Binary files a/nifi-docs/src/main/asciidoc/images/autocomplete-parameter-example.png and b/nifi-docs/src/main/asciidoc/images/autocomplete-parameter-example.png differ diff --git a/nifi-docs/src/main/asciidoc/images/comments-tab.png b/nifi-docs/src/main/asciidoc/images/comments-tab.png index 589d7e4..952074d 100644 Binary files a/nifi-docs/src/main/asciidoc/images/comments-tab.png and b/nifi-docs/src/main/asciidoc/images/comments-tab.png differ diff --git a/nifi-docs/src/main/asciidoc/images/configure-parameter-on-the-fly.png b/nifi-docs/src/main/asciidoc/images/configure-parameter-on-the-fly.png index cd2d1b9..d6e9506 100644 Binary files a/nifi-docs/src/main/asciidoc/images/configure-parameter-on-the-fly.png and b/nifi-docs/src/main/asciidoc/images/configure-parameter-on-the-fly.png differ diff --git a/nifi-docs/src/main/asciidoc/images/configure-processor-with-version-information.png b/nifi-docs/src/main/asciidoc/images/configure-processor-with-version-information.png index 23ed361..aadae02 100644 Binary files a/nifi-docs/src/main/asciidoc/images/configure-processor-with-version-information.png and b/nifi-docs/src/main/asciidoc/images/configure-processor-with-version-information.png differ diff --git a/nifi-docs/src/main/asciidoc/images/convert-property-to-parameter.png b/nifi-docs/src/main/asciidoc/images/convert-property-to-parameter.png index 693477c..cdca31c 100644 Binary files a/nifi-docs/src/main/asciidoc/images/convert-property-to-parameter.png and b/nifi-docs/src/main/asciidoc/images/convert-property-to-parameter.png differ diff --git a/nifi-docs/src/main/asciidoc/images/edit-property-dropdown.png b/nifi-docs/src/main/asciidoc/images/edit-property-dropdown.png index 2fd6f7d..4206aa6 100644 Binary files a/nifi-docs/src/main/asciidoc/images/edit-property-dropdown.png and b/nifi-docs/src/main/asciidoc/images/edit-property-dropdown.png differ diff --git a/nifi-docs/src/main/asciidoc/images/edit-property-t
[nifi] branch main updated: NIFI-9766 avoid intermittent SearchElasticsearchTest failures in CI pipeline
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 12685a4 NIFI-9766 avoid intermittent SearchElasticsearchTest failures
in CI pipeline
12685a4 is described below
commit 12685a4af442eb343808d9017f29b5087520a146
Author: Chris Sampson
AuthorDate: Sat Mar 5 18:35:28 2022 +
NIFI-9766 avoid intermittent SearchElasticsearchTest failures in CI pipeline
This closes #5842
Signed-off-by: Mike Thomsen
---
.../nifi-elasticsearch-client-service/pom.xml | 6 ++
.../nifi/processors/elasticsearch/SearchElasticsearchTest.groovy| 4
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml
index 050e2ad..91a277a 100644
---
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml
+++
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml
@@ -228,7 +228,6 @@
6.8.23
-6.19
_doc
setup-6.script
@@ -242,7 +241,6 @@
7.10.2
-6.19
setup-7.script
@@ -256,7 +254,6 @@
7.17.1
-6.19
setup-7.script
@@ -270,7 +267,8 @@
8.0.1
-6.20
+
+6.22
setup-8.script
diff --git
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/SearchElasticsearchTest.groovy
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/SearchElasticsearchTest.groovy
index 5fc0647..ea60ce8 100644
---
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/SearchElasticsearchTest.groovy
+++
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/SearchElasticsearchTest.groovy
@@ -107,6 +107,10 @@ class SearchElasticsearchTest extends
AbstractPaginatedJsonQueryElasticsearchTes
while (expiration.isAfter(Instant.now())) {
Thread.sleep(10)
}
+if ("true".equalsIgnoreCase(System.getenv("CI"))) {
+// allow extra time if running in CI Pipeline to prevent
intermittent timing-issue failures
+Thread.sleep(1000)
+}
service.resetPageCount()
runner.clearTransferState()
[nifi] branch main updated: NIFI-9748: Added new property for Output Format to LogAttribute. Also made the FlowFile Properties (file size, entry date, lineage start date) optional and renamed from 'St
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 65dd627 NIFI-9748: Added new property for Output Format to
LogAttribute. Also made the FlowFile Properties (file size, entry date, lineage
start date) optional and renamed from 'Standard FlowFile Attributes' to
'FlowFile Properties' because this has led to confusion many times in the past,
around users wanting to reference these things as attributes via EL but they
are not actually attributes.
65dd627 is described below
commit 65dd62716a62164f44be85657283103885f0f3ae
Author: Mark Payne
AuthorDate: Wed Mar 2 13:18:28 2022 -0500
NIFI-9748: Added new property for Output Format to LogAttribute. Also made
the FlowFile Properties (file size, entry date, lineage start date) optional
and renamed from 'Standard FlowFile Attributes' to 'FlowFile Properties'
because this has led to confusion many times in the past, around users wanting
to reference these things as attributes via EL but they are not actually
attributes.
This closes #5825
Signed-off-by: Mike Thomsen
---
.../nifi/processors/standard/LogAttribute.java | 112 +++--
1 file changed, 80 insertions(+), 32 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java
index fb86305..c5773dc 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java
@@ -16,20 +16,6 @@
*/
package org.apache.nifi.processors.standard;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.annotation.behavior.EventDriven;
@@ -39,6 +25,7 @@ import org.apache.nifi.annotation.behavior.SideEffectFree;
import org.apache.nifi.annotation.behavior.SupportsBatching;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
+import org.apache.nifi.components.AllowableValue;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
@@ -53,6 +40,22 @@ import org.apache.nifi.processor.io.InputStreamCallback;
import org.apache.nifi.processor.util.StandardValidators;
import org.eclipse.jetty.util.StringUtil;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
@EventDriven
@SideEffectFree
@SupportsBatching
@@ -60,6 +63,10 @@ import org.eclipse.jetty.util.StringUtil;
@InputRequirement(Requirement.INPUT_REQUIRED)
@CapabilityDescription("Emits attributes of the FlowFile at the specified log
level")
public class LogAttribute extends AbstractProcessor {
+private static final AllowableValue OUTPUT_FORMAT_LINE_PER_ATTRIBUTE = new
AllowableValue("Line per Attribute", "Line per Attribute", "Each FlowFile
attribute will be logged using a single line" +
+" for the attribute name and another line for the attribute value.
This format is often most advantageous when looking at the attributes of a
single FlowFile.");
+private static final AllowableValue OUTPUT_FORMAT_SINGLE_LINE = new
AllowableValue("Single Line", "Single Line", "All FlowFile attribute names and
values will be logged on a single line. This " +
+"format is often most advantageous when comparing logs from multiple
FlowFiles.");
public static final PropertyDescriptor LOG_LEVEL = new
PropertyDescriptor.Builder()
.name("Log Level")
@@ -99,6 +106,14 @@ public class LogAttribute extends AbstractProcessor {
" There's an OR relationship between the two prop
[nifi] 01/02: NIFI-9757 Upgraded SLF4J from 1.7.35 to 1.7.36
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 923e9f4e4fef6df622bfdb1c82fbd3abfa2899ed Author: exceptionfactory AuthorDate: Thu Mar 3 18:10:32 2022 -0600 NIFI-9757 Upgraded SLF4J from 1.7.35 to 1.7.36 This closes #5834 Signed-off-by: Mike Thomsen --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 64478a7..699409a 100644 --- a/pom.xml +++ b/pom.xml @@ -103,7 +103,7 @@ 4.5.13 4.4.15 1.70 -1.7.35 +1.7.36 2.1.0 9.4.45.v20220203 2.13.1
[nifi] 02/02: NIFI-9759 Upgraded Spring Framework from 5.3.15 to 5.3.16
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git commit 7438bc9244169801b3d1fe0f06d147f5742e1516 Author: exceptionfactory AuthorDate: Thu Mar 3 20:21:57 2022 -0600 NIFI-9759 Upgraded Spring Framework from 5.3.15 to 5.3.16 - Upgraded Spring Security from 5.6.1 to 5.6.2 - Upgraded Spring Boot from 2.6.3 to 2.6.4 in NiFi Registry - Upgraded Spring Data Redis from 2.6.0 to 2.6.2 - Upgraded Spring Integration from 5.5.7 to 5.5.9 This closes #5835 Signed-off-by: Mike Thomsen --- nifi-nar-bundles/nifi-redis-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml | 2 +- nifi-registry/pom.xml | 2 +- pom.xml| 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nifi-nar-bundles/nifi-redis-bundle/pom.xml b/nifi-nar-bundles/nifi-redis-bundle/pom.xml index 42ed864..84df81e 100644 --- a/nifi-nar-bundles/nifi-redis-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-redis-bundle/pom.xml @@ -27,7 +27,7 @@ pom -2.6.0 +2.6.2 3.8.0 diff --git a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml index 18e8505..d675986 100644 --- a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml +++ b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml @@ -18,7 +18,7 @@ nifi-spring-processors jar -5.5.7 +5.5.9 diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml index 3956a41..90d5fd5 100644 --- a/nifi-registry/pom.xml +++ b/nifi-registry/pom.xml @@ -37,7 +37,7 @@ 2.1 -2.6.3 +2.6.4 8.4.2 7.0.0 3.12.0 diff --git a/pom.xml b/pom.xml index 699409a..ec59fc0 100644 --- a/pom.xml +++ b/pom.xml @@ -122,8 +122,8 @@ 3.11.2 3.10.6.Final 4.1.73.Final -5.3.15 -5.6.1 +5.3.16 +5.6.2 2.1.210
[nifi] branch main updated (6cd30e3 -> 7438bc9)
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git. from 6cd30e3 NIFI-9543: Add bring-to-front functionality to labels (#5765) new 923e9f4 NIFI-9757 Upgraded SLF4J from 1.7.35 to 1.7.36 new 7438bc9 NIFI-9759 Upgraded Spring Framework from 5.3.15 to 5.3.16 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: nifi-nar-bundles/nifi-redis-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml | 2 +- nifi-registry/pom.xml | 2 +- pom.xml| 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-)
[nifi] branch main updated: NIFI-9732 Upgraded Zip4j from 2.8.0 to 2.9.1
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 1eede30 NIFI-9732 Upgraded Zip4j from 2.8.0 to 2.9.1 1eede30 is described below commit 1eede30974734b7d556135d0b5f52910277ffd38 Author: exceptionfactory AuthorDate: Sat Feb 26 09:00:27 2022 -0600 NIFI-9732 Upgraded Zip4j from 2.8.0 to 2.9.1 This closes #5811 Signed-off-by: Mike Thomsen --- nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ec3fd81..9c52b51 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 @@ -326,7 +326,7 @@ net.lingala.zip4j zip4j -2.8.0 +2.9.1 com.h2database
[nifi] branch main updated: NIFI-9672: fix flaky tests caused by the use of HashMap.
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 22b47cc NIFI-9672: fix flaky tests caused by the use of HashMap.
22b47cc is described below
commit 22b47ccc7b8af2a432ac46e893388da1afefa611
Author: xinyuwu4
AuthorDate: Thu Feb 3 13:27:30 2022 -0600
NIFI-9672: fix flaky tests caused by the use of HashMap.
This closes #5758
Signed-off-by: Mike Thomsen
---
.../test/java/org/apache/nifi/hbase/TestFetchHBaseRow.java| 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/TestFetchHBaseRow.java
b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/TestFetchHBaseRow.java
index 5878bca..21f3a7c 100644
---
a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/TestFetchHBaseRow.java
+++
b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/TestFetchHBaseRow.java
@@ -27,6 +27,7 @@ import org.junit.Test;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.Map;
public class TestFetchHBaseRow {
@@ -124,7 +125,7 @@ public class TestFetchHBaseRow {
@Test
public void testFetchToAttributesWithStringValues() {
-final Map cells = new HashMap<>();
+final Map cells = new LinkedHashMap<>();
cells.put("cq1", "val1");
cells.put("cq2", "val2");
@@ -182,7 +183,7 @@ public class TestFetchHBaseRow {
@Test
public void testFetchToAttributesWithBase64Values() {
-final Map cells = new HashMap<>();
+final Map cells = new LinkedHashMap<>();
cells.put("cq1", "val1");
cells.put("cq2", "val2");
@@ -238,7 +239,7 @@ public class TestFetchHBaseRow {
@Test
public void testFetchToContentWithStringValues() {
-final Map cells = new HashMap<>();
+final Map cells = new LinkedHashMap<>();
cells.put("cq1", "val1");
cells.put("cq2", "val2");
@@ -293,7 +294,7 @@ public class TestFetchHBaseRow {
@Test
public void testFetchSpecificColumnsToContentWithBase64() {
-final Map cells = new HashMap<>();
+final Map cells = new LinkedHashMap<>();
cells.put("cq1", "val1");
cells.put("cq2", "val2");
@@ -332,7 +333,7 @@ public class TestFetchHBaseRow {
@Test
public void testFetchToContentWithQualifierAndValueJSON() {
-final Map cells = new HashMap<>();
+final Map cells = new LinkedHashMap<>();
cells.put("cq1", "val1");
cells.put("cq2", "val2");
[nifi] branch main updated: NIFI-9696 : DeleteS3Object don't have provenance
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 0ade040 NIFI-9696 : DeleteS3Object don't have provenance
0ade040 is described below
commit 0ade040b76f232ecd394b1ed93c8d2c9134768bb
Author: lawye1973 <92093280+lawye1...@users.noreply.github.com>
AuthorDate: Thu Feb 17 22:39:56 2022 +0800
NIFI-9696 : DeleteS3Object don't have provenance
Changed from AmazonS3 to AmazonS3client.
Add REMOTE_INVOCATION provenance event with URL and "Object deleted"
This closes #5778
Signed-off-by: Mike Thomsen
---
.../main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java
index ff4249b..b4dd500 100644
---
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java
+++
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/DeleteS3Object.java
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
import com.amazonaws.AmazonServiceException;
-import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3Client;
import com.amazonaws.services.s3.model.DeleteObjectRequest;
import com.amazonaws.services.s3.model.DeleteVersionRequest;
@@ -87,7 +87,7 @@ public class DeleteS3Object extends AbstractS3Processor {
final String key =
context.getProperty(KEY).evaluateAttributeExpressions(flowFile).getValue();
final String versionId =
context.getProperty(VERSION_ID).evaluateAttributeExpressions(flowFile).getValue();
-final AmazonS3 s3 = getClient();
+final AmazonS3Client s3 = getClient();
// Deletes a key on Amazon S3
try {
@@ -108,7 +108,9 @@ public class DeleteS3Object extends AbstractS3Processor {
}
session.transfer(flowFile, REL_SUCCESS);
+final String url = s3.getResourceUrl(bucket, key);
final long transferMillis =
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos);
getLogger().info("Successfully delete S3 Object for {} in {} millis;
routing to success", flowFile, transferMillis);
+session.getProvenanceReporter().invokeRemoteProcess(flowFile, url,
"Object deleted");
}
}
[nifi] branch main updated: NIFI-9713 : TagS3Object do not have provenance data
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 54b4209 NIFI-9713 : TagS3Object do not have provenance data
54b4209 is described below
commit 54b4209798e3224881b8bc1ae5d5bebc9f82251c
Author: lawye1973 <92093280+lawye1...@users.noreply.github.com>
AuthorDate: Mon Feb 21 16:37:28 2022 +0800
NIFI-9713 : TagS3Object do not have provenance data
Changed from AmazonS3 to AmazonS3client.
Add REMOTE_INVOCATION provenance event with URL and "Object tagged"
This closes #5785
Signed-off-by: Mike Thomsen
---
.../main/java/org/apache/nifi/processors/aws/s3/TagS3Object.java| 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/TagS3Object.java
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/TagS3Object.java
index 2f01598..7ea4f53 100644
---
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/TagS3Object.java
+++
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/TagS3Object.java
@@ -17,7 +17,7 @@
package org.apache.nifi.processors.aws.s3;
import com.amazonaws.AmazonServiceException;
-import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3Client;
import com.amazonaws.services.s3.model.GetObjectTaggingRequest;
import com.amazonaws.services.s3.model.GetObjectTaggingResult;
import com.amazonaws.services.s3.model.ObjectTagging;
@@ -153,7 +153,7 @@ public class TagS3Object extends AbstractS3Processor {
final String version =
context.getProperty(VERSION_ID).evaluateAttributeExpressions(flowFile).getValue();
-final AmazonS3 s3 = getClient();
+final AmazonS3Client s3 = getClient();
SetObjectTaggingRequest r;
List tags = new ArrayList<>();
@@ -186,8 +186,10 @@ public class TagS3Object extends AbstractS3Processor {
flowFile = setTagAttributes(session, flowFile, tags);
session.transfer(flowFile, REL_SUCCESS);
+final String url = s3.getResourceUrl(bucket, key);
final long transferMillis =
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos);
getLogger().info("Successfully tagged S3 Object for {} in {} millis;
routing to success", new Object[]{flowFile, transferMillis});
+session.getProvenanceReporter().invokeRemoteProcess(flowFile, url,
"Object tagged");
}
private void failFlowWithBlankEvaluatedProperty(ProcessSession session,
FlowFile flowFile, PropertyDescriptor pd) {
[nifi] branch main updated: NIFI-9715 add option to output empty FlowFile from Elasticsearch REST API Json Query processors when there are no hits from query
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 07131a6 NIFI-9715 add option to output empty FlowFile from
Elasticsearch REST API Json Query processors when there are no hits from query
07131a6 is described below
commit 07131a66ea39155f4523b974912b6820058cad5b
Author: Chris Sampson
AuthorDate: Mon Feb 21 21:12:24 2022 +
NIFI-9715 add option to output empty FlowFile from Elasticsearch REST API
Json Query processors when there are no hits from query
This closes #5786
Signed-off-by: Mike Thomsen
---
.../AbstractJsonQueryElasticsearch.java| 22 +-
.../AbstractPaginatedJsonQueryElasticsearch.java | 5 ++-
.../AbstractJsonQueryElasticsearchTest.groovy | 49 +-
3 files changed, 70 insertions(+), 6 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractJsonQueryElasticsearch.java
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractJsonQueryElasticsearch.java
index 8af8770..25c9417 100644
---
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractJsonQueryElasticsearch.java
+++
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractJsonQueryElasticsearch.java
@@ -86,6 +86,17 @@ public abstract class AbstractJsonQueryElasticsearch relationships;
private static final List propertyDescriptors;
@@ -93,6 +104,7 @@ public abstract class AbstractJsonQueryElasticsearch clientService;
String splitUpHits;
private String splitUpAggregations;
+private boolean outputNoHits;
final ObjectMapper mapper = new ObjectMapper();
@@ -112,6 +124,7 @@ public abstract class AbstractJsonQueryElasticsearch handleHits(final List> hits, final Q
queryJsonParameters, final ProcessSession session,
+List handleHits(final List> hits, final
boolean newQuery, final Q queryJsonParameters, final ProcessSession session,
final FlowFile parent, final Map
attributes, final List hitsFlowFiles,
final String transitUri, final StopWatch
stopWatch) throws IOException {
if (hits != null && !hits.isEmpty()) {
@@ -286,6 +301,9 @@ public abstract class AbstractJsonQueryElasticsearch resultFlowFiles = handleHits(response.getHits(),
queryJsonParameters, session, input,
+final List resultFlowFiles = handleHits(response.getHits(),
newQuery, queryJsonParameters, session, input,
attributes, hitsFlowFiles, transitUri, stopWatch);
queryJsonParameters.addHitCount(response.getHits().size());
diff --git
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractPaginatedJsonQueryElasticsearch.java
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractPaginatedJsonQueryElasticsearch.java
index e5b47ee..2e8eab6 100644
---
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractPaginatedJsonQueryElasticsearch.java
+++
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractPaginatedJsonQueryElasticsearch.java
@@ -109,6 +109,7 @@ public abstract class
AbstractPaginatedJsonQueryElasticsearch extends AbstractJs
descriptors.add(AGGREGATION_RESULTS_SPLIT);
descriptors.add(PAGINATION_TYPE);
descriptors.add(PAGINATION_KEEP_ALIVE);
+descriptors.add(OUTPUT_NO_HITS);
paginatedPropertyDescriptors =
Collections.unmodifiableList(descriptors);
}
@@ -282,7 +283,7 @@ public abstract class
AbstractPaginatedJsonQueryElasticsearch extends AbstractJs
* SearchResponse is processed, i.e. this approach allows recursion for
paginated queries, but is unnecessary for single-response queries.
*/
@Override
-List handleHits(final List> hits, final
PaginatedJsonQueryParameters paginatedJsonQueryParameters,
+List handleHits(final List> hits, final
boolean newQuery, final PaginatedJsonQueryParameters
paginatedJsonQueryParameters,
final ProcessSession session, final FlowFile
parent, final Map attributes,
final List hitsFlowFiles, final String
transitUri, final StopWatch stopWatch
[nifi] branch main updated: NIFI-9694 : Correct FetchS3Object.java provenance data URL
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 8d80fb2 NIFI-9694 : Correct FetchS3Object.java provenance data URL
8d80fb2 is described below
commit 8d80fb29300964be1ada0c433d3bc8e24df1e382
Author: lawye1973 <92093280+lawye1...@users.noreply.github.com>
AuthorDate: Thu Feb 17 22:44:19 2022 +0800
NIFI-9694 : Correct FetchS3Object.java provenance data URL
Current provenance data URL is incorrect as it's hardcoded.
Follow PutS3Object.java method, using AmazonS3Client (instead of AmazonS3)
to use getResourceUrl(bucket,key) to build the correct URL for provenance data
This closes #5779
Signed-off-by: Mike Thomsen
---
.../java/org/apache/nifi/processors/aws/s3/FetchS3Object.java| 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java
index f639b54..db83bad 100644
---
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java
+++
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java
@@ -17,7 +17,7 @@
package org.apache.nifi.processors.aws.s3;
import com.amazonaws.AmazonClientException;
-import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3Client;
import com.amazonaws.services.s3.model.GetObjectMetadataRequest;
import com.amazonaws.services.s3.model.GetObjectRequest;
import com.amazonaws.services.s3.model.ObjectMetadata;
@@ -163,7 +163,7 @@ public class FetchS3Object extends AbstractS3Processor {
final String bucket =
context.getProperty(BUCKET).evaluateAttributeExpressions(attributes).getValue();
final String key =
context.getProperty(KEY).evaluateAttributeExpressions(attributes).getValue();
-final AmazonS3 client = getConfiguration(context).getClient();
+final AmazonS3Client client = getConfiguration(context).getClient();
final GetObjectMetadataRequest request =
createGetObjectMetadataRequest(context, attributes);
try {
@@ -204,7 +204,7 @@ public class FetchS3Object extends AbstractS3Processor {
final String bucket =
context.getProperty(BUCKET).evaluateAttributeExpressions(flowFile).getValue();
final String key =
context.getProperty(KEY).evaluateAttributeExpressions(flowFile).getValue();
-final AmazonS3 client = getClient();
+final AmazonS3Client client = getClient();
final GetObjectRequest request = createGetObjectRequest(context,
flowFile.getAttributes());
try (final S3Object s3Object = client.getObject(request)) {
@@ -277,9 +277,10 @@ public class FetchS3Object extends AbstractS3Processor {
}
session.transfer(flowFile, REL_SUCCESS);
+final String url = client.getResourceUrl(bucket, key);
final long transferMillis =
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNanos);
getLogger().info("Successfully retrieved S3 Object for {} in {}
millis; routing to success", new Object[]{flowFile, transferMillis});
-session.getProvenanceReporter().fetch(flowFile, "http://; + bucket +
".amazonaws.com/" + key, transferMillis);
+session.getProvenanceReporter().fetch(flowFile, url, transferMillis);
}
private GetObjectMetadataRequest createGetObjectMetadataRequest(final
ProcessContext context, final Map attributes) {
[nifi] branch main updated: NIFI-9286: JOLT Expression Language Fixes NIFI-6213 and adds in functionality to use expression language in class and module specification NIFI-9286: adding JOLT unit tests
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 dfbf2e3 NIFI-9286: JOLT Expression Language Fixes NIFI-6213 and adds
in functionality to use expression language in class and module specification
NIFI-9286: adding JOLT unit tests NIFI-9286: addressing PR feedback Fixes a
problem with the scope of the EL for module directory NIFI-9286: alignment of
JOLT processors NIFI-9286: fix checkstyle
dfbf2e3 is described below
commit dfbf2e3cea5485196c18934d0c01f49103f12727
Author: levilentz
AuthorDate: Tue Oct 5 14:46:13 2021 -0700
NIFI-9286: JOLT Expression Language
Fixes NIFI-6213 and adds in functionality to use expression language in
class and module specification
NIFI-9286: adding JOLT unit tests
NIFI-9286: addressing PR feedback
Fixes a problem with the scope of the EL for module directory
NIFI-9286: alignment of JOLT processors
NIFI-9286: fix checkstyle
This closes #5444
Signed-off-by: Mike Thomsen
---
.../jolt/record/JoltTransformRecord.java | 47 ---
.../jolt/record/TestJoltTransformRecord.java | 28 +++
.../processors/standard/JoltTransformJSON.java | 54 +++---
.../processors/standard/TestJoltTransformJSON.java | 27 +++
4 files changed, 123 insertions(+), 33 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/src/main/java/org/apache/nifi/processors/jolt/record/JoltTransformRecord.java
b/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/src/main/java/org/apache/nifi/processors/jolt/record/JoltTransformRecord.java
index 0b48901..9293e4c 100644
---
a/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/src/main/java/org/apache/nifi/processors/jolt/record/JoltTransformRecord.java
+++
b/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/src/main/java/org/apache/nifi/processors/jolt/record/JoltTransformRecord.java
@@ -20,14 +20,15 @@ import com.bazaarvoice.jolt.ContextualTransform;
import com.bazaarvoice.jolt.JoltTransform;
import com.bazaarvoice.jolt.JsonUtils;
import com.bazaarvoice.jolt.Transform;
+import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
-import com.github.benmanes.caffeine.cache.LoadingCache;
import org.apache.nifi.annotation.behavior.EventDriven;
-import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.SideEffectFree;
import org.apache.nifi.annotation.behavior.SupportsBatching;
-import org.apache.nifi.annotation.behavior.WritesAttribute;
+import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.WritesAttributes;
+import org.apache.nifi.annotation.behavior.WritesAttribute;
+import org.apache.nifi.annotation.behavior.RequiresInstanceClassLoading;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
@@ -60,7 +61,6 @@ import
org.apache.nifi.serialization.record.util.DataTypeUtils;
import org.apache.nifi.util.StopWatch;
import org.apache.nifi.util.StringUtils;
-import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -89,6 +89,7 @@ import java.util.stream.Collectors;
@CapabilityDescription("Applies a list of Jolt specifications to the FlowFile
payload. A new FlowFile is created "
+ "with transformed content and is routed to the 'success'
relationship. If the transform "
+ "fails, the original FlowFile is routed to the 'failure'
relationship.")
+@RequiresInstanceClassLoading
public class JoltTransformRecord extends AbstractProcessor {
static final AllowableValue SHIFTR
@@ -151,8 +152,9 @@ public class JoltTransformRecord extends AbstractProcessor {
.displayName("Custom Transformation Class Name")
.description("Fully Qualified Class Name for Custom
Transformation")
.required(false)
-.expressionLanguageSupported(ExpressionLanguageScope.NONE)
+
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+.dependsOn(JOLT_SPEC, CUSTOMR)
.build();
static final PropertyDescriptor MODULES = new PropertyDescriptor.Builder()
@@ -163,6 +165,7 @@ public class JoltTransformRecord extends AbstractProcessor {
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.identifiesExternalResource(ResourceCardinality.MU
[nifi] branch main updated: NIFI-9706 Added Memory Resource Consideration to JoltTransformJSON
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 0504913 NIFI-9706 Added Memory Resource Consideration to
JoltTransformJSON
0504913 is described below
commit 050491376119f3a5fbbc0ba135f60e1a82d23989
Author: exceptionfactory
AuthorDate: Thu Feb 17 11:15:58 2022 -0600
NIFI-9706 Added Memory Resource Consideration to JoltTransformJSON
This closes #5781
Signed-off-by: Mike Thomsen
---
.../java/org/apache/nifi/processors/standard/JoltTransformJSON.java | 6 ++
1 file changed, 6 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JoltTransformJSON.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JoltTransformJSON.java
index 7c7d649..a95ea73 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JoltTransformJSON.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/JoltTransformJSON.java
@@ -24,6 +24,9 @@ import org.apache.nifi.annotation.behavior.EventDriven;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.SideEffectFree;
import org.apache.nifi.annotation.behavior.SupportsBatching;
+import org.apache.nifi.annotation.behavior.SystemResource;
+import org.apache.nifi.annotation.behavior.SystemResourceConsideration;
+import org.apache.nifi.annotation.behavior.SystemResourceConsiderations;
import org.apache.nifi.annotation.behavior.WritesAttribute;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
@@ -73,6 +76,9 @@ import java.util.concurrent.TimeUnit;
@CapabilityDescription("Applies a list of Jolt specifications to the flowfile
JSON payload. A new FlowFile is created "
+ "with transformed content and is routed to the 'success'
relationship. If the JSON transform "
+ "fails, the original FlowFile is routed to the 'failure'
relationship.")
+@SystemResourceConsiderations({
+@SystemResourceConsideration(resource = SystemResource.MEMORY,
description = "Jolt reads entire FlowFile content into memory")
+})
public class JoltTransformJSON extends AbstractProcessor {
public static final AllowableValue SHIFTR = new
AllowableValue("jolt-transform-shift", "Shift", "Shift input JSON/data to
create the output JSON.");
[nifi] branch main updated: NIFI-9596: Fix newline bug in JythonScriptRunner NIFI-9596: Added comment to indicate why the Apache header is missing
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 9d8b395 NIFI-9596: Fix newline bug in JythonScriptRunner NIFI-9596:
Added comment to indicate why the Apache header is missing
9d8b395 is described below
commit 9d8b39529ef5f877e5e8790973ca43ac049be85a
Author: Matthew Burgess
AuthorDate: Wed Jan 19 13:00:36 2022 -0500
NIFI-9596: Fix newline bug in JythonScriptRunner
NIFI-9596: Added comment to indicate why the Apache header is missing
This closes #5682
Signed-off-by: Mike Thomsen
---
.../nifi-scripting-processors/pom.xml | 16 ++-
.../nifi/script/impl/JythonScriptRunner.java | 2 +-
.../src/test/resources/jython/test_compress.py | 23 ++
3 files changed, 18 insertions(+), 23 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
index 9c287aa..2a8c3f9 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
@@ -13,7 +13,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-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;>
+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
@@ -153,4 +154,17 @@
${scripting.groovy.version}
+
+
+
+org.apache.rat
+apache-rat-plugin
+
+
+
src/test/resources/jython/test_compress.py
+
+
+
+
+
diff --git
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/impl/JythonScriptRunner.java
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/impl/JythonScriptRunner.java
index da315b0..e178bb9 100644
---
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/impl/JythonScriptRunner.java
+++
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/impl/JythonScriptRunner.java
@@ -38,7 +38,7 @@ public class JythonScriptRunner extends BaseScriptRunner {
// Add prefix for import sys and all jython modules
String prefix = "import sys\n"
+ Arrays.stream(modulePaths).map((modulePath) ->
"sys.path.append(" + PyString.encode_UnicodeEscape(modulePath, true) + ")")
-.collect(Collectors.joining("\n"));
+.collect(Collectors.joining("\n")) + "\n";
compiledScript = ((Compilable) engine).compile(prefix + scriptBody);
}
diff --git
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/test_compress.py
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/test_compress.py
index b189cf5..bc74f9a 100755
---
a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/test_compress.py
+++
b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/jython/test_compress.py
@@ -1,25 +1,6 @@
-#! /usr/bin/python
-#
-# 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.
-#
-
-import sys
import traceback
+# There is no Apache header on this file in order to reproduce the issue in
NIFI-9596
+# where the first line gets appended to the last line of the additi
[nifi] branch main updated: NIFI-9216 Upgraded Derby to 10.14.2.0 in nifi-hive-bundle
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 bb638b1 NIFI-9216 Upgraded Derby to 10.14.2.0 in nifi-hive-bundle bb638b1 is described below commit bb638b13aa64369114ef57b5ba663bbf41aa71ab Author: exceptionfactory AuthorDate: Mon Sep 13 13:49:20 2021 -0500 NIFI-9216 Upgraded Derby to 10.14.2.0 in nifi-hive-bundle This closes #5385 Signed-off-by: Mike Thomsen --- nifi-nar-bundles/nifi-hive-bundle/pom.xml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/nifi-nar-bundles/nifi-hive-bundle/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/pom.xml index 94124ef..dc4f8ae 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-hive-bundle/pom.xml @@ -91,6 +91,12 @@ commons-beanutils 1.9.4 + + +org.apache.derby +derby +10.14.2.0 +
[nifi] branch main updated: NIFI-9210 Upgraded jsoup from 1.8.3 to 1.14.2
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 977800b NIFI-9210 Upgraded jsoup from 1.8.3 to 1.14.2
977800b is described below
commit 977800b8350d396ba2319a3c54d2ce10812f5584
Author: exceptionfactory
AuthorDate: Thu Sep 9 16:05:12 2021 -0500
NIFI-9210 Upgraded jsoup from 1.8.3 to 1.14.2
This closes #5379
Signed-off-by: Mike Thomsen
---
minifi/pom.xml | 2 +-
nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/pom.xml | 2 +-
.../src/test/java/org/apache/nifi/TestPutHTMLElement.java | 10 ++
nifi-nar-bundles/nifi-media-bundle/pom.xml | 6 ++
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/minifi/pom.xml b/minifi/pom.xml
index e28972e..f57d783 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -1028,7 +1028,7 @@ limitations under the License.
org.jsoup
jsoup
-1.8.3
+1.14.2
org.codehaus.groovy
diff --git a/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/pom.xml
b/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/pom.xml
index e8662b7..8b5563b 100644
--- a/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/pom.xml
@@ -29,7 +29,7 @@
org.jsoup
jsoup
-1.8.3
+1.14.2
org.apache.commons
diff --git
a/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/java/org/apache/nifi/TestPutHTMLElement.java
b/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/java/org/apache/nifi/TestPutHTMLElement.java
index b842ccb..5d4c5e5 100644
---
a/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/java/org/apache/nifi/TestPutHTMLElement.java
+++
b/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/java/org/apache/nifi/TestPutHTMLElement.java
@@ -29,6 +29,8 @@ import org.junit.Test;
import java.io.File;
import java.util.List;
+
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -58,7 +60,7 @@ public class TestPutHTMLElement extends AbstractHTMLTest {
testRunner.assertTransferCount(PutHTMLElement.REL_NOT_FOUND, 0);
List ffs =
testRunner.getFlowFilesForRelationship(PutHTMLElement.REL_SUCCESS);
-assertTrue(ffs.size() == 1);
+assertEquals(1, ffs.size());
String data = new String(testRunner.getContentAsByteArray(ffs.get(0)));
//Contents will be the entire HTML doc. So lets use Jsoup again just
the grab the element we want.
@@ -85,7 +87,7 @@ public class TestPutHTMLElement extends AbstractHTMLTest {
testRunner.assertTransferCount(PutHTMLElement.REL_NOT_FOUND, 0);
List ffs =
testRunner.getFlowFilesForRelationship(PutHTMLElement.REL_SUCCESS);
-assertTrue(ffs.size() == 1);
+assertEquals(1, ffs.size());
String data = new String(testRunner.getContentAsByteArray(ffs.get(0)));
//Contents will be the entire HTML doc. So lets use Jsoup again just
the grab the element we want.
@@ -93,7 +95,7 @@ public class TestPutHTMLElement extends AbstractHTMLTest {
Elements eles = doc.select("#put");
Element ele = eles.get(0);
-assertTrue(StringUtils.equals("modified value \n", ele.html()));
+assertEquals("modified value", ele.html());
}
@Test
@@ -112,7 +114,7 @@ public class TestPutHTMLElement extends AbstractHTMLTest {
testRunner.assertTransferCount(PutHTMLElement.REL_NOT_FOUND, 0);
List ffs =
testRunner.getFlowFilesForRelationship(PutHTMLElement.REL_SUCCESS);
-assertTrue(ffs.size() == 1);
+assertEquals(1, ffs.size());
String data = new String(testRunner.getContentAsByteArray(ffs.get(0)));
//Contents will be the entire HTML doc. So lets use Jsoup again just
the grab the element we want.
diff --git a/nifi-nar-bundles/nifi-media-bundle/pom.xml
b/nifi-nar-bundles/nifi-media-bundle/pom.xml
index 1aa2bde..efe1de1 100644
--- a/nifi-nar-bundles/nifi-media-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-media-bundle/pom.xml
@@ -40,6 +40,12 @@
commons-compress
1.21
+
+
+org.jsoup
+jsoup
+1.14.2
+
[nifi] branch main updated: NIFI-9071 - Update asciidoctor plugin
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 0a9a8aa NIFI-9071 - Update asciidoctor plugin
0a9a8aa is described below
commit 0a9a8aa1906d84e1b16d80b5e1dd50ba6af53ccf
Author: Paul Grey
AuthorDate: Fri Aug 20 17:22:08 2021 -0400
NIFI-9071 - Update asciidoctor plugin
This closes #5373
Signed-off-by: Mike Thomsen
---
nifi-docs/pom.xml | 2 +-
nifi-registry/nifi-registry-core/nifi-registry-docs/pom.xml| 2 +-
nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/nifi-docs/pom.xml b/nifi-docs/pom.xml
index 5f83b54..1aa7c70 100644
--- a/nifi-docs/pom.xml
+++ b/nifi-docs/pom.xml
@@ -48,7 +48,7 @@
org.asciidoctor
asciidoctor-maven-plugin
-1.5.2
+1.5.8
output-html
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-docs/pom.xml
b/nifi-registry/nifi-registry-core/nifi-registry-docs/pom.xml
index 5748937..468b643 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-docs/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-docs/pom.xml
@@ -58,7 +58,7 @@
org.asciidoctor
asciidoctor-maven-plugin
-1.5.2
+1.5.8
output-html
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml
index c62d0f9..584896c 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/pom.xml
@@ -215,7 +215,7 @@
org.asciidoctor
asciidoctor-maven-plugin
-1.5.7.1
+1.5.8
${asciidoc.source.dir}
rest-api.adoc
[nifi] branch main updated: NIFI-8376: Gracefully handle SQL exceptions in ResultSetRecordSet
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 98e3b46 NIFI-8376: Gracefully handle SQL exceptions in
ResultSetRecordSet
98e3b46 is described below
commit 98e3b465c3f94bf693b57808b05cc715fba18855
Author: Matthew Burgess
AuthorDate: Mon Mar 29 18:24:36 2021 -0400
NIFI-8376: Gracefully handle SQL exceptions in ResultSetRecordSet
This closes #4951
Signed-off-by: Mike Thomsen
---
.../serialization/record/ResultSetRecordSet.java | 20 +--
.../record/ResultSetRecordSetTest.java | 42 ++
2 files changed, 51 insertions(+), 11 deletions(-)
diff --git
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/ResultSetRecordSet.java
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/ResultSetRecordSet.java
index 78a68b3..7bf48f0 100644
---
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/ResultSetRecordSet.java
+++
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/ResultSetRecordSet.java
@@ -30,6 +30,7 @@ import java.sql.Array;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import java.sql.Types;
import java.util.ArrayList;
import java.util.Date;
@@ -203,17 +204,17 @@ public class ResultSetRecordSet implements RecordSet,
Closeable {
// the base type. However, if the base type is, itself, an
array, we will simply return a base type of
// String because otherwise, we need the ResultSet for the
array itself, and many JDBC Drivers do not
// support calling Array.getResultSet() and will throw an
Exception if that is not supported.
-if (rs.isAfterLast()) {
-return
RecordFieldType.ARRAY.getArrayDataType(RecordFieldType.STRING.getDataType());
-}
+try {
+final Array array = rs.getArray(columnIndex);
-final Array array = rs.getArray(columnIndex);
-if (array == null) {
+if (array == null) {
+return
RecordFieldType.ARRAY.getArrayDataType(RecordFieldType.STRING.getDataType());
+}
+final DataType baseType = getArrayBaseType(array);
+return RecordFieldType.ARRAY.getArrayDataType(baseType);
+} catch (SQLFeatureNotSupportedException sfnse) {
return
RecordFieldType.ARRAY.getArrayDataType(RecordFieldType.STRING.getDataType());
}
-
-final DataType baseType = getArrayBaseType(array);
-return RecordFieldType.ARRAY.getArrayDataType(baseType);
case Types.BINARY:
case Types.LONGVARBINARY:
case Types.VARBINARY:
@@ -318,9 +319,6 @@ public class ResultSetRecordSet implements RecordSet,
Closeable {
if (arrayValue instanceof short[]) {
return RecordFieldType.SHORT.getDataType();
}
-if (arrayValue instanceof byte[]) {
-return RecordFieldType.BYTE.getDataType();
-}
if (arrayValue instanceof float[]) {
return RecordFieldType.FLOAT.getDataType();
}
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 0b768fd..3cefc4e 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
@@ -21,6 +21,7 @@ import
org.apache.nifi.serialization.record.type.DecimalDataType;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
@@ -30,6 +31,7 @@ import java.sql.Date;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import java.sql.Types;
import java.time.LocalDate;
import java.time.ZoneOffset;
@@ -39,6 +41,7 @@ import java.util.List;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
@@ -241,6 +244,45 @@ public class ResultSetRecordSetTest {
assertEquals(bigDecimal5Value,
record.getValue(COLUMN_NAME_BIG_DECIMAL_5
[nifi] 02/02: NIFI-9197 - Improve AWS Surefire Run Time
This is an automated email from the ASF dual-hosted git repository.
mthomsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit cbc25aa1802b823ddea40c8bd36d0a0813419a52
Author: Paul Grey
AuthorDate: Tue Sep 7 19:59:18 2021 -0400
NIFI-9197 - Improve AWS Surefire Run Time
This closes #5370
Signed-off-by: Mike Thomsen
---
.../apache/nifi/processors/aws/wag/TestInvokeAWSGatewayApiCommon.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/wag/TestInvokeAWSGatewayApiCommon.java
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/wag/TestInvokeAWSGatewayApiCommon.java
index 86af1c6..335d44e 100644
---
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/wag/TestInvokeAWSGatewayApiCommon.java
+++
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/wag/TestInvokeAWSGatewayApiCommon.java
@@ -1224,7 +1224,7 @@ public abstract class TestInvokeAWSGatewayApiCommon {
runner.setProperty(InvokeAWSGatewayApi.PROP_AWS_GATEWAY_API_ENDPOINT,
badurlport);
runner.setProperty(InvokeAWSGatewayApi.PROP_RESOURCE_NAME,
"/doesnotExist");
-runner.setProperty(InvokeAWSGatewayApi.TIMEOUT, "3 secs");
+runner.setProperty(InvokeAWSGatewayApi.TIMEOUT, "1 sec");
createFlowFiles(runner);
runner.run();
@@ -1253,7 +1253,7 @@ public abstract class TestInvokeAWSGatewayApiCommon {
runner.setProperty(InvokeAWSGatewayApi.PROP_AWS_GATEWAY_API_ENDPOINT,
badurlhost);
runner.setProperty(InvokeAWSGatewayApi.PROP_RESOURCE_NAME,
"/doesnotExist");
-runner.setProperty(InvokeAWSGatewayApi.TIMEOUT, "3 secs");
+runner.setProperty(InvokeAWSGatewayApi.TIMEOUT, "1 sec");
createFlowFiles(runner);
runner.run();
[nifi] branch main updated (acb25c1 -> cbc25aa)
This is an automated email from the ASF dual-hosted git repository. mthomsen pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git. from acb25c1 NIFI-9170 Upgrade commons-beanutils to 1.9.4 to mitigate CVE-2019-10086 NIFI-9170 Add two more 1.9.4 references to close out the few things identified by the Maven dependency plugin. new 6ce9919 NIFI-9197 - Improve AWS Surefire Run Time new cbc25aa NIFI-9197 - Improve AWS Surefire Run Time 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: .../nifi/processors/aws/kinesis/stream/TestConsumeKinesisStream.java| 1 + .../apache/nifi/processors/aws/wag/TestInvokeAWSGatewayApiCommon.java | 2 ++ 2 files changed, 3 insertions(+)
[nifi] 01/02: NIFI-9197 - Improve AWS Surefire Run Time
This is an automated email from the ASF dual-hosted git repository.
mthomsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 6ce9919a1fa9733be43b726ecd85fc6dc4845f56
Author: Paul Grey
AuthorDate: Tue Sep 7 11:10:35 2021 -0400
NIFI-9197 - Improve AWS Surefire Run Time
---
.../nifi/processors/aws/kinesis/stream/TestConsumeKinesisStream.java| 1 +
.../apache/nifi/processors/aws/wag/TestInvokeAWSGatewayApiCommon.java | 2 ++
2 files changed, 3 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/kinesis/stream/TestConsumeKinesisStream.java
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/kinesis/stream/TestConsumeKinesisStream.java
index 9f36b9b..95a2a0e 100644
---
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/kinesis/stream/TestConsumeKinesisStream.java
+++
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/kinesis/stream/TestConsumeKinesisStream.java
@@ -366,6 +366,7 @@ public class TestConsumeKinesisStream {
mockConsumeKinesisStreamRunner.setProperty(ConsumeKinesisStream.KINESIS_STREAM_NAME,
"test-stream");
mockConsumeKinesisStreamRunner.setProperty(ConsumeKinesisStream.APPLICATION_NAME,
"test-application");
mockConsumeKinesisStreamRunner.setProperty(ConsumeKinesisStream.REGION,
Regions.EU_WEST_2.getName());
+
mockConsumeKinesisStreamRunner.setProperty(ConsumeKinesisStream.TIMEOUT, "5
secs");
final AWSCredentialsProviderService awsCredentialsProviderService =
new AWSCredentialsProviderControllerService();
mockConsumeKinesisStreamRunner.addControllerService("aws-credentials",
awsCredentialsProviderService);
diff --git
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/wag/TestInvokeAWSGatewayApiCommon.java
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/wag/TestInvokeAWSGatewayApiCommon.java
index f230cf1..86af1c6 100644
---
a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/wag/TestInvokeAWSGatewayApiCommon.java
+++
b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/wag/TestInvokeAWSGatewayApiCommon.java
@@ -1224,6 +1224,7 @@ public abstract class TestInvokeAWSGatewayApiCommon {
runner.setProperty(InvokeAWSGatewayApi.PROP_AWS_GATEWAY_API_ENDPOINT,
badurlport);
runner.setProperty(InvokeAWSGatewayApi.PROP_RESOURCE_NAME,
"/doesnotExist");
+runner.setProperty(InvokeAWSGatewayApi.TIMEOUT, "3 secs");
createFlowFiles(runner);
runner.run();
@@ -1252,6 +1253,7 @@ public abstract class TestInvokeAWSGatewayApiCommon {
runner.setProperty(InvokeAWSGatewayApi.PROP_AWS_GATEWAY_API_ENDPOINT,
badurlhost);
runner.setProperty(InvokeAWSGatewayApi.PROP_RESOURCE_NAME,
"/doesnotExist");
+runner.setProperty(InvokeAWSGatewayApi.TIMEOUT, "3 secs");
createFlowFiles(runner);
runner.run();
[nifi] branch main updated: NIFI-9170 Upgrade commons-beanutils to 1.9.4 to mitigate CVE-2019-10086 NIFI-9170 Add two more 1.9.4 references to close out the few things identified by the Maven dependen
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 acb25c1 NIFI-9170 Upgrade commons-beanutils to 1.9.4 to mitigate CVE-2019-10086 NIFI-9170 Add two more 1.9.4 references to close out the few things identified by the Maven dependency plugin. acb25c1 is described below commit acb25c1130a4a329141dc09750d6a79d2f5a3315 Author: Mohammed Nadeem AuthorDate: Fri Aug 27 13:33:20 2021 +0530 NIFI-9170 Upgrade commons-beanutils to 1.9.4 to mitigate CVE-2019-10086 NIFI-9170 Add two more 1.9.4 references to close out the few things identified by the Maven dependency plugin. This closes #5351 Signed-off-by: Mike Thomsen --- nifi-external/nifi-spark-receiver/pom.xml | 6 ++ nifi-nar-bundles/nifi-accumulo-bundle/pom.xml | 6 ++ .../nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml | 4 .../nifi-framework-bundle/nifi-framework/nifi-web/pom.xml | 6 ++ nifi-nar-bundles/nifi-hive-bundle/pom.xml | 6 ++ nifi-nar-bundles/nifi-kite-bundle/pom.xml | 6 ++ nifi-nar-bundles/nifi-parquet-bundle/pom.xml| 6 ++ nifi-nar-bundles/nifi-ranger-bundle/pom.xml | 6 ++ .../nifi-hbase_1_1_2-client-service-bundle/pom.xml | 6 ++ .../nifi-hbase_2-client-service-bundle/pom.xml | 6 ++ nifi-toolkit/nifi-toolkit-admin/pom.xml | 5 + 11 files changed, 63 insertions(+) diff --git a/nifi-external/nifi-spark-receiver/pom.xml b/nifi-external/nifi-spark-receiver/pom.xml index dd82b8d..25f2c79 100644 --- a/nifi-external/nifi-spark-receiver/pom.xml +++ b/nifi-external/nifi-spark-receiver/pom.xml @@ -36,6 +36,12 @@ commons-compress 1.21 + + +commons-beanutils +commons-beanutils +1.9.4 + diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml index f4d3271..b32d007 100644 --- a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml @@ -48,6 +48,12 @@ commons-io 2.10.0 + + +commons-beanutils +commons-beanutils +1.9.4 + diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml index e08bf5e..ead30bf 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml @@ -39,5 +39,9 @@ org.apache.nifi nifi-web-security + +commons-beanutils +commons-beanutils + diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml index 99fbb81..ca18417 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml @@ -66,6 +66,12 @@ war 1.15.0-SNAPSHOT + + +commons-beanutils +commons-beanutils +1.9.4 + diff --git a/nifi-nar-bundles/nifi-hive-bundle/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/pom.xml index c87ffe1..94124ef 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-hive-bundle/pom.xml @@ -85,6 +85,12 @@ commons-compress 1.21 + + +commons-beanutils +commons-beanutils +1.9.4 + diff --git a/nifi-nar-bundles/nifi-kite-bundle/pom.xml b/nifi-nar-bundles/nifi-kite-bundle/pom.xml index eb97c2e..1997d1f 100644 --- a/nifi-nar-bundles/nifi-kite-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-kite-bundle/pom.xml @@ -56,6 +56,12 @@ commons-compress 1.21 + + +commons-beanutils +commons-beanutils +1.9.4 + com.fasterxml.jackson.core diff --git a/nifi-nar-bundles/nifi-parquet-bundle/pom.xml b/nifi-nar
[nifi] branch main updated: NIFI-9141 Refactored nifi-provenance-provenance-bundle using JUnit 5 NIFI-9141 Added class Timeout annotations
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 2c5cf8b NIFI-9141 Refactored nifi-provenance-provenance-bundle using
JUnit 5 NIFI-9141 Added class Timeout annotations
2c5cf8b is described below
commit 2c5cf8ba0a97375d41b0ef2feb8a9b9ed3a66753
Author: exceptionfactory
AuthorDate: Fri Sep 3 22:35:00 2021 -0500
NIFI-9141 Refactored nifi-provenance-provenance-bundle using JUnit 5
NIFI-9141 Added class Timeout annotations
This closes #5368
Signed-off-by: Mike Thomsen
---
.../EncryptedSchemaRecordReaderWriterTest.groovy | 76 ++-
...ryptedWriteAheadProvenanceRepositoryTest.groovy | 102 +-
.../provenance/AbstractTestRecordReaderWriter.java | 28 +--
.../ITestPersistentProvenanceRepository.java | 223 -
.../provenance/StartupAgainstOldLuceneIndexIT.java | 12 +-
.../TestEventIdFirstSchemaRecordReaderWriter.java | 49 ++---
.../provenance/TestSchemaRecordReaderWriter.java | 50 ++---
.../provenance/TestStandardRecordReaderWriter.java | 25 ++-
.../index/lucene/TestEventIndexTask.java | 16 +-
.../index/lucene/TestIndexDirectoryManager.java| 8 +-
.../index/lucene/TestLuceneEventIndex.java | 159 +++
.../provenance/lucene/TestSimpleIndexManager.java | 47 ++---
.../nifi/provenance/store/ArrayListEventStore.java | 11 +-
.../provenance/store/TestEventFileManager.java | 190 --
.../store/TestPartitionedWriteAheadEventStore.java | 28 +--
.../store/TestWriteAheadStorePartition.java| 11 +-
.../TestSelectiveRecordReaderEventIterator.java| 39 ++--
.../nifi/provenance/toc/TestStandardTocReader.java | 14 +-
.../nifi/provenance/toc/TestStandardTocWriter.java | 9 +-
.../TestVolatileProvenanceRepository.java | 20 +-
20 files changed, 328 insertions(+), 789 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/groovy/org/apache/nifi/provenance/EncryptedSchemaRecordReaderWriterTest.groovy
b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/groovy/org/apache/nifi/provenance/EncryptedSchemaRecordReaderWriterTest.groovy
index 784eb9a..79d4912 100644
---
a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/groovy/org/apache/nifi/provenance/EncryptedSchemaRecordReaderWriterTest.groovy
+++
b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/groovy/org/apache/nifi/provenance/EncryptedSchemaRecordReaderWriterTest.groovy
@@ -25,18 +25,11 @@ import org.apache.nifi.provenance.toc.TocReader
import org.apache.nifi.provenance.toc.TocUtil
import org.apache.nifi.provenance.toc.TocWriter
import org.apache.nifi.security.kms.KeyProvider
-import org.apache.nifi.util.file.FileUtils
import org.bouncycastle.jce.provider.BouncyCastleProvider
import org.bouncycastle.util.encoders.Hex
-import org.junit.After
-import org.junit.AfterClass
-import org.junit.Before
-import org.junit.BeforeClass
-import org.junit.ClassRule
-import org.junit.Test
-import org.junit.rules.TemporaryFolder
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
+import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
import org.slf4j.Logger
import org.slf4j.LoggerFactory
@@ -49,13 +42,11 @@ import java.util.concurrent.atomic.AtomicLong
import static groovy.test.GroovyAssert.shouldFail
import static org.apache.nifi.provenance.TestUtil.createFlowFile
-@RunWith(JUnit4.class)
class EncryptedSchemaRecordReaderWriterTest extends
AbstractTestRecordReaderWriter {
private static final Logger logger =
LoggerFactory.getLogger(EncryptedSchemaRecordReaderWriterTest.class)
private static final String KEY_HEX_128 =
"0123456789ABCDEFFEDCBA9876543210"
-private static final String KEY_HEX_256 = KEY_HEX_128 * 2
-private static final String KEY_HEX = isUnlimitedStrengthCryptoAvailable()
? KEY_HEX_256 : KEY_HEX_128
+private static final String KEY_HEX = KEY_HEX_128
private static final String KEY_ID = "K1"
private static final String TRANSIT_URI = "nifi://unit-test"
@@ -72,25 +63,12 @@ class EncryptedSchemaRecordReaderWriterTest extends
AbstractTestRecordReaderWrit
private static KeyProvider mockKeyProvider
private static ProvenanceEventEncryptor provenanceEventEncryptor = new
AESProvenanceEventEncryptor()
-@ClassRule
-public static TemporaryFolder tempFolder = new TemporaryFolder()
-
-private static String ORIGINAL_LOG_LEVEL
-
-@BeforeClass
+@BeforeAll
static void setUpOnce() throws Exception {
-ORIGINAL_L
[nifi] branch main updated: NIFI-9067 Upgraded JAXB Runtime from 2.3.0 to 2.3.5
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 f5a421c NIFI-9067 Upgraded JAXB Runtime from 2.3.0 to 2.3.5 f5a421c is described below commit f5a421ccb13e853d89f1fa3e648d49b62a19e3ed Author: exceptionfactory AuthorDate: Thu Aug 19 15:42:13 2021 -0500 NIFI-9067 Upgraded JAXB Runtime from 2.3.0 to 2.3.5 - Replaced old com.sun.xml.bind:jaxb-impl and jaxb-core with current org.glassfish.jaxb:jaxb-runtime - Replaced old javax.xml.bind:jaxb-api with current jakarta.xml.bind-api - Removed unnecessary dependency references to javax.activation-api This closes #5320 Signed-off-by: Mike Thomsen --- .../main/assembly/dependencies-windows-service.xml | 2 +- .../src/main/assembly/dependencies.xml | 2 +- nifi-assembly/NOTICE | 10 +++ nifi-assembly/pom.xml | 34 +++--- nifi-assembly/src/main/assembly/common.xml | 6 ++-- nifi-assembly/src/main/assembly/dependencies.xml | 6 ++-- nifi-assembly/src/main/assembly/ranger.xml | 6 ++-- nifi-commons/nifi-security-utils/pom.xml | 13 +++-- nifi-commons/nifi-site-to-site-client/pom.xml | 12 +++- nifi-commons/nifi-utils/pom.xml| 12 +++- .../nifi-kafka-connector-assembly/pom.xml | 22 -- .../src/main/assembly/dependencies.xml | 12 +++- .../src/main/assembly/dependencies.xml | 12 +++- .../nifi-kafka-connector/pom.xml | 23 --- .../nifi-beats-processors/pom.xml | 12 +++- .../nifi-database-utils/pom.xml| 12 +++- .../nifi-processor-utils/pom.xml | 12 +++- .../nifi-prometheus-utils/pom.xml | 12 +++- .../nifi-framework/nifi-authorizer/pom.xml | 12 +++- .../nifi-framework/nifi-client-dto/pom.xml | 12 +++- .../nifi-framework/nifi-file-authorizer/pom.xml| 12 +++- .../nifi-framework-cluster-protocol/pom.xml| 12 +++- .../nifi-framework/nifi-framework-cluster/pom.xml | 12 +++- .../nifi-framework/nifi-framework-core-api/pom.xml | 12 +++- .../nifi-framework/nifi-framework-core/pom.xml | 12 +++- .../nifi-framework/nifi-web/nifi-web-api/pom.xml | 12 +++- .../nifi-web/nifi-web-security/pom.xml | 12 +++- .../nifi-hdfs-processors/pom.xml | 12 +++- .../nifi-kafka-0-10-processors/pom.xml | 12 +++- .../nifi-kafka-0-11-processors/pom.xml | 12 +++- .../nifi-kafka-0-9-processors/pom.xml | 12 +++- .../nifi-kafka-1-0-processors/pom.xml | 12 +++- .../nifi-kafka-2-0-processors/pom.xml | 12 +++- .../nifi-kafka-2-6-processors/pom.xml | 12 +++- .../nifi-yandex-processors/pom.xml | 12 +++- .../nifi-lumberjack-processors/pom.xml | 12 +++- .../nifi-jolt-transform-json-ui/pom.xml| 12 +++- .../nifi-standard-processors/pom.xml | 12 +++- .../nifi-update-attribute-model/pom.xml| 12 +++- .../nifi-update-attribute-ui/pom.xml | 12 +++- .../src/main/resources/META-INF/NOTICE | 2 -- nifi-stateless/nifi-stateless-assembly/NOTICE | 12 nifi-stateless/nifi-stateless-assembly/pom.xml | 22 -- .../src/main/assembly/common.xml | 6 ++-- .../src/main/assembly/dependencies.xml | 6 ++-- .../nifi-stateless-system-test-suite/pom.xml | 26 + .../src/test/assembly/dependencies.xml | 12 +++- nifi-system-tests/nifi-system-test-suite/pom.xml | 23 --- .../src/test/assembly/dependencies.xml | 12 +++- nifi-toolkit/nifi-toolkit-admin/pom.xml| 12 +++- nifi-toolkit/nifi-toolkit-assembly/NOTICE | 15 +- nifi-toolkit/nifi-toolkit-assembly/pom.xml | 22 -- .../src/main/assembly/dependencies.xml | 12 +++- nifi-toolkit/pom.xml | 17 --- pom.xml| 21 ++--- 55 files changed, 244 insertions(+), 460 deletions(-) diff --git a/minifi/minifi-assembly/src/main/assembly/dependencies-windows-service.xml b/minifi/minifi-assembly/src/main/assembly/dependencies-windows-service.xml index 8e28643..7d390d3 100644 --- a/minifi/minifi-assembly/src/main/assembly/dependencies-windows-service.xml +++ b/minifi/minifi-assembly/src/main/assembly/dependencies-windows-service.xml @@ -43,7 +43,7 @@ swagger-annotations aspectjweaver
[nifi] branch main updated: NIFI-9137 Refactored nifi-parquet-processors using JUnit 5 NIFI-9138 Refactored nifi-pgp-bundle using JUnit 5 NIFI-9139 Refactored nifi-poi-bundle using JUnit 5 NIFI-9140 R
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 60b08cc NIFI-9137 Refactored nifi-parquet-processors using JUnit 5
NIFI-9138 Refactored nifi-pgp-bundle using JUnit 5 NIFI-9139 Refactored
nifi-poi-bundle using JUnit 5 NIFI-9140 Refactored nifi-prometheus-bundle using
JUnit 5
60b08cc is described below
commit 60b08cc5695da73496710e062ef2a8ac889700db
Author: exceptionfactory
AuthorDate: Fri Aug 27 07:33:34 2021 -0500
NIFI-9137 Refactored nifi-parquet-processors using JUnit 5
NIFI-9138 Refactored nifi-pgp-bundle using JUnit 5
NIFI-9139 Refactored nifi-poi-bundle using JUnit 5
NIFI-9140 Refactored nifi-prometheus-bundle using JUnit 5
This closes #5353
Signed-off-by: Mike Thomsen
---
.../org/apache/nifi/parquet/TestParquetReader.java | 47 +++---
.../nifi/parquet/TestParquetRecordSetWriter.java | 57 +++
.../nifi/processors/parquet/FetchParquetTest.java | 96 +--
.../nifi/processors/parquet/PutParquetTest.java| 101 ++--
.../parquet/TestConvertAvroToParquet.java | 88 --
.../nifi/processors/pgp/DecryptContentPGPTest.java | 18 +-
.../nifi/processors/pgp/EncryptContentPGPTest.java | 24 +--
.../standard/StandardPGPPrivateKeyServiceTest.java | 14 +-
.../standard/StandardPGPPublicKeyServiceTest.java | 15 +-
.../poi/ConvertExcelToCSVProcessorTest.java| 181 ++---
.../prometheus/PrometheusReportingTaskIT.java | 34 ++--
.../prometheus/TestPrometheusRecordSink.java | 28 +---
pom.xml| 10 ++
13 files changed, 325 insertions(+), 388 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/test/java/org/apache/nifi/parquet/TestParquetReader.java
b/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/test/java/org/apache/nifi/parquet/TestParquetReader.java
index f0db498..0fccd7d 100644
---
a/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/test/java/org/apache/nifi/parquet/TestParquetReader.java
+++
b/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/src/test/java/org/apache/nifi/parquet/TestParquetReader.java
@@ -20,7 +20,6 @@ import org.apache.avro.Schema;
import org.apache.avro.generic.GenericData;
import org.apache.avro.generic.GenericRecord;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.SystemUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.nifi.components.PropertyDescriptor;
@@ -35,10 +34,11 @@ import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.apache.parquet.avro.AvroParquetWriter;
import org.apache.parquet.hadoop.ParquetWriter;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.apache.parquet.hadoop.util.HadoopOutputFile;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -50,25 +50,22 @@ import java.nio.file.Paths;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@DisabledOnOs({ OS.WINDOWS })
public class TestParquetReader {
-private Map readerFactoryProperties;
-private ConfigurationContext readerFactoryConfigContext;
+private static final String PARQUET_PATH =
"src/test/resources/TestParquetReader.parquet";
+private static final String SCHEMA_PATH =
"src/test/resources/avro/user.avsc";
private ParquetReader parquetReaderFactory;
private ComponentLog componentLog;
-@BeforeClass
-public static void setUpSuite() {
-Assume.assumeTrue("Test only runs on *nix",
!SystemUtils.IS_OS_WINDOWS);
-}
-
-@Before
+@BeforeEach
public void setup() {
-readerFactoryProperties = new HashMap<>();
-readerFactoryConfigContext = new
MockConfigurationContext(readerFactoryProperties, null);
+Map readerFactoryProperties = new
HashMap<>();
+ConfigurationContext readerFactoryConfigContext = new
MockConfigurationContext(readerFactoryProperties, null);
parquetReaderFactory = new ParquetReader();
parquetReaderFactory.abstractStoreConfigContext(readerFactoryConfigContext);
@@ -78,7 +75,7 @@ public class TestParquetReader {
@Test
public void testReadUsers() throws IOException, MalformedRecordException {
-final Schema schema = getSchema("src/test/resources/avro/user.a
[nifi] branch main updated: NIFI-9172 fix Currency/Concurrency user guide typo
This is an automated email from the ASF dual-hosted git repository. mthomsen 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 ee7ca5d NIFI-9172 fix Currency/Concurrency user guide typo ee7ca5d is described below commit ee7ca5dcfd260ed502a82af7f19f7be870e29f7b Author: theBestAndrew AuthorDate: Fri Aug 27 12:13:24 2021 + NIFI-9172 fix Currency/Concurrency user guide typo This closes #5352 Signed-off-by: Mike Thomsen --- nifi-docs/src/main/asciidoc/user-guide.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-docs/src/main/asciidoc/user-guide.adoc b/nifi-docs/src/main/asciidoc/user-guide.adoc index 0316a0e..e7b398b 100644 --- a/nifi-docs/src/main/asciidoc/user-guide.adoc +++ b/nifi-docs/src/main/asciidoc/user-guide.adoc @@ -742,7 +742,7 @@ The next configuration element is the Process Group Parameter Context, which is The third element in the configuration dialog is the Process Group Comments. This provides a mechanism for providing any useful information or context about the Process Group. -The next two elements, Process Group FlowFile Currency and Process Group Outbound Policy, are covered in the following sections. +The next two elements, Process Group FlowFile Concurrency and Process Group Outbound Policy, are covered in the following sections. [[Flowfile_Concurrency]] = FlowFile Concurrency
[nifi] branch main updated: NIFI-5936: Added DROP provenance event to MockProcessSession.remove() to match real impl
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 5ff4974 NIFI-5936: Added DROP provenance event to
MockProcessSession.remove() to match real impl
5ff4974 is described below
commit 5ff4974b1fe742faa06fa3209466077fc27cf54d
Author: Matthew Burgess
AuthorDate: Tue Aug 10 16:11:20 2021 -0400
NIFI-5936: Added DROP provenance event to MockProcessSession.remove() to
match real impl
This closes #5302
Signed-off-by: Mike Thomsen
---
.../main/java/org/apache/nifi/util/MockProcessSession.java | 6 ++
.../apache/nifi/remote/TestStandardRemoteGroupPort.java| 14 --
.../protocol/http/TestHttpFlowFileServerProtocol.java | 12
.../org/apache/nifi/processors/hive/TestSelectHiveQL.java | 14 +-
.../org/apache/nifi/processors/hive/TestSelectHive3QL.java | 5 -
.../apache/nifi/processors/hive/TestSelectHive_1_1QL.java | 13 -
6 files changed, 43 insertions(+), 21 deletions(-)
diff --git
a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java
b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java
index ac56e61..a4a967b 100644
--- a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java
+++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java
@@ -690,6 +690,9 @@ public class MockProcessSession implements ProcessSession {
if (Objects.equals(ff.getId(), flowFile.getId())) {
penalizedItr.remove();
penalized.remove(ff);
+if (originalVersions.get(ff.getId()) != null) {
+provenanceReporter.drop(ff,
ff.getAttribute(CoreAttributes.DISCARD_REASON.key()));
+}
break;
}
}
@@ -702,6 +705,9 @@ public class MockProcessSession implements ProcessSession {
beingProcessed.remove(ffId);
removedFlowFiles.add(flowFile.getId());
currentVersions.remove(ffId);
+if (originalVersions.get(flowFile.getId()) != null) {
+provenanceReporter.drop(flowFile,
flowFile.getAttribute(CoreAttributes.DISCARD_REASON.key()));
+}
return;
}
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/java/org/apache/nifi/remote/TestStandardRemoteGroupPort.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/java/org/apache/nifi/remote/TestStandardRemoteGroupPort.java
index 15637da..f3ea7cd 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/java/org/apache/nifi/remote/TestStandardRemoteGroupPort.java
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/java/org/apache/nifi/remote/TestStandardRemoteGroupPort.java
@@ -166,7 +166,7 @@ public class TestStandardRemoteGroupPort {
// Assert provenance.
final List provenanceEvents =
sessionState.getProvenanceEvents();
-assertEquals(1, provenanceEvents.size());
+assertEquals(2, provenanceEvents.size());
final ProvenanceEventRecord provenanceEvent = provenanceEvents.get(0);
assertEquals(ProvenanceEventType.SEND, provenanceEvent.getEventType());
assertEquals("nifi://node1.example.com:9090/flowfile-uuid",
provenanceEvent.getTransitUri());
@@ -246,7 +246,7 @@ public class TestStandardRemoteGroupPort {
// Assert provenance.
final List provenanceEvents =
sessionState.getProvenanceEvents();
-assertEquals(1, provenanceEvents.size());
+assertEquals(2, provenanceEvents.size());
final ProvenanceEventRecord provenanceEvent = provenanceEvents.get(0);
assertEquals(ProvenanceEventType.SEND, provenanceEvent.getEventType());
assertEquals(flowFileEndpointUri, provenanceEvent.getTransitUri());
@@ -369,7 +369,8 @@ public class TestStandardRemoteGroupPort {
assertEquals(flowFiles.size(), totalPacketsSent.get());
assertEquals("The number of transactions should match as expected.",
expectedNumberOfPackets.length, sentPackets.size());
final List provenanceEvents =
sessionState.getProvenanceEvents();
-assertEquals(flowFiles.size(), provenanceEvents.size());
+// SEND and DROP events for each flowfile
+assertEquals(flowFiles.size() * 2, provenanceEvents.size());
int f = 0;
for (int i = 0; i < expectedNumberOfPackets.length; i++) {
@@ -383,11 +384,12 @@ public class TestStandardRemoteGroupPort {
final DataPacket dataPacket = dataPackets.get(p);
assertEquals(flowFile.getSize(), dataPacket.getSize());
-//
