You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2016/12/22 20:16:29 UTC
nifi-minifi git commit: MINIFI-172 Updating last remanents of the
1.1.0 upgrade
Repository: nifi-minifi
Updated Branches:
refs/heads/master 4514a04fb -> 2fcf5ec60
MINIFI-172 Updating last remanents of the 1.1.0 upgrade
This closes #69.
Signed-off-by: Aldrin Piri <al...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/2fcf5ec6
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/2fcf5ec6
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/2fcf5ec6
Branch: refs/heads/master
Commit: 2fcf5ec60dec050324fa364301fcc8c773c58d8a
Parents: 4514a04
Author: Joseph Percivall <JP...@apache.org>
Authored: Thu Dec 22 13:16:37 2016 -0500
Committer: Aldrin Piri <al...@apache.org>
Committed: Thu Dec 22 15:12:46 2016 -0500
----------------------------------------------------------------------
.../nifi/minifi/bootstrap/util/ConfigTransformer.java | 2 +-
.../minifi-framework-bundle/minifi-framework-nar/pom.xml | 1 -
pom.xml | 11 ++++++++---
3 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/2fcf5ec6/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
----------------------------------------------------------------------
diff --git a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
index b724019..9c963f5 100644
--- a/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
+++ b/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/util/ConfigTransformer.java
@@ -80,7 +80,7 @@ import java.util.zip.GZIPOutputStream;
public final class ConfigTransformer {
// Underlying version of NIFI will be using
- public static final String NIFI_VERSION = "1.0.0";
+ public static final String NIFI_VERSION = "1.1.0";
public static final String ROOT_GROUP = "Root-Group";
public static final String DEFAULT_PROV_REPORTING_TASK_CLASS = "org.apache.nifi.reporting.SiteToSiteProvenanceReportingTask";
http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/2fcf5ec6/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
----------------------------------------------------------------------
diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
index 8a161a8..c16e97b 100644
--- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
+++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
@@ -69,7 +69,6 @@ limitations under the License.
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security</artifactId>
<scope>compile</scope>
- <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/2fcf5ec6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fc3271b..6948836 100644
--- a/pom.xml
+++ b/pom.xml
@@ -545,9 +545,9 @@ limitations under the License.
<version>${org.apache.nifi.version}</version>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.5</version>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-security</artifactId>
+ <version>${org.apache.nifi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -620,6 +620,11 @@ limitations under the License.
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.11</version>