diff --git a/nifi/nifi-commons/nifi-hl7-query-language/pom.xml b/nifi/nifi-commons/nifi-hl7-query-language/pom.xml index eb468416fb..b6ead092c6 100644 --- a/nifi/nifi-commons/nifi-hl7-query-language/pom.xml +++ b/nifi/nifi-commons/nifi-hl7-query-language/pom.xml @@ -48,7 +48,7 @@ org.apache.rat apache-rat-plugin - + src/test/resources/hypoglycemia src/test/resources/hyperglycemia diff --git a/nifi/nifi-docs/pom.xml b/nifi/nifi-docs/pom.xml index 1494745dd8..c3d67350b9 100644 --- a/nifi/nifi-docs/pom.xml +++ b/nifi/nifi-docs/pom.xml @@ -107,7 +107,7 @@ org.apache.rat apache-rat-plugin - + src/main/asciidoc/asciidoc-mod.css diff --git a/nifi/nifi-external/nifi-spark-receiver/pom.xml b/nifi/nifi-external/nifi-spark-receiver/pom.xml index cd03dd414d..af436c7ad1 100644 --- a/nifi/nifi-external/nifi-spark-receiver/pom.xml +++ b/nifi/nifi-external/nifi-spark-receiver/pom.xml @@ -27,7 +27,6 @@ org.apache.spark spark-streaming_2.10 - 1.2.0 org.apache.nifi diff --git a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml index cada04e5bb..c69c3c819b 100644 --- a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml @@ -61,7 +61,7 @@ org.apache.rat apache-rat-plugin - + src/test/resources/hello.txt diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml index 4cb2196fd0..82712e2858 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml @@ -137,7 +137,7 @@ org.apache.rat apache-rat-plugin - + src/test/resources/org/apache/nifi/cluster/firewall/impl/empty.txt src/test/resources/org/apache/nifi/cluster/firewall/impl/ips.txt diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml index 31aec72702..c7904193c0 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml @@ -127,7 +127,7 @@ org.apache.rat apache-rat-plugin - + src/test/resources/conf/0bytes.xml src/test/resources/conf/termination-only.xml src/test/resources/hello.txt diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml index ad01ab855a..a0d3f486c8 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml @@ -94,7 +94,7 @@ org.apache.rat apache-rat-plugin - + src/main/webapp/js/hexview/hexview.default.css src/main/webapp/js/hexview/hexview.js diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml index ca9738f18f..84e0f8aba4 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml @@ -595,7 +595,7 @@ org.apache.rat apache-rat-plugin - + nbactions.xml src/main/webapp/js/json2.js src/main/webapp/js/jquery/ diff --git a/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml index 6c045b88b9..12d2d714be 100644 --- a/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml @@ -31,7 +31,7 @@ org.apache.rat apache-rat-plugin - + src/test/resources/hypoglycemia.hl7 diff --git a/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml index 261dc92c97..35c3b44484 100644 --- a/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml @@ -95,7 +95,7 @@ org.apache.rat apache-rat-plugin - + src/test/resources/solr/solr.xml src/test/resources/testCollection/core.properties src/test/resources/testCollection/conf/_rest_managed.json diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml index a80fe08832..f8c272ca56 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml @@ -179,7 +179,7 @@ org.apache.rat apache-rat-plugin - + src/test/resources/localhost.cer src/test/resources/hello.txt src/test/resources/CharacterSetConversionSamples/Converted.txt diff --git a/nifi/pom.xml b/nifi/pom.xml index 58b4e8890e..7ff110bdd5 100644 --- a/nifi/pom.xml +++ b/nifi/pom.xml @@ -37,13 +37,13 @@ nifi-external - 1.7.10 - 9.2.10.v20150310 - 4.10.3 - 4.1.4.RELEASE - 3.2.5.RELEASE + 1.7.12 + 9.2.11.v20150529 + 4.10.4 + 4.1.6.RELEASE + 3.2.7.RELEASE 1.19 - 2.6.0 + 2.7.0 2014 @@ -51,12 +51,12 @@ ch.qos.logback logback-classic - 1.1.2 + 1.1.3 ch.qos.logback jcl-over-slf4j - 1.1.2 + 1.1.3 provided @@ -97,12 +97,12 @@ org.mockito mockito-core - 1.10.16 + 1.10.19 org.mockito mockito-all - 1.10.8 + 1.10.19 test @@ -118,7 +118,7 @@ org.apache.commons commons-lang3 - 3.3.2 + 3.4 org.antlr @@ -158,12 +158,12 @@ com.jcraft jsch - 0.1.51 + 0.1.52 org.apache.httpcomponents httpclient - 4.3.6 + 4.4.1 javax.mail @@ -183,7 +183,7 @@ net.sf.saxon Saxon-HE - 9.6.0-4 + 9.6.0-5 stax @@ -413,7 +413,7 @@ org.aspectj aspectjweaver - 1.8.4 + 1.8.5 cglib @@ -428,7 +428,7 @@ org.apache.commons commons-pool2 - 2.3 + 2.4.1 com.jcraft @@ -438,7 +438,7 @@ joda-time joda-time - 2.7 + 2.8 com.yammer.metrics @@ -448,12 +448,12 @@ javax.jms javax.jms-api - 2.0 + 2.0.1 org.apache.activemq activemq-client - 5.10.0 + 5.11.1 org.apache.lucene @@ -504,7 +504,7 @@ org.apache.avro avro - 1.7.6 + 1.7.7 com.sun.jersey @@ -606,6 +606,11 @@ jasypt 1.9.2 + + org.apache.spark + spark-streaming_2.10 + 1.3.1 + org.apache.nifi nifi-api