From b87b75329d52a0a4b67bc0dc1c3f8c0594da3859 Mon Sep 17 00:00:00 2001 From: Matt Gilman Date: Thu, 18 Dec 2014 14:03:48 -0500 Subject: [PATCH 1/3] NIFI-60: - Making service api artifiacts provided by default. --- nar-bundles/pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nar-bundles/pom.xml b/nar-bundles/pom.xml index 9daf0ba788..01f7207bca 100644 --- a/nar-bundles/pom.xml +++ b/nar-bundles/pom.xml @@ -58,16 +58,19 @@ org.apache.nifi distributed-cache-client-service-api ${project.version} + provided org.apache.nifi ssl-context-service-api ${project.version} + provided org.apache.nifi load-distribution-service-api ${project.version} + provided org.apache.nifi From 1a6f83e7de479fef5a809f0edbf28d76977b4792 Mon Sep 17 00:00:00 2001 From: joewitt Date: Thu, 18 Dec 2014 20:40:30 -0500 Subject: [PATCH 2/3] NIFI-184 fixed profile activition to occur only on Java 1.7 --- nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml b/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml index e7cb0e7c13..3e4b6101b9 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-api/pom.xml @@ -28,7 +28,7 @@ docs - true + 1.7 From 732cb7071ec8f8f6983d2b5ec1de0928f148b86d Mon Sep 17 00:00:00 2001 From: Matt Gilman Date: Fri, 19 Dec 2014 07:32:28 -0500 Subject: [PATCH 3/3] NIFI-27: - Update to support newer version of jquery. --- .../nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp index f82cc6dae9..299cf4e85f 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp @@ -21,7 +21,7 @@ NiFi Documentation - +