[nifi-registry] branch main updated (3956e2a -> 146965d)
This is an automated email from the ASF dual-hosted git repository. kdoran pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi-registry.git. from 3956e2a NIFIREG-346 Upgrade JGit to latest 5.x version, and upgrade Bouncy Castle to be compatible with latest JGit add 146965d NIFIREG-418 - disable Travis build and update README file No new revisions were added by this update. Summary of changes: .travis-output-filters | 15 .travis.yml| 95 -- README.md | 10 -- 3 files changed, 7 insertions(+), 113 deletions(-) delete mode 100644 .travis-output-filters delete mode 100644 .travis.yml
[nifi-registry] branch main updated (3956e2a -> 146965d)
This is an automated email from the ASF dual-hosted git repository. kdoran pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi-registry.git. from 3956e2a NIFIREG-346 Upgrade JGit to latest 5.x version, and upgrade Bouncy Castle to be compatible with latest JGit add 146965d NIFIREG-418 - disable Travis build and update README file No new revisions were added by this update. Summary of changes: .travis-output-filters | 15 .travis.yml| 95 -- README.md | 10 -- 3 files changed, 7 insertions(+), 113 deletions(-) delete mode 100644 .travis-output-filters delete mode 100644 .travis.yml
[nifi] branch main updated: NIFI-7800: Provide an option to omit XML declaration for XMLRecordSetWriter
This is an automated email from the ASF dual-hosted git repository.
mattyb149 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 fd8b0b2 NIFI-7800: Provide an option to omit XML declaration for
XMLRecordSetWriter
fd8b0b2 is described below
commit fd8b0b286fbb83cfdba3a24b2a3e6f647cf395bf
Author: Mohammed Nadeem
AuthorDate: Fri Sep 11 03:32:50 2020 +0530
NIFI-7800: Provide an option to omit XML declaration for XMLRecordSetWriter
NIFI-7800: Mark new property as required
Signed-off-by: Matthew Burgess
This closes #4520
---
.../java/org/apache/nifi/xml/WriteXMLResult.java | 9 +-
.../org/apache/nifi/xml/XMLRecordSetWriter.java| 14 +-
.../org/apache/nifi/xml/TestWriteXMLResult.java| 150 +
3 files changed, 111 insertions(+), 62 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/xml/WriteXMLResult.java
b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/xml/WriteXMLResult.java
index 8b4710b..6f5abc8 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/xml/WriteXMLResult.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/xml/WriteXMLResult.java
@@ -60,6 +60,7 @@ public class WriteXMLResult extends AbstractRecordSetWriter
implements RecordSet
private final SchemaAccessWriter schemaAccess;
private final XMLStreamWriter writer;
private final NullSuppression nullSuppression;
+private final boolean omitDeclaration;
private final ArrayWrapping arrayWrapping;
private final String arrayTagName;
private final String recordTagName;
@@ -71,7 +72,7 @@ public class WriteXMLResult extends AbstractRecordSetWriter
implements RecordSet
private final Supplier LAZY_TIME_FORMAT;
private final Supplier LAZY_TIMESTAMP_FORMAT;
-public WriteXMLResult(final RecordSchema recordSchema, final
SchemaAccessWriter schemaAccess, final OutputStream out, final boolean
prettyPrint,
+public WriteXMLResult(final RecordSchema recordSchema, final
SchemaAccessWriter schemaAccess, final OutputStream out, final boolean
prettyPrint, final boolean omitDeclaration,
final NullSuppression nullSuppression, final
ArrayWrapping arrayWrapping, final String arrayTagName, final String
rootTagName, final String recordTagName,
final String charSet, final String dateFormat, final
String timeFormat, final String timestampFormat) throws IOException {
@@ -81,6 +82,8 @@ public class WriteXMLResult extends AbstractRecordSetWriter
implements RecordSet
this.schemaAccess = schemaAccess;
this.nullSuppression = nullSuppression;
+this.omitDeclaration = omitDeclaration;
+
this.arrayWrapping = arrayWrapping;
this.arrayTagName = arrayTagName;
@@ -131,7 +134,9 @@ public class WriteXMLResult extends AbstractRecordSetWriter
implements RecordSet
schemaAccess.writeHeader(recordSchema, out);
try {
-writer.writeStartDocument();
+if (!omitDeclaration) {
+writer.writeStartDocument();
+}
if (allowWritingMultipleRecords) {
writer.writeStartElement(rootTagName);
diff --git
a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/xml/XMLRecordSetWriter.java
b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/xml/XMLRecordSetWriter.java
index 6ad7006..bef9dec 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/xml/XMLRecordSetWriter.java
+++
b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/xml/XMLRecordSetWriter.java
@@ -80,6 +80,16 @@ public class XMLRecordSetWriter extends
DateTimeTextRecordSetWriter implements R
.required(true)
.build();
+public static final PropertyDescriptor OMIT_XML_DECLARATION = new
PropertyDescriptor.Builder()
+.name("omit_xml_declaration")
+.displayName("Omit XML Declaration")
+.description("Specifies whether or not to include XML declaration")
+.expressionLanguageSupported(ExpressionLanguageScope.NONE)
+
[nifi-registry] branch main updated: NIFIREG-346 Upgrade JGit to latest 5.x version, and upgrade Bouncy Castle to be compatible with latest JGit
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git
The following commit(s) were added to refs/heads/main by this push:
new 3956e2a NIFIREG-346 Upgrade JGit to latest 5.x version, and upgrade
Bouncy Castle to be compatible with latest JGit
3956e2a is described below
commit 3956e2a00d64f8c9f4ee4ce38150b957d07e1fdc
Author: Bryan Bende
AuthorDate: Tue Aug 11 16:38:21 2020 -0400
NIFIREG-346 Upgrade JGit to latest 5.x version, and upgrade Bouncy Castle
to be compatible with latest JGit
Signed-off-by: Pierre Villard
This closes #295.
---
nifi-registry-core/nifi-registry-framework/pom.xml | 27 +++---
.../provider/flow/git/GitFlowMetaData.java | 1 +
.../nifi-registry-properties/pom.xml | 2 +-
.../nifi-registry-security-utils/pom.xml | 24 +--
pom.xml| 2 ++
5 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/nifi-registry-core/nifi-registry-framework/pom.xml
b/nifi-registry-core/nifi-registry-framework/pom.xml
index e23a9b4..f82777d 100644
--- a/nifi-registry-core/nifi-registry-framework/pom.xml
+++ b/nifi-registry-core/nifi-registry-framework/pom.xml
@@ -242,7 +242,13 @@
org.bouncycastle
bcprov-jdk15on
-1.61
+${bouncycastle.version}
+
+
+
+org.bouncycastle
+bcpg-jdk15on
+${bouncycastle.version}
commons-io
@@ -300,7 +306,17 @@
org.eclipse.jgit
org.eclipse.jgit
-4.11.9.201909030838-r
+${jgit.version}
+
+
+org.eclipse.jgit
+org.eclipse.jgit.gpg.bc
+${jgit.version}
+
+
+org.eclipse.jgit
+org.eclipse.jgit.ssh.apache
+${jgit.version}
commons-codec
@@ -390,12 +406,7 @@
2.0.0-M24
test
-
-org.apache.nifi.registry
-nifi-registry-flow-diff
-0.8.0-SNAPSHOT
-
-
+
diff --git
a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/flow/git/GitFlowMetaData.java
b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/flow/git/GitFlowMetaData.java
index 6a972af..8ed146d 100644
---
a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/flow/git/GitFlowMetaData.java
+++
b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/provider/flow/git/GitFlowMetaData.java
@@ -480,6 +480,7 @@ class GitFlowMetaData {
: format("%s\n\nBy NiFi Registry user: %s", message,
author);
final RevCommit commit = git.commit()
.setMessage(commitMessage)
+.setSign(false)
.call();
if (flowPointer != null) {
diff --git a/nifi-registry-core/nifi-registry-properties/pom.xml
b/nifi-registry-core/nifi-registry-properties/pom.xml
index fb4d4cf..598c623 100644
--- a/nifi-registry-core/nifi-registry-properties/pom.xml
+++ b/nifi-registry-core/nifi-registry-properties/pom.xml
@@ -49,7 +49,7 @@
org.bouncycastle
bcprov-jdk15on
-1.61
+${bouncycastle.version}
org.codehaus.groovy
diff --git a/nifi-registry-core/nifi-registry-security-utils/pom.xml
b/nifi-registry-core/nifi-registry-security-utils/pom.xml
index 58eb697..a109557 100644
--- a/nifi-registry-core/nifi-registry-security-utils/pom.xml
+++ b/nifi-registry-core/nifi-registry-security-utils/pom.xml
@@ -1,13 +1,13 @@
-
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
@@ -16,7 +16,7 @@
nifi-registry-core
0.8.0-SNAPSHOT
-
+
nifi-registry-security-utils
jar
@@ -26,12 +26,12 @@
org.bouncycastle
bcprov-jdk15on
-1.61
+${bouncycastle.version}
org.bouncycastle
bcpkix-jdk15on
-1.61
+${bouncycastle.version}
org.apache.commons
diff --git a/pom.xml b/pom.xml
index 3a25b4c..eaca791 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,6 +107,8 @@
2.5.4
3.4.0-01
2.3.2
+5.8.1.202007141445-r
+1.66
[nifi-registry] branch main updated: NIFIREG-414 Add groupId and artifactId to BundleVersionMetadata
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git
The following commit(s) were added to refs/heads/main by this push:
new ec90906 NIFIREG-414 Add groupId and artifactId to
BundleVersionMetadata
ec90906 is described below
commit ec909061c8fc58650a24a9f58a2c5c4f65a41083
Author: Bryan Bende
AuthorDate: Wed Sep 2 11:22:16 2020 -0400
NIFIREG-414 Add groupId and artifactId to BundleVersionMetadata
Signed-off-by: Pierre Villard
This closes #298.
---
.../extension/bundle/BundleVersionMetadata.java| 22 ++
.../nifi/registry/db/DatabaseMetadataService.java | 4 +++-
.../registry/db/entity/BundleVersionEntity.java| 20
.../db/mapper/BundleVersionEntityRowMapper.java| 2 ++
.../registry/service/mapper/ExtensionMappings.java | 2 ++
.../registry/db/TestDatabaseMetadataService.java | 5 +
.../web/api/UnsecuredNiFiRegistryClientIT.java | 6 ++
7 files changed, 60 insertions(+), 1 deletion(-)
diff --git
a/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/bundle/BundleVersionMetadata.java
b/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/bundle/BundleVersionMetadata.java
index 39402d2..474d1e8 100644
---
a/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/bundle/BundleVersionMetadata.java
+++
b/nifi-registry-core/nifi-registry-data-model/src/main/java/org/apache/nifi/registry/extension/bundle/BundleVersionMetadata.java
@@ -40,6 +40,12 @@ public class BundleVersionMetadata extends LinkableEntity
implements Comparable<
@NotBlank
private String bucketId;
+// read-only, populated on response
+private String groupId;
+
+// read-only, populated on response
+private String artifactId;
+
@NotBlank
private String version;
@@ -96,6 +102,22 @@ public class BundleVersionMetadata extends LinkableEntity
implements Comparable<
this.bucketId = bucketId;
}
+public String getGroupId() {
+return groupId;
+}
+
+public void setGroupId(String groupId) {
+this.groupId = groupId;
+}
+
+public String getArtifactId() {
+return artifactId;
+}
+
+public void setArtifactId(String artifactId) {
+this.artifactId = artifactId;
+}
+
@ApiModelProperty(value = "The version of the extension bundle")
public String getVersion() {
return version;
diff --git
a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/DatabaseMetadataService.java
b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/DatabaseMetadataService.java
index 63a4bd1..ed5a2fb 100644
---
a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/DatabaseMetadataService.java
+++
b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/DatabaseMetadataService.java
@@ -701,7 +701,9 @@ public class DatabaseMetadataService implements
MetadataService {
"ebv.build_revision AS BUILD_REVISION, " +
"ebv.built AS BUILT, " +
"ebv.built_by AS BUILT_BY, " +
-"eb.bucket_id AS BUCKET_ID " +
+"eb.bucket_id AS BUCKET_ID, " +
+"eb.group_id AS GROUP_ID, " +
+"eb.artifact_id AS ARTIFACT_ID " +
"FROM BUNDLE eb, BUNDLE_VERSION ebv " +
"WHERE eb.id = ebv.bundle_id ";
diff --git
a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/entity/BundleVersionEntity.java
b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/entity/BundleVersionEntity.java
index b87320b..35a23a2 100644
---
a/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/entity/BundleVersionEntity.java
+++
b/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/entity/BundleVersionEntity.java
@@ -29,6 +29,10 @@ public class BundleVersionEntity {
// The bucket id where the bundle is located
private String bucketId;
+// The group and artifact id for the bundle this version belongs to
+private String groupId;
+private String artifactId;
+
// The version of this bundle
private String version;
@@ -85,6 +89,22 @@ public class BundleVersionEntity {
this.bucketId = bucketId;
}
+public String getGroupId() {
+return groupId;
+}
+
+public void setGroupId(String groupId) {
+this.groupId = groupId;
+}
+
+public String getArtifactId() {
+return artifactId;
+}
+
+public void setArtifactId(String artifactId) {
+this.artifactId = artifactId;
+}
+
publ
[nifi-registry] branch main updated: NIFIREG-417 Upgrade to apache ranger 2.1.0 client
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git
The following commit(s) were added to refs/heads/main by this push:
new c88f227 NIFIREG-417 Upgrade to apache ranger 2.1.0 client
c88f227 is described below
commit c88f2278f2390afb99b2284db7bba0f4e4a9a9b8
Author: Bryan Bende
AuthorDate: Thu Sep 10 11:13:12 2020 -0400
NIFIREG-417 Upgrade to apache ranger 2.1.0 client
Signed-off-by: Pierre Villard
This closes #300.
---
.../nifi-registry-ranger-plugin/pom.xml | 2 +-
.../nifi/registry/ranger/RangerAuthorizer.java | 21 +
.../nifi/registry/ranger/TestRangerAuthorizer.java | 5 +
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git
a/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
b/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
index f66ee6d..7c20426 100644
---
a/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
+++
b/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml
@@ -25,7 +25,7 @@
jar
-2.0.0
+2.1.0
3.1.1
diff --git
a/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/src/main/java/org/apache/nifi/registry/ranger/RangerAuthorizer.java
b/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/src/main/java/org/apache/nifi/registry/ranger/RangerAuthorizer.java
index 05582b6..6fa6fe2 100644
---
a/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/src/main/java/org/apache/nifi/registry/ranger/RangerAuthorizer.java
+++
b/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/src/main/java/org/apache/nifi/registry/ranger/RangerAuthorizer.java
@@ -41,6 +41,7 @@ import
org.apache.nifi.registry.security.exception.SecurityProviderCreationExcep
import org.apache.nifi.registry.util.PropertyValue;
import org.apache.ranger.audit.model.AuthzAuditEvent;
import org.apache.ranger.authorization.hadoop.config.RangerConfiguration;
+import org.apache.ranger.authorization.hadoop.config.RangerPluginConfig;
import org.apache.ranger.plugin.audit.RangerDefaultAuditHandler;
import org.apache.ranger.plugin.policyengine.RangerAccessRequestImpl;
import org.apache.ranger.plugin.policyengine.RangerAccessResourceImpl;
@@ -132,11 +133,18 @@ public class RangerAuthorizer implements
ManagedAuthorizer, AuthorizationAuditor
if (rangerPlugin == null) {
logger.info("initializing base plugin");
+final String serviceType =
getConfigValue(configurationContext, RANGER_SERVICE_TYPE_PROP,
DEFAULT_SERVICE_TYPE);
+final String appId = getConfigValue(configurationContext,
RANGER_APP_ID_PROP, DEFAULT_APP_ID);
+
+rangerPlugin = createRangerBasePlugin(serviceType, appId);
+
+final RangerPluginConfig pluginConfig =
rangerPlugin.getConfig();
+
final PropertyValue securityConfigValue =
configurationContext.getProperty(RANGER_SECURITY_PATH_PROP);
-addRequiredResource(RANGER_SECURITY_PATH_PROP,
securityConfigValue);
+addRequiredResource(RANGER_SECURITY_PATH_PROP,
securityConfigValue, pluginConfig);
final PropertyValue auditConfigValue =
configurationContext.getProperty(RANGER_AUDIT_PATH_PROP);
-addRequiredResource(RANGER_AUDIT_PATH_PROP, auditConfigValue);
+addRequiredResource(RANGER_AUDIT_PATH_PROP, auditConfigValue,
pluginConfig);
boolean rangerKerberosEnabled =
Boolean.valueOf(getConfigValue(configurationContext,
RANGER_KERBEROS_ENABLED_PROP, Boolean.FALSE.toString()));
@@ -158,10 +166,6 @@ public class RangerAuthorizer implements
ManagedAuthorizer, AuthorizationAuditor
UserGroupInformation.loginUserFromKeytab(registryPrincipal.trim(),
registryKeytab.trim());
}
-final String serviceType =
getConfigValue(configurationContext, RANGER_SERVICE_TYPE_PROP,
DEFAULT_SERVICE_TYPE);
-final String appId = getConfigValue(configurationContext,
RANGER_APP_ID_PROP, DEFAULT_APP_ID);
-
-rangerPlugin = createRangerBasePlugin(serviceType, appId);
rangerPlugin.init();
defaultAuditHandler = new RangerDefaultAuditHandler();
@@ -287,8 +291,9 @@ public class RangerAuthorizer implements ManagedAuthorizer,
AuthorizationAuditor
*
* @param name the name of the given PropertyValue from the
AuthorizationConfigurationContext
* @param resourceValue the value for the given name, should be a full
path to a file
+ * @param configuration the RangerConfiguration to add the resource to
*/
-private void addRequiredResour
[nifi] branch main updated: NIFI-7798 Upgrade to apache ranger 2.1.0 client
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 f6d6e4a NIFI-7798 Upgrade to apache ranger 2.1.0 client
f6d6e4a is described below
commit f6d6e4adc9c58f1b9120f3f5b2f605587a0e6599
Author: Bryan Bende
AuthorDate: Thu Sep 10 10:59:16 2020 -0400
NIFI-7798 Upgrade to apache ranger 2.1.0 client
Signed-off-by: Pierre Villard
This closes #4518.
---
nifi-assembly/pom.xml | 5
nifi-assembly/src/main/assembly/ranger.xml | 3 +--
.../ranger/authorization/RangerNiFiAuthorizer.java | 21 +---
.../authorization/ManagedRangerAuthorizerTest.java | 28 +-
.../authorization/TestRangerNiFiAuthorizer.java| 9 +++
.../nifi-ranger-resources/pom.xml | 18 ++
pom.xml| 2 +-
7 files changed, 69 insertions(+), 17 deletions(-)
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 2cfb2e4..38fa5b4 100644
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -1298,11 +1298,6 @@ language governing permissions and limitations under the
License. -->
nar
-org.apache.ranger
-credentialbuilder
-${ranger.version}
-
-
org.apache.nifi
nifi-ranger-resources
1.13.0-SNAPSHOT
diff --git a/nifi-assembly/src/main/assembly/ranger.xml
b/nifi-assembly/src/main/assembly/ranger.xml
index 111d4d33..8b28191 100644
--- a/nifi-assembly/src/main/assembly/ranger.xml
+++ b/nifi-assembly/src/main/assembly/ranger.xml
@@ -40,7 +40,6 @@
nifi-bootstrap
nifi-resources
nifi-docs
-org.apache.ranger:credentialbuilder:jar
org.apache.nifi:nifi-ranger-resources:jar
@@ -61,7 +60,7 @@
0660
true
-org.apache.ranger:credentialbuilder:jar
+org.apache.nifi:nifi-ranger-resources:jar
org.slf4j:slf4j-api
diff --git
a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/src/main/java/org/apache/nifi/ranger/authorization/RangerNiFiAuthorizer.java
b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/src/main/java/org/apache/nifi/ranger/authorization/RangerNiFiAuthorizer.java
index a49887b..4428f38 100644
---
a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/src/main/java/org/apache/nifi/ranger/authorization/RangerNiFiAuthorizer.java
+++
b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/src/main/java/org/apache/nifi/ranger/authorization/RangerNiFiAuthorizer.java
@@ -36,6 +36,7 @@ import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.util.NiFiProperties;
import org.apache.ranger.audit.model.AuthzAuditEvent;
import org.apache.ranger.authorization.hadoop.config.RangerConfiguration;
+import org.apache.ranger.authorization.hadoop.config.RangerPluginConfig;
import org.apache.ranger.plugin.audit.RangerDefaultAuditHandler;
import org.apache.ranger.plugin.policyengine.RangerAccessRequestImpl;
import org.apache.ranger.plugin.policyengine.RangerAccessResourceImpl;
@@ -90,11 +91,18 @@ public class RangerNiFiAuthorizer implements Authorizer,
AuthorizationAuditor {
if (nifiPlugin == null) {
logger.info("RangerNiFiAuthorizer(): initializing base
plugin");
+final String serviceType =
getConfigValue(configurationContext, RANGER_SERVICE_TYPE_PROP,
DEFAULT_SERVICE_TYPE);
+final String appId = getConfigValue(configurationContext,
RANGER_APP_ID_PROP, DEFAULT_APP_ID);
+
+nifiPlugin = createRangerBasePlugin(serviceType, appId);
+
+final RangerPluginConfig pluginConfig = nifiPlugin.getConfig();
+
final PropertyValue securityConfigValue =
configurationContext.getProperty(RANGER_SECURITY_PATH_PROP);
-addRequiredResource(RANGER_SECURITY_PATH_PROP,
securityConfigValue);
+addRequiredResource(RANGER_SECURITY_PATH_PROP,
securityConfigValue, pluginConfig);
final PropertyValue auditConfigValue =
configurationContext.getProperty(RANGER_AUDIT_PATH_PROP);
-addRequiredResource(RANGER_AUDIT_PATH_PROP, auditConfigValue);
+addRequiredResource(RANGER_AUDIT_PATH_PROP, auditConfigValue,
pluginConfig);
final String rangerKerberosEnabledValue =
getConfigValue(configurationContext, RANGER_KERBEROS_ENABLED_PROP,
Boolean.FALSE.toString());
rangerKerberosEnabled =
rangerKerberosEnabledValue.equals(Boolean.TRUE.toString()) ? true
[nifi] branch main updated: NIFI-7759: Minor misspelling in rollover help for 'Stream When Available' process group configuration
This is an automated email from the ASF dual-hosted git repository.
pvillard 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 6b34a8b NIFI-7759: Minor misspelling in rollover help for 'Stream
When Available' process group configuration
6b34a8b is described below
commit 6b34a8b36e18b94732adcfe7b5ef19b30e4fd1f0
Author: Mohammed Nadeem
AuthorDate: Fri Sep 11 04:02:56 2020 +0530
NIFI-7759: Minor misspelling in rollover help for 'Stream When Available'
process group configuration
Signed-off-by: Pierre Villard
This closes #4521.
---
.../src/main/webapp/js/nf/canvas/nf-process-group-configuration.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js
index e494be9..ac27636 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js
@@ -241,7 +241,7 @@
options: [{
text: 'Stream When Available',
value: 'STREAM_WHEN_AVAILABLE',
-description: 'FlowFiles that are queued up to
be transferred out of a ProcessGroup by an Output Port will be transferred out '
+description: 'FlowFiles that are queued up to
be transferred out of a Process Group by an Output Port will be transferred out
'
+ 'of the Process Group as soon as
they are available.'
}, {
text: 'Batch Output',
[jira] [Created] (MINIFI-540) Write nifi.kerberos.krb5.file to nifi.properties
Javi Roman created MINIFI-540: - Summary: Write nifi.kerberos.krb5.file to nifi.properties Key: MINIFI-540 URL: https://issues.apache.org/jira/browse/MINIFI-540 Project: Apache NiFi MiNiFi Issue Type: New Feature Components: Processing Configuration Affects Versions: 0.5.0 Reporter: Javi Roman Fix For: 0.6.0 Add System Properties -> Kerberos Properties for adding (at least) the krb5.conf file for using in processors such as GetHDFSEvents. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[nifi-minifi-cpp] branch main updated (e99d31a -> ab57c5e)
This is an automated email from the ASF dual-hosted git repository. aboda pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git. from e99d31a MINIFICPP-1104 Add SSL docker tests for PublishKafka and automate them in CI add ab57c5e MINIFICPP-1366 - CWEL fails to receive timezone information in case the current timezone has no DST dates No new revisions were added by this update. Summary of changes: extensions/windows-event-log/ConsumeWindowsEventLog.cpp | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-)
