[jira] [Resolved] (MINIFI-502) Update the Windows commons daemon download URL
[ https://issues.apache.org/jira/browse/MINIFI-502?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Aldrin Piri resolved MINIFI-502. Resolution: Done > Update the Windows commons daemon download URL > -- > > Key: MINIFI-502 > URL: https://issues.apache.org/jira/browse/MINIFI-502 > Project: Apache NiFi MiNiFi > Issue Type: Improvement > Components: Build >Reporter: Jeff Zemerick >Priority: Major > > Update the URL of the Windows commons daemon zip in minifi-assembly/pom.xml. > It is currently set to > [https://apache.claz.org/commons/daemon/binaries/windows/commons-daemon-1.1.0-bin-windows.zip] > and it is not 100% reliable and often causes the build on Windows to fail. > Change the URL to > [https://www.apache.org/dist/commons/daemon/binaries/windows/commons-daemon-1.1.0-bin-windows.zip.] > -- This message was sent by Atlassian JIRA (v7.6.14#76016)
[jira] [Commented] (MINIFI-502) Update the Windows commons daemon download URL
[ https://issues.apache.org/jira/browse/MINIFI-502?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16883275#comment-16883275 ] Aldrin Piri commented on MINIFI-502: Didn't see this one when reviewing the other items but we have addressed the versioning issue. As highlighted in the one PR comment (https://github.com/apache/nifi-minifi/pull/157#discussion_r301612041) I don't think using the dist offering of things for wide consumption would be suggested by INFRA. I am going to close this for those reasons but please let me know if you have a different perspective on those matters. > Update the Windows commons daemon download URL > -- > > Key: MINIFI-502 > URL: https://issues.apache.org/jira/browse/MINIFI-502 > Project: Apache NiFi MiNiFi > Issue Type: Improvement > Components: Build >Reporter: Jeff Zemerick >Priority: Major > > Update the URL of the Windows commons daemon zip in minifi-assembly/pom.xml. > It is currently set to > [https://apache.claz.org/commons/daemon/binaries/windows/commons-daemon-1.1.0-bin-windows.zip] > and it is not 100% reliable and often causes the build on Windows to fail. > Change the URL to > [https://www.apache.org/dist/commons/daemon/binaries/windows/commons-daemon-1.1.0-bin-windows.zip.] > -- This message was sent by Atlassian JIRA (v7.6.14#76016)
[nifi-minifi] branch master updated: MINIFI-501 Provide the ability to specify security and sensitive properties in bootstrap.conf instead of the config.yml
This is an automated email from the ASF dual-hosted git repository. aldrin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nifi-minifi.git The following commit(s) were added to refs/heads/master by this push: new f50d3f7 MINIFI-501 Provide the ability to specify security and sensitive properties in bootstrap.conf instead of the config.yml f50d3f7 is described below commit f50d3f7c36e18d19eba76a7524ac2dffec61ce68 Author: Aldrin Piri AuthorDate: Thu Jun 20 08:16:20 2019 -0400 MINIFI-501 Provide the ability to specify security and sensitive properties in bootstrap.conf instead of the config.yml Correct wrong usage of keyPasswd instead of keystorePasswd when creating the statically defined SSL-Context-Service Update nifi version This closes #155. --- .../apache/nifi/minifi/bootstrap/RunMiNiFi.java| 90 - .../minifi/bootstrap/util/ConfigTransformer.java | 25 - .../nifi/minifi/bootstrap/RunMiNiFiTest.java | 102 .../bootstrap/util/ConfigTransformerTest.java | 66 +++-- .../bootstrap-ssl-ctx/bootstrap.conf.configured| 24 - .../bootstrap.conf.configured.invalid | 24 - .../bootstrap-ssl-ctx/bootstrap.conf.default | 24 - .../test/resources/bootstrap-ssl-ctx/config.yml| 107 + .../src/main/markdown/System_Admin_Guide.md| 30 ++ .../src/main/resources/conf/bootstrap.conf | 16 +++ 10 files changed, 459 insertions(+), 49 deletions(-) diff --git a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/RunMiNiFi.java b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/RunMiNiFi.java index edc1f22..e7ac3ed 100644 --- a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/RunMiNiFi.java +++ b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/RunMiNiFi.java @@ -23,6 +23,9 @@ import org.apache.nifi.minifi.bootstrap.configuration.ConfigurationChangeExcepti import org.apache.nifi.minifi.bootstrap.configuration.ConfigurationChangeListener; import org.apache.nifi.minifi.bootstrap.status.PeriodicStatusReporter; import org.apache.nifi.minifi.bootstrap.util.ConfigTransformer; +import org.apache.nifi.minifi.commons.schema.SecurityPropertiesSchema; +import org.apache.nifi.minifi.commons.schema.SensitivePropsSchema; +import org.apache.nifi.minifi.commons.schema.common.CommonPropertyKeys; import org.apache.nifi.minifi.commons.status.FlowStatusReport; import org.apache.nifi.util.Tuple; import org.apache.nifi.util.file.FileUtils; @@ -65,6 +68,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Optional; import java.util.Properties; import java.util.Set; import java.util.concurrent.ExecutorService; @@ -133,6 +137,59 @@ public class RunMiNiFi implements QueryableStatusAggregator, ConfigurationFileHo public static final String STATUS_REPORTER_PROPERTY_PREFIX = "nifi.minifi.status.reporter"; public static final String STATUS_REPORTER_COMPONENTS_KEY = STATUS_REPORTER_PROPERTY_PREFIX + ".components"; + +public static final String SECURITY_KEYSTORE_KEY = "nifi.minifi.security.keystore"; +public static final String SECURITY_KEYSTORE_TYPE_KEY = "nifi.minifi.security.keystoreType"; +public static final String SECURITY_KEYSTORE_PASSWORD_KEY = "nifi.minifi.security.keystorePasswd"; +public static final String SECURITY_KEY_PASSWORD_KEY = "nifi.minifi.security.keyPasswd"; +public static final String SECURITY_TRUSTSTORE_KEY = "nifi.minifi.security.truststore"; +public static final String SECURITY_TRUSTSTORE_TYPE_KEY = "nifi.minifi.security.truststoreType"; +public static final String SECURITY_TRUSTSTORE_PASSWORD_KEY = "nifi.minifi.security.truststorePasswd"; +public static final String SECURITY_SSL_PROTOCOL_KEY = "nifi.minifi.security.ssl.protocol"; + +public static final String SENSITIVE_PROPS_KEY_KEY = "nifi.minifi.sensitive.props.key"; +public static final String SENSITIVE_PROPS_ALGORITHM_KEY = "nifi.minifi.sensitive.props.algorithm"; +public static final String SENSITIVE_PROPS_PROVIDER_KEY = "nifi.minifi.sensitive.props.provider"; + +public static final Set BOOTSTRAP_SECURITY_PROPERTY_KEYS = new HashSet<>( +Arrays.asList(SECURITY_KEYSTORE_KEY, +SECURITY_KEYSTORE_TYPE_KEY, +SECURITY_KEYSTORE_PASSWORD_KEY, +SECURITY_KEY_PASSWORD_KEY, +SECURITY_TRUSTSTORE_KEY, +SECURITY_TRUSTSTORE_TYPE_KEY, +SECURITY_TRUSTSTORE_PASSWORD_KEY, +SECURITY_SSL_PROTOCOL_KEY)); + +public static final Set BOOTSTRAP_SENSITIVE_PROPERTY_KEYS = new HashSet<>( +Arrays.asList( +SENSITIVE_PROPS_KEY_KEY, +
[nifi-minifi] branch master updated: MINIFI-162 Capture build properties in a build.properties located in conf
This is an automated email from the ASF dual-hosted git repository.
aldrin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi.git
The following commit(s) were added to refs/heads/master by this push:
new 9bf85cf MINIFI-162 Capture build properties in a build.properties
located in conf
9bf85cf is described below
commit 9bf85cf40bd38d5ed0a20fcb5a9130b3e1062d7e
Author: Aldrin Piri
AuthorDate: Fri May 31 10:50:19 2019 -0400
MINIFI-162 Capture build properties in a build.properties located in conf
This closes #153.
---
minifi-assembly/pom.xml| 23
minifi-assembly/src/main/assembly/dependencies.xml | 7 +
.../src/main/resources/build.properties.template | 31 ++
3 files changed, 61 insertions(+)
diff --git a/minifi-assembly/pom.xml b/minifi-assembly/pom.xml
index 2008865..e7b8928 100644
--- a/minifi-assembly/pom.xml
+++ b/minifi-assembly/pom.xml
@@ -28,6 +28,29 @@ limitations under the License.
+org.codehaus.mojo
+buildnumber-maven-plugin
+1.4
+true
+
+
+validate
+
+create
+
+
+
+
+false
+false
+7
+true
+
+
buildRevision
+buildBranch
+
+
+
org.apache.maven.plugins
maven-antrun-plugin
diff --git a/minifi-assembly/src/main/assembly/dependencies.xml
b/minifi-assembly/src/main/assembly/dependencies.xml
index e588b8a..6ae5411 100644
--- a/minifi-assembly/src/main/assembly/dependencies.xml
+++ b/minifi-assembly/src/main/assembly/dependencies.xml
@@ -136,6 +136,13 @@
+src/main/resources/build.properties.template
+./
+build.properties
+0444
+true
+
+
./target/minifi.exe
./bin
false
diff --git a/minifi-assembly/src/main/resources/build.properties.template
b/minifi-assembly/src/main/resources/build.properties.template
new file mode 100644
index 000..6197a6e
--- /dev/null
+++ b/minifi-assembly/src/main/resources/build.properties.template
@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# NOTE: This file is autogenerated at build and is not intended to be edited.
Changes could cause inconsistent behavior.
+
+Build-Branch:${buildBranch}
+Build-Timestamp:${timestamp}
+Built-By:${user.name}
+MiNiFi-Version:${project.version}
+Build-Revision:${buildRevision}
+Maven-Home:${maven.home}
+Maven-Version:${maven.version}
+Created-By:${maven.build.version}
+Build-Java-Home:${java.home}
+Build-Jdk:${java.version}
+Build-Jdk-Vendor:${java.vendor}
+Build-Arch:${os.arch}
+Build-Os:${os.name}
+Build-Os-Version:${os.version}
[jira] [Created] (MINIFI-506) Change minifi-assembly antrun "tasks" tags to "target"
Aldrin Piri created MINIFI-506: -- Summary: Change minifi-assembly antrun "tasks" tags to "target" Key: MINIFI-506 URL: https://issues.apache.org/jira/browse/MINIFI-506 Project: Apache NiFi MiNiFi Issue Type: Improvement Components: Build Reporter: Aldrin Piri Assignee: Aldrin Piri Fix For: 0.6.0 "tasks" is deprecated as per the plugin. [WARNING] Parameter tasks is deprecated, use target instead -- This message was sent by Atlassian JIRA (v7.6.14#76016)
[nifi-minifi] branch master updated: MINIFI-504 Upgrade commons-daemon & fix the build
This is an automated email from the ASF dual-hosted git repository.
aldrin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi.git
The following commit(s) were added to refs/heads/master by this push:
new dd9c1b8 MINIFI-504 Upgrade commons-daemon & fix the build
dd9c1b8 is described below
commit dd9c1b824426850fad892125e64c56b27b595d88
Author: Nenad V. Nikolić
AuthorDate: Tue Jul 9 18:44:30 2019 +0200
MINIFI-504 Upgrade commons-daemon & fix the build
Upgrade commons-daemon to 1.2.0 and introduce property to avoid filename
repetition during later upgrades.
This closes #161.
Signed-off-by: Aldrin Piri
---
minifi-assembly/pom.xml | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/minifi-assembly/pom.xml b/minifi-assembly/pom.xml
index efb35bb..2008865 100644
--- a/minifi-assembly/pom.xml
+++ b/minifi-assembly/pom.xml
@@ -54,16 +54,17 @@ limitations under the License.
-https://apache.claz.org/commons/daemon/binaries/windows/commons-daemon-1.1.0-bin-windows.zip;
dest="${java.io.tmpdir}/commons-daemon-1.1.0-bin-windows.zip"
skipexisting="true" />
+
+https://apache.claz.org/commons/daemon/binaries/windows/${commons.daemon.file};
dest="${java.io.tmpdir}/${commons.daemon.file}" skipexisting="true" />
-
-
+
+
Checksum error
-
+
