From 1d5df4a5ecdf11bd411c941e8054b6e260824c70 Mon Sep 17 00:00:00 2001 From: joewitt Date: Fri, 6 Oct 2017 08:57:42 -0400 Subject: [PATCH] NIFI-4466 fixed incorrect license header back to ASF and addressed some whitespace formatting in a couple of those poms. This closes #2197. --- .../nifi-confluent-platform-nar/pom.xml | 24 +- .../pom.xml | 20 +- .../nifi-registry-nar/pom.xml | 24 +- .../nifi-registry-service/pom.xml | 109 +++--- .../nifi-hwx-schema-registry-nar/pom.xml | 23 +- .../nifi-hwx-schema-registry-service/pom.xml | 320 +++++++++--------- 6 files changed, 253 insertions(+), 267 deletions(-) diff --git a/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-platform-nar/pom.xml b/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-platform-nar/pom.xml index 9f37ce0976..19ab0dfd77 100644 --- a/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-platform-nar/pom.xml +++ b/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-platform-nar/pom.xml @@ -1,17 +1,14 @@ - + 4.0.0 @@ -19,7 +16,6 @@ nifi-confluent-platform-bundle 1.5.0-SNAPSHOT - nifi-confluent-platform-nar nar diff --git a/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/pom.xml b/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/pom.xml index 273963a3b0..7d15e2de78 100644 --- a/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/pom.xml +++ b/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/pom.xml @@ -1,14 +1,14 @@ - + 4.0.0 diff --git a/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-nar/pom.xml b/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-nar/pom.xml index e3da8ee73b..d4c5ae0b2e 100644 --- a/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-nar/pom.xml +++ b/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-nar/pom.xml @@ -1,17 +1,14 @@ - + 4.0.0 @@ -19,7 +16,6 @@ nifi-registry-bundle 1.5.0-SNAPSHOT - nifi-registry-nar nar diff --git a/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-service/pom.xml b/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-service/pom.xml index 36d4efd3b5..15142c2725 100644 --- a/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-service/pom.xml +++ b/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-service/pom.xml @@ -1,63 +1,60 @@ - + - 4.0.0 - - - org.apache.nifi - nifi-registry-bundle - 1.5.0-SNAPSHOT - - - nifi-registry-service - jar - - + 4.0.0 + + org.apache.nifi + nifi-registry-bundle + 1.5.0-SNAPSHOT + + nifi-registry-service + jar + org.apache.nifi nifi-schema-registry-service-api - - org.apache.nifi - nifi-record-serialization-service-api - - - org.apache.nifi - nifi-record - - - org.apache.nifi - nifi-avro-record-utils - - - org.apache.nifi - nifi-api - - - org.apache.nifi - nifi-utils - - - org.apache.commons - commons-lang3 - - - commons-io - commons-io - - - junit - junit - test - - + + org.apache.nifi + nifi-record-serialization-service-api + + + org.apache.nifi + nifi-record + + + org.apache.nifi + nifi-avro-record-utils + + + org.apache.nifi + nifi-api + + + org.apache.nifi + nifi-utils + + + org.apache.commons + commons-lang3 + + + commons-io + commons-io + + + junit + junit + test + + diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-nar/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-nar/pom.xml index 6c12c972c6..b0cbcd0bb5 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-nar/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-nar/pom.xml @@ -1,17 +1,14 @@ - + 4.0.0 diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml index 1061296181..102f997f3c 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml @@ -17,30 +17,30 @@ limitations under the License. --> - 4.0.0 + 4.0.0 - + org.apache.nifi nifi-hwx-schema-registry-bundle 1.5.0-SNAPSHOT - nifi-hwx-schema-registry-service - jar + nifi-hwx-schema-registry-service + jar - - - org.apache.nifi - nifi-api - - - org.apache.nifi - nifi-utils - - - org.apache.nifi - nifi-record - + + + org.apache.nifi + nifi-api + + + org.apache.nifi + nifi-utils + + + org.apache.nifi + nifi-record + org.apache.nifi nifi-avro-record-utils @@ -54,166 +54,166 @@ limitations under the License. avro - + com.hortonworks.registries schema-registry-client - ${hwx.registry.version} - + ${hwx.registry.version} + org.apache.avro avro - - org.apache.kafka - kafka-clients - - - org.jboss.logging - jboss-logging - - - org.apache.directory.server - apacheds-i18n - - - org.apache.directory.server - apacheds-kerberos-codec - - - org.apache.zookeeper - zookeeper - - - javax.servlet.jsp - jsp-api - - - org.javassist - javassist - - - org.tukaani - xz - - - com.thoughtworks.paranamer - paranamer - - - org.hibernate - hibernate-validator - - - org.apache.hadoop - hadoop-annotations - - - org.fusesource.leveldbjni - leveldbjni-all - - - io.netty - netty-all - - - org.apache.hadoop - hadoop-auth - - - org.apache.hadoop - hadoop-client - - - org.apache.hadoop - hadoop-common - - - org.glassfish.hk2 - osgi-resource-locator - - - com.github.fge - btf - - - javax.mail - mailapi - - - com.googlecode.libphonenumber - libphonenumber - - - org.yaml - snakeyaml - - - com.github.fge - msg-simple - - - org.xerial.snappy - snappy-java - - - org.glassfish.hk2.external - aopalliance-repackaged - - - joda-time - joda-time - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - - - com.fasterxml.jackson.core - jackson-databind - + + org.apache.kafka + kafka-clients + + + org.jboss.logging + jboss-logging + + + org.apache.directory.server + apacheds-i18n + + + org.apache.directory.server + apacheds-kerberos-codec + + + org.apache.zookeeper + zookeeper + + + javax.servlet.jsp + jsp-api + + + org.javassist + javassist + + + org.tukaani + xz + + + com.thoughtworks.paranamer + paranamer + + + org.hibernate + hibernate-validator + + + org.apache.hadoop + hadoop-annotations + + + org.fusesource.leveldbjni + leveldbjni-all + + + io.netty + netty-all + + + org.apache.hadoop + hadoop-auth + + + org.apache.hadoop + hadoop-client + + + org.apache.hadoop + hadoop-common + + + org.glassfish.hk2 + osgi-resource-locator + + + com.github.fge + btf + + + javax.mail + mailapi + + + com.googlecode.libphonenumber + libphonenumber + + + org.yaml + snakeyaml + + + com.github.fge + msg-simple + + + org.xerial.snappy + snappy-java + + + org.glassfish.hk2.external + aopalliance-repackaged + + + joda-time + joda-time + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + + + com.fasterxml.jackson.core + jackson-databind + com.fasterxml.jackson.core jackson-core - - org.mozilla - rhino - - - com.github.fge - uri-template - - - com.github.fge - jackson-coreutils - - - com.github.fge - json-schema-core - - - com.github.fge - json-schema-validator - - - org.apache.commons - commons-compress - - - + + org.mozilla + rhino + + + com.github.fge + uri-template + + + com.github.fge + jackson-coreutils + + + com.github.fge + json-schema-core + + + com.github.fge + json-schema-validator + + + org.apache.commons + commons-compress + + + - - junit - junit - test - + + junit + junit + test + org.apache.nifi nifi-mock test - +