From 19d4a150a875e0862d458e03ffb413797f2bf81b Mon Sep 17 00:00:00 2001 From: joewitt Date: Mon, 15 Dec 2014 05:14:32 -0500 Subject: [PATCH] NIFI-169 well it finally all builds. There is a classpath issue still to sort out which impacts startup --- {assemblies/nifi => assembly}/pom.xml | 60 +- .../src/main/assembly/dependencies.xml | 0 commons/core-flowfile-attributes/pom.xml | 5 +- commons/data-provenance-utils/pom.xml | 4 +- commons/flowfile-packager/pom.xml | 4 +- .../apache/nifi/util/FlowFilePackagerV1.java | 4 +- commons/naive-search-ring-buffer/pom.xml | 2 +- commons/nifi-expression-language/pom.xml | 5 +- commons/nifi-file-utils/pom.xml | 4 +- commons/nifi-logging-utils/pom.xml | 5 +- commons/nifi-parent/pom.xml | 217 ---- commons/nifi-properties/pom.xml | 6 +- commons/nifi-security-utils/pom.xml | 4 +- commons/nifi-socket-utils/pom.xml | 9 +- commons/nifi-stream-utils/pom.xml | 16 +- commons/nifi-utils/pom.xml | 3 +- commons/nifi-web-utils/pom.xml | 12 +- commons/pom.xml | 50 + commons/processor-utilities/pom.xml | 6 +- commons/remote-communications-utils/pom.xml | 2 +- commons/search-utils/pom.xml | 4 +- commons/wali/pom.xml | 9 +- misc/{nar-maven-plugin => }/pom.xml | 0 .../src/main/java/nifi/NarMojo.java | 0 .../resources/META-INF/plexus/components.xml | 0 .../distributed-cache-client-service/pom.xml | 67 -- .../distributed-cache-server/pom.xml | 81 -- .../distributed-cache-services-nar/pom.xml | 49 - .../distributed-cache-services-bundle/pom.xml | 83 -- .../framework/cluster/pom.xml | 1 - .../framework-bundle/framework/core/pom.xml | 3 +- .../file-authorization-provider/pom.xml | 25 +- .../FileAuthorizationProvider.java | 2 +- ...pache.nifi.authorization.AuthorityProvider | 0 .../src/main/xsd/users.xsd | 0 .../FileAuthorizationProviderTest.java | 0 .../framework-bundle/framework/pom.xml | 1 + .../framework/resources/pom.xml | 3 + .../framework/runtime/pom.xml | 4 + .../framework/site-to-site/pom.xml | 6 +- .../framework/web/nifi-jetty/pom.xml | 22 + .../framework/web/nifi-web-api/pom.xml | 8 +- .../framework-bundle/framework/web/pom.xml | 11 - nar-bundles/framework-bundle/nar/pom.xml | 47 - nar-bundles/framework-bundle/pom.xml | 378 +------ .../hadoop-bundle/hdfs-processors/pom.xml | 8 - nar-bundles/hadoop-bundle/nar/pom.xml | 2 +- nar-bundles/hadoop-bundle/pom.xml | 98 +- .../hadoop-libraries-bundle/nar/pom.xml | 7 - nar-bundles/hadoop-libraries-bundle/pom.xml | 26 +- nar-bundles/jetty-bundle/pom.xml | 2 +- .../monitor-threshold-bundle/nar/pom.xml | 3 +- nar-bundles/monitor-threshold-bundle/pom.xml | 72 +- nar-bundles/nar-container-common/pom.xml | 121 --- .../nar/pom.xml | 60 +- .../pom.xml | 46 +- nar-bundles/pom.xml | 120 +++ .../standard-bundle/jms-processors/pom.xml | 4 - nar-bundles/standard-bundle/nar/pom.xml | 6 +- nar-bundles/standard-bundle/pom.xml | 62 +- .../standard-ganglia-reporter/pom.xml | 1 - .../standard-processors/pom.xml | 32 +- .../processors/standard/DetectDuplicate.java | 2 +- .../processors/standard/DistributeLoad.java | 2 +- .../standard/EvaluateRegularExpression.java | 2 +- .../standard/ExecuteStreamCommand.java | 2 +- .../processors/standard/HashAttribute.java | 2 +- .../nifi/processors/standard/InvokeHTTP.java | 4 +- .../nifi/processors/standard/ListenUDP.java | 2 +- .../processors/standard/LogAttribute.java | 2 +- .../standard/ReplaceTextWithMapping.java | 2 +- .../nifi/processors/standard/SplitXml.java | 2 +- .../standard/servlets/ListenHTTPServlet.java | 2 +- .../standard/util/UDPStreamConsumer.java | 6 +- .../standard/TestDetectDuplicate.java | 2 +- .../standard-reporting-tasks/pom.xml | 7 - .../standard-services-api-bundle/pom.xml | 74 -- .../standard-services-api-nar/pom.xml | 44 - .../pom.xml | 2 +- .../cache/client/Deserializer.java | 0 .../client/DistributedMapCacheClient.java | 0 .../client/DistributedSetCacheClient.java | 0 .../distributed/cache/client/Serializer.java | 0 .../exception/DeserializationException.java | 0 .../exception/SerializationException.java | 0 .../distributed-cache-client-service/pom.xml | 60 ++ .../cache/client/CommsSession.java | 0 .../DistributedMapCacheClientService.java | 0 .../DistributedSetCacheClientService.java | 0 .../cache/client/SSLCommsSession.java | 0 .../cache/client/StandardCommsSession.java | 0 ...g.apache.nifi.controller.ControllerService | 0 .../index.html | 0 .../index.html | 0 .../distributed-cache-protocol/pom.xml | 39 + .../cache/protocol/ProtocolHandshake.java | 0 .../exception/HandshakeException.java | 0 .../distributed-cache-server/pom.xml | 78 ++ .../cache/server/AbstractCacheServer.java | 0 .../distributed/cache/server/CacheRecord.java | 0 .../distributed/cache/server/CacheServer.java | 0 .../cache/server/DistributedCacheServer.java | 0 .../server/DistributedSetCacheServer.java | 0 .../cache/server/EvictionPolicy.java | 0 .../cache/server/SetCacheServer.java | 0 .../server/map/DistributedMapCacheServer.java | 0 .../cache/server/map/MapCache.java | 0 .../cache/server/map/MapCacheRecord.java | 0 .../cache/server/map/MapCacheServer.java | 0 .../cache/server/map/MapPutResult.java | 0 .../cache/server/map/PersistentMapCache.java | 0 .../cache/server/map/SimpleMapCache.java | 0 .../cache/server/set/PersistentSetCache.java | 0 .../cache/server/set/SetCache.java | 0 .../cache/server/set/SetCacheRecord.java | 0 .../cache/server/set/SetCacheResult.java | 0 .../cache/server/set/SimpleSetCache.java | 0 ...g.apache.nifi.controller.ControllerService | 0 .../index.html | 0 .../cache/server/TestServerAndClient.java | 0 .../src/test/resources/localhost-ks.jks | Bin .../src/test/resources/localhost-ts.jks | Bin .../distributed-cache-services-nar/pom.xml | 47 + .../distributed-cache-services-bundle/pom.xml | 35 + .../load-distribution-service-api/pom.xml | 3 +- .../loading/LoadDistributionListener.java | 0 .../nifi/loading/LoadDistributionService.java | 0 .../pom.xml | 42 +- .../ssl-context-bundle/nar/pom.xml | 2 +- .../ssl-context-bundle/pom.xml | 19 +- .../ssl-context-service/pom.xml | 1 + .../nifi/ssl/StandardSSLContextService.java | 0 ...g.apache.nifi.controller.ControllerService | 0 .../index.html | 0 .../nifi/ssl/SSLContextServiceTest.java | 0 .../org/apache/nifi/ssl/TestProcessor.java | 0 .../src/test/resources/localhost-ks.jks | Bin .../src/test/resources/localhost-ts.jks | Bin .../ssl-context-service-api/pom.xml | 2 +- .../apache/nifi/ssl/SSLContextService.java | 0 .../standard-services-api-nar/pom.xml | 45 + .../update-attribute-bundle/nar/pom.xml | 37 +- nar-bundles/update-attribute-bundle/pom.xml | 29 +- .../update-attribute-bundle/processor/pom.xml | 1 - .../update-attribute-bundle/ui/pom.xml | 10 +- .../update/attributes/api/RuleResource.java | 2 +- .../nar/pom.xml | 4 +- .../pom.xml | 16 +- .../volatile-provenance-repository/pom.xml | 2 +- nar-maven-plugin/pom.xml | 76 ++ .../src/main/java/nifi/NarMojo.java | 610 +++++++++++ .../resources/META-INF/plexus/components.xml | 52 + nifi-api/pom.xml | 3 +- nifi-bootstrap/pom.xml | 22 +- nifi-mock/pom.xml | 6 - .../apache/nifi/util/MockProcessSession.java | 2 +- pom.xml | 966 ++++++++++++++++++ 157 files changed, 2451 insertions(+), 1811 deletions(-) rename {assemblies/nifi => assembly}/pom.xml (90%) rename {assemblies/nifi => assembly}/src/main/assembly/dependencies.xml (100%) delete mode 100644 commons/nifi-parent/pom.xml create mode 100644 commons/pom.xml rename misc/{nar-maven-plugin => }/pom.xml (100%) rename misc/{nar-maven-plugin => }/src/main/java/nifi/NarMojo.java (100%) rename misc/{nar-maven-plugin => }/src/main/resources/META-INF/plexus/components.xml (100%) delete mode 100644 nar-bundles/distributed-cache-services-bundle/distributed-cache-client-service/pom.xml delete mode 100644 nar-bundles/distributed-cache-services-bundle/distributed-cache-server/pom.xml delete mode 100644 nar-bundles/distributed-cache-services-bundle/distributed-cache-services-nar/pom.xml delete mode 100644 nar-bundles/distributed-cache-services-bundle/pom.xml rename {extensions => nar-bundles/framework-bundle/framework}/file-authorization-provider/pom.xml (75%) rename {extensions => nar-bundles/framework-bundle/framework}/file-authorization-provider/src/main/java/org/apache/nifi/authorization/FileAuthorizationProvider.java (99%) rename {extensions => nar-bundles/framework-bundle/framework}/file-authorization-provider/src/main/resources/META-INF/services/org.apache.nifi.authorization.AuthorityProvider (100%) rename {extensions => nar-bundles/framework-bundle/framework}/file-authorization-provider/src/main/xsd/users.xsd (100%) rename {extensions => nar-bundles/framework-bundle/framework}/file-authorization-provider/src/test/java/org/apache/nifi/authorization/FileAuthorizationProviderTest.java (100%) delete mode 100644 nar-bundles/nar-container-common/pom.xml create mode 100644 nar-bundles/pom.xml delete mode 100644 nar-bundles/standard-services-api-bundle/pom.xml delete mode 100644 nar-bundles/standard-services-api-bundle/standard-services-api-nar/pom.xml rename nar-bundles/{standard-services-api-bundle => standard-services}/distributed-cache-client-service-api/pom.xml (96%) rename nar-bundles/{standard-services-api-bundle => standard-services}/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/Deserializer.java (100%) rename nar-bundles/{standard-services-api-bundle => standard-services}/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClient.java (100%) rename nar-bundles/{standard-services-api-bundle => standard-services}/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClient.java (100%) rename nar-bundles/{standard-services-api-bundle => standard-services}/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/Serializer.java (100%) rename nar-bundles/{standard-services-api-bundle => standard-services}/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/exception/DeserializationException.java (100%) rename nar-bundles/{standard-services-api-bundle => standard-services}/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/exception/SerializationException.java (100%) create mode 100644 nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/pom.xml rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/CommsSession.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClientService.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClientService.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/SSLCommsSession.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/StandardCommsSession.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/docs/org.apache.nifi.distributed.cache.client.DistributedMapCacheClientService/index.html (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/docs/org.apache.nifi.distributed.cache.client.DistributedSetCacheClientService/index.html (100%) create mode 100644 nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-protocol/pom.xml rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/ProtocolHandshake.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/exception/HandshakeException.java (100%) create mode 100644 nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/pom.xml rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/AbstractCacheServer.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/CacheRecord.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/CacheServer.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/DistributedCacheServer.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/DistributedSetCacheServer.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/EvictionPolicy.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/SetCacheServer.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/DistributedMapCacheServer.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCache.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheRecord.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheServer.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapPutResult.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/PersistentMapCache.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/SimpleMapCache.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/PersistentSetCache.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCache.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCacheRecord.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCacheResult.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SimpleSetCache.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/main/resources/docs/org.apache.nifi.distributed.cache.server.map.DistributedMapCacheServer/index.html (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/TestServerAndClient.java (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/test/resources/localhost-ks.jks (100%) rename nar-bundles/{ => standard-services}/distributed-cache-services-bundle/distributed-cache-server/src/test/resources/localhost-ts.jks (100%) create mode 100644 nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-services-nar/pom.xml create mode 100644 nar-bundles/standard-services/distributed-cache-services-bundle/pom.xml rename nar-bundles/{standard-services-api-bundle => standard-services}/load-distribution-service-api/pom.xml (94%) rename nar-bundles/{standard-services-api-bundle => standard-services}/load-distribution-service-api/src/main/java/org/apache/nifi/loading/LoadDistributionListener.java (100%) rename nar-bundles/{standard-services-api-bundle => standard-services}/load-distribution-service-api/src/main/java/org/apache/nifi/loading/LoadDistributionService.java (100%) rename nar-bundles/{distributed-cache-services-bundle/distributed-cache-protocol => standard-services}/pom.xml (56%) rename nar-bundles/{ => standard-services}/ssl-context-bundle/nar/pom.xml (96%) rename nar-bundles/{ => standard-services}/ssl-context-bundle/pom.xml (69%) rename nar-bundles/{ => standard-services}/ssl-context-bundle/ssl-context-service/pom.xml (98%) rename nar-bundles/{ => standard-services}/ssl-context-bundle/ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java (100%) rename nar-bundles/{ => standard-services}/ssl-context-bundle/ssl-context-service/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService (100%) rename nar-bundles/{ => standard-services}/ssl-context-bundle/ssl-context-service/src/main/resources/docs/org.apache.nifi.ssl.StandardSSLContextService/index.html (100%) rename nar-bundles/{ => standard-services}/ssl-context-bundle/ssl-context-service/src/test/java/org/apache/nifi/ssl/SSLContextServiceTest.java (100%) rename nar-bundles/{ => standard-services}/ssl-context-bundle/ssl-context-service/src/test/java/org/apache/nifi/ssl/TestProcessor.java (100%) rename nar-bundles/{ => standard-services}/ssl-context-bundle/ssl-context-service/src/test/resources/localhost-ks.jks (100%) rename nar-bundles/{ => standard-services}/ssl-context-bundle/ssl-context-service/src/test/resources/localhost-ts.jks (100%) rename nar-bundles/{standard-services-api-bundle => standard-services}/ssl-context-service-api/pom.xml (96%) rename nar-bundles/{standard-services-api-bundle => standard-services}/ssl-context-service-api/src/main/java/org/apache/nifi/ssl/SSLContextService.java (100%) create mode 100644 nar-bundles/standard-services/standard-services-api-nar/pom.xml create mode 100644 nar-maven-plugin/pom.xml create mode 100644 nar-maven-plugin/src/main/java/nifi/NarMojo.java create mode 100644 nar-maven-plugin/src/main/resources/META-INF/plexus/components.xml create mode 100644 pom.xml diff --git a/assemblies/nifi/pom.xml b/assembly/pom.xml similarity index 90% rename from assemblies/nifi/pom.xml rename to assembly/pom.xml index 556b8fed70..17cf29b481 100644 --- a/assemblies/nifi/pom.xml +++ b/assembly/pom.xml @@ -20,14 +20,11 @@ nifi-parent 0.0.1-SNAPSHOT - nifi 0.0.1-SNAPSHOT pom - NiFi Release - This is the assembly for the Main Standard Release of NiFi - + This is the assembly Apache NiFi (incubating) @@ -59,7 +56,6 @@ org.codehaus.mojo exec-maven-plugin - 1.3.2 @@ -101,7 +97,6 @@ org.slf4j log4j-over-slf4j - ${org.slf4j.version} compile @@ -112,22 +107,18 @@ org.apache.nifi nifi-api - 0.0.1-SNAPSHOT org.apache.nifi nifi-runtime - ${framework.version} - org.apache.nifi - nifi-bootstrap - 0.0.1-SNAPSHOT + org.apache.nifi + nifi-bootstrap org.apache.nifi nifi-resources - ${framework.version} resources provided zip @@ -135,88 +126,66 @@ org.apache.nifi nifi-framework-nar - ${framework.version} nar org.apache.nifi volatile-provenance-repository-nar - 0.0.1-SNAPSHOT nar org.apache.nifi persistent-provenance-repository-nar - 0.0.1-SNAPSHOT nar - org.apache.nifi standard-services-api-nar - 0.0.1-SNAPSHOT nar org.apache.nifi ssl-context-service-nar - 0.0.1-SNAPSHOT nar org.apache.nifi distributed-cache-services-nar - 0.0.1-SNAPSHOT nar org.apache.nifi nifi-standard-nar - 0.0.1-SNAPSHOT nar org.apache.nifi nifi-jetty-bundle - 0.0.1-SNAPSHOT nar org.apache.nifi update-attribute-nar - 0.0.1-SNAPSHOT nar - org.apache.nifi monitor-threshold-nar - 0.0.1-SNAPSHOT nar org.apache.nifi hadoop-libraries-nar - 0.0.1-SNAPSHOT nar org.apache.nifi hadoop-nar - 0.0.1-SNAPSHOT nar - - - 0.0.1-SNAPSHOT - + 256 512 @@ -356,14 +325,12 @@ 5 sec 10 0 sec - bin ${project.artifactId}-${project.version}/bin/${project.artifactId} - @@ -376,7 +343,6 @@ org.codehaus.mojo rpm-maven-plugin - 2.0.1 @@ -387,9 +353,9 @@ ${project.artifactId} ${project.version} - NiFi data flow framework + Apache NiFi (incubating) - Nifi is a simple event processing framework largely + Apache Nifi (incubating) is dataflow system based on the Flow-Based Programming concepts. NONE @@ -404,8 +370,8 @@ 750 640 - dataflow - dataflow + nifi + nifi /opt/${project.artifactId}/${project.artifactId}-${project.version} @@ -451,16 +417,6 @@ ${project.build.directory}/generated-resources/lib - - **/*-aix* - **/*-freebsd* - **/*-hpux* - **/*-linux-ia* - **/*-linux-ppc* - **/*-macosx* - **/*-solaris* - **/*-windows* - diff --git a/assemblies/nifi/src/main/assembly/dependencies.xml b/assembly/src/main/assembly/dependencies.xml similarity index 100% rename from assemblies/nifi/src/main/assembly/dependencies.xml rename to assembly/src/main/assembly/dependencies.xml diff --git a/commons/core-flowfile-attributes/pom.xml b/commons/core-flowfile-attributes/pom.xml index d611134c69..5a82ffaf8a 100644 --- a/commons/core-flowfile-attributes/pom.xml +++ b/commons/core-flowfile-attributes/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi - nifi-parent + nifi-commons-parent 0.0.1-SNAPSHOT @@ -26,7 +26,4 @@ jar NiFi: Core FlowFile Attributes - - - diff --git a/commons/data-provenance-utils/pom.xml b/commons/data-provenance-utils/pom.xml index 0f33c06b28..162d4f3657 100644 --- a/commons/data-provenance-utils/pom.xml +++ b/commons/data-provenance-utils/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi - nifi-parent + nifi-commons-parent 0.0.1-SNAPSHOT @@ -31,12 +31,10 @@ org.apache.nifi nifi-api - [0.0.1-SNAPSHOT,1.0.0-SNAPSHOT) org.apache.nifi nifi-core-flowfile-attributes - 0.0.1-SNAPSHOT diff --git a/commons/flowfile-packager/pom.xml b/commons/flowfile-packager/pom.xml index f4001febb3..9cf4ba86ba 100644 --- a/commons/flowfile-packager/pom.xml +++ b/commons/flowfile-packager/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi - nifi-parent + nifi-commons-parent 0.0.1-SNAPSHOT @@ -31,12 +31,10 @@ org.apache.commons commons-compress - 1.9 org.apache.commons commons-lang3 - 3.3.2 diff --git a/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV1.java b/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV1.java index 2437279f53..07baab1409 100644 --- a/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV1.java +++ b/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV1.java @@ -58,8 +58,8 @@ public class FlowFilePackagerV1 implements FlowFilePackager { sb.append("\n"); sb.append(""); for (final Map.Entry entry : attributes.entrySet()) { - final String escapedKey = StringEscapeUtils.escapeXml(entry.getKey()); - final String escapedValue = StringEscapeUtils.escapeXml(entry.getValue()); + final String escapedKey = StringEscapeUtils.escapeXml11(entry.getKey()); + final String escapedValue = StringEscapeUtils.escapeXml11(entry.getValue()); sb.append("\n ").append(escapedValue).append(""); } sb.append(""); diff --git a/commons/naive-search-ring-buffer/pom.xml b/commons/naive-search-ring-buffer/pom.xml index e84be0fdb7..c9628f0b36 100644 --- a/commons/naive-search-ring-buffer/pom.xml +++ b/commons/naive-search-ring-buffer/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi - nifi-parent + nifi-commons-parent 0.0.1-SNAPSHOT diff --git a/commons/nifi-expression-language/pom.xml b/commons/nifi-expression-language/pom.xml index dfb1ea5b03..196c0488d2 100644 --- a/commons/nifi-expression-language/pom.xml +++ b/commons/nifi-expression-language/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi - nifi-parent + nifi-commons-parent 0.0.1-SNAPSHOT @@ -32,7 +32,6 @@ org.antlr antlr3-maven-plugin - 3.5.2 @@ -48,12 +47,10 @@ org.antlr antlr-runtime - 3.5.2 org.apache.nifi nifi-api - [0.0.1-SNAPSHOT, 1.0.0-SNAPSHOT) diff --git a/commons/nifi-file-utils/pom.xml b/commons/nifi-file-utils/pom.xml index e3cf792a39..2af4d634b4 100644 --- a/commons/nifi-file-utils/pom.xml +++ b/commons/nifi-file-utils/pom.xml @@ -14,9 +14,10 @@ limitations under the License. --> 4.0.0 + org.apache.nifi - nifi-parent + nifi-commons-parent 0.0.1-SNAPSHOT @@ -29,7 +30,6 @@ commons-codec commons-codec - 1.10 diff --git a/commons/nifi-logging-utils/pom.xml b/commons/nifi-logging-utils/pom.xml index ce5064b82f..a6c3f443d4 100644 --- a/commons/nifi-logging-utils/pom.xml +++ b/commons/nifi-logging-utils/pom.xml @@ -15,9 +15,10 @@ --> 4.0.0 + org.apache.nifi - nifi-parent + nifi-commons-parent 0.0.1-SNAPSHOT @@ -26,7 +27,7 @@ NiFi Logging Utils Utilities for logging - + org.slf4j slf4j-api diff --git a/commons/nifi-parent/pom.xml b/commons/nifi-parent/pom.xml deleted file mode 100644 index 7684d53c52..0000000000 --- a/commons/nifi-parent/pom.xml +++ /dev/null @@ -1,217 +0,0 @@ - - - - 4.0.0 - org.apache.nifi - nifi-parent - 0.0.1-SNAPSHOT - pom - NiFi Parent - - A helpful parent pom which can be used for all NiFi components. Helps establish the basic requirements/depdencies. - - - UTF-8 - 1.7.7 - - - - - - - org.codehaus.mojo - findbugs-maven-plugin - 3.0.0 - - Max - Medium - true - - - - - check - - - - - - - - - org.apache.nifi - nar-maven-plugin - 0.0.1-SNAPSHOT - true - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.7 - 1.7 - true - - 3.2 - - - maven-jar-plugin - 2.5 - - - maven-war-plugin - 2.5 - - - org.apache.maven.plugins - maven-dependency-plugin - 2.9 - - - org.apache.maven.plugins - maven-resources-plugin - 2.7 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.18 - - - org.apache.maven.plugins - maven-assembly-plugin - 2.5.2 - - - org.apache.maven.plugins - maven-release-plugin - 2.5.1 - - - org.codehaus.mojo - jaxb2-maven-plugin - 1.6 - - - org.apache.maven.plugins - maven-source-plugin - 2.4 - - - org.codehaus.mojo - exec-maven-plugin - 1.3.2 - - - org.apache.maven.plugins - maven-site-plugin - 3.4 - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.1 - - false - true - private - - - - - - - - ch.qos.logback - logback-classic - 1.1.2 - provided - - - org.slf4j - slf4j-api - - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - provided - - - org.slf4j - jul-to-slf4j - ${org.slf4j.version} - provided - - - org.slf4j - slf4j-api - ${org.slf4j.version} - provided - - - - - - - junit - junit - 4.11 - test - - - org.mockito - mockito-core - 1.10.8 - test - - - org.slf4j - slf4j-simple - ${org.slf4j.version} - test - - - - - - nifi-releases - ${nifi.repo.url} - - - nifi-snapshots - ${nifi.snapshot.repo.url} - - - - - - org.codehaus.mojo - findbugs-maven-plugin - 3.0.0 - - Max - Medium - true - - - - - diff --git a/commons/nifi-properties/pom.xml b/commons/nifi-properties/pom.xml index 70f90aa0b7..43ef7c2143 100644 --- a/commons/nifi-properties/pom.xml +++ b/commons/nifi-properties/pom.xml @@ -15,15 +15,15 @@ --> 4.0.0 + org.apache.nifi - nifi-parent + nifi-commons-parent 0.0.1-SNAPSHOT + nifi-properties 0.0.1-SNAPSHOT NiFi Properties - - diff --git a/commons/nifi-security-utils/pom.xml b/commons/nifi-security-utils/pom.xml index 76e9ac16a4..0eaaeb4c92 100644 --- a/commons/nifi-security-utils/pom.xml +++ b/commons/nifi-security-utils/pom.xml @@ -14,9 +14,10 @@ limitations under the License. --> 4.0.0 + org.apache.nifi - nifi-parent + nifi-commons-parent 0.0.1-SNAPSHOT @@ -33,7 +34,6 @@ org.apache.commons commons-lang3 - 3.3.2 diff --git a/commons/nifi-socket-utils/pom.xml b/commons/nifi-socket-utils/pom.xml index 8e064339ef..efb5a8eba3 100644 --- a/commons/nifi-socket-utils/pom.xml +++ b/commons/nifi-socket-utils/pom.xml @@ -15,9 +15,10 @@ --> 4.0.0 + org.apache.nifi - nifi-parent + nifi-commons-parent 0.0.1-SNAPSHOT @@ -34,32 +35,26 @@ org.apache.nifi nifi-utils - 0.0.1-SNAPSHOT org.apache.nifi nifi-logging-utils - 0.0.1-SNAPSHOT commons-net commons-net - 3.3 org.apache.commons commons-lang3 - 3.3.2 commons-io commons-io - 2.4 org.apache.nifi nifi-properties - 0.0.1-SNAPSHOT diff --git a/commons/nifi-stream-utils/pom.xml b/commons/nifi-stream-utils/pom.xml index 04135759b3..ae0643621e 100644 --- a/commons/nifi-stream-utils/pom.xml +++ b/commons/nifi-stream-utils/pom.xml @@ -15,9 +15,10 @@ --> 4.0.0 + org.apache.nifi - nifi-parent + nifi-commons-parent 0.0.1-SNAPSHOT @@ -26,17 +27,4 @@ jar NiFi Stream Utils - - - - - maven-compiler-plugin - - 1.6 - 1.6 - - - - - diff --git a/commons/nifi-utils/pom.xml b/commons/nifi-utils/pom.xml index 8aeccd7b60..6a6cee1c77 100644 --- a/commons/nifi-utils/pom.xml +++ b/commons/nifi-utils/pom.xml @@ -15,9 +15,10 @@ --> 4.0.0 + org.apache.nifi - nifi-parent + nifi-commons-parent 0.0.1-SNAPSHOT diff --git a/commons/nifi-web-utils/pom.xml b/commons/nifi-web-utils/pom.xml index 434e1a3d39..63d6e57ecd 100644 --- a/commons/nifi-web-utils/pom.xml +++ b/commons/nifi-web-utils/pom.xml @@ -15,9 +15,10 @@ --> 4.0.0 + org.apache.nifi - nifi-parent + nifi-commons-parent 0.0.1-SNAPSHOT @@ -29,27 +30,26 @@ org.apache.nifi nifi-security-utils - 0.0.1-SNAPSHOT commons-codec commons-codec - 1.10 + + + org.apache.commons + commons-lang3 com.sun.jersey jersey-client - 1.18.2 com.sun.jersey jersey-json - 1.18.2 javax.servlet javax.servlet-api - 3.1.0 provided diff --git a/commons/pom.xml b/commons/pom.xml new file mode 100644 index 0000000000..fc7a1c3ee7 --- /dev/null +++ b/commons/pom.xml @@ -0,0 +1,50 @@ + + + + 4.0.0 + + + org.apache.nifi + nifi-parent + 0.0.1-SNAPSHOT + + + org.apache.nifi + nifi-commons-parent + pom + NiFi :: Commons Parent + + + core-flowfile-attributes + data-provenance-utils + flowfile-packager + naive-search-ring-buffer + nifi-expression-language + nifi-file-utils + nifi-logging-utils + nifi-properties + nifi-security-utils + nifi-socket-utils + nifi-stream-utils + nifi-utils + nifi-web-utils + processor-utilities + remote-communications-utils + search-utils + wali + + diff --git a/commons/processor-utilities/pom.xml b/commons/processor-utilities/pom.xml index 0519b7ffb5..2e952def7a 100644 --- a/commons/processor-utilities/pom.xml +++ b/commons/processor-utilities/pom.xml @@ -15,9 +15,10 @@ --> 4.0.0 + org.apache.nifi - nifi-parent + nifi-commons-parent 0.0.1-SNAPSHOT @@ -30,18 +31,15 @@ org.apache.nifi nifi-api - [0.0.1-SNAPSHOT, 1.0.0-SNAPSHOT) provided org.apache.nifi nifi-utils - [0.0.1-SNAPSHOT,1.0.0-SNAPSHOT) org.apache.nifi nifi-security-utils - 0.0.1-SNAPSHOT diff --git a/commons/remote-communications-utils/pom.xml b/commons/remote-communications-utils/pom.xml index 5e5ebc1779..4eb0133d23 100644 --- a/commons/remote-communications-utils/pom.xml +++ b/commons/remote-communications-utils/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi - nifi-parent + nifi-commons-parent 0.0.1-SNAPSHOT diff --git a/commons/search-utils/pom.xml b/commons/search-utils/pom.xml index 569958fc7e..7caacc8a27 100644 --- a/commons/search-utils/pom.xml +++ b/commons/search-utils/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi - nifi-parent + nifi-commons-parent 0.0.1-SNAPSHOT @@ -27,6 +27,4 @@ search-utils - - diff --git a/commons/wali/pom.xml b/commons/wali/pom.xml index ce04973a1e..5a06a3f881 100644 --- a/commons/wali/pom.xml +++ b/commons/wali/pom.xml @@ -15,17 +15,17 @@ --> 4.0.0 + org.apache.nifi - nifi-parent + nifi-commons-parent 0.0.1-SNAPSHOT - wali wali - - 3.0.0-SNAPSHOT + 0.0.1-SNAPSHOT jar + WALI : Write-Ahead Log Implementation @@ -36,7 +36,6 @@ org.apache.nifi nifi-stream-utils - 0.0.1-SNAPSHOT diff --git a/misc/nar-maven-plugin/pom.xml b/misc/pom.xml similarity index 100% rename from misc/nar-maven-plugin/pom.xml rename to misc/pom.xml diff --git a/misc/nar-maven-plugin/src/main/java/nifi/NarMojo.java b/misc/src/main/java/nifi/NarMojo.java similarity index 100% rename from misc/nar-maven-plugin/src/main/java/nifi/NarMojo.java rename to misc/src/main/java/nifi/NarMojo.java diff --git a/misc/nar-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/misc/src/main/resources/META-INF/plexus/components.xml similarity index 100% rename from misc/nar-maven-plugin/src/main/resources/META-INF/plexus/components.xml rename to misc/src/main/resources/META-INF/plexus/components.xml diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-client-service/pom.xml b/nar-bundles/distributed-cache-services-bundle/distributed-cache-client-service/pom.xml deleted file mode 100644 index 6280349ae0..0000000000 --- a/nar-bundles/distributed-cache-services-bundle/distributed-cache-client-service/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - 4.0.0 - - - org.apache.nifi - distributed-cache-services-bundle - 0.0.1-SNAPSHOT - - - distributed-cache-client-service - jar - - Distributed Cache Client Service - Provides a Client for interfacing with a Distributed Cache - - - - org.apache.nifi - nifi-api - - - org.apache.nifi - distributed-cache-client-service-api - - - org.apache.nifi - distributed-cache-protocol - ${project.version} - - - org.apache.nifi - remote-communications-utils - - - org.apache.nifi - nifi-processor-utils - - - org.apache.nifi - nifi-stream-utils - - - org.apache.nifi - ssl-context-service-api - - - junit - junit - 4.9 - test - - - diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/pom.xml b/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/pom.xml deleted file mode 100644 index 5dec322595..0000000000 --- a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - 4.0.0 - - - org.apache.nifi - distributed-cache-services-bundle - 0.0.1-SNAPSHOT - - - distributed-cache-server - - Distributed Cache Server - Provides a Controller Service for hosting Distributed Caches - - - - org.apache.nifi - nifi-api - - - org.apache.nifi - distributed-cache-protocol - ${project.version} - - - org.apache.nifi - remote-communications-utils - - - org.apache.nifi - nifi-processor-utils - - - org.apache.nifi - nifi-stream-utils - - - org.apache.nifi - ssl-context-service-api - - - wali - wali - - - org.apache.nifi - distributed-cache-client-service-api - test - - - org.apache.nifi - distributed-cache-client-service - ${project.version} - test - - - org.apache.nifi - nifi-mock - - - - org.apache.nifi - ssl-context-service - - - - \ No newline at end of file diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-services-nar/pom.xml b/nar-bundles/distributed-cache-services-bundle/distributed-cache-services-nar/pom.xml deleted file mode 100644 index 75cab34441..0000000000 --- a/nar-bundles/distributed-cache-services-bundle/distributed-cache-services-nar/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - 4.0.0 - - org.apache.nifi - distributed-cache-services-bundle - 0.0.1-SNAPSHOT - - - distributed-cache-services-nar - Distributed Cache Services NAR - nar - - - - org.apache.nifi - standard-services-api-nar - nar - - - org.apache.nifi - distributed-cache-client-service - ${project.version} - - - org.apache.nifi - distributed-cache-protocol - ${project.version} - - - org.apache.nifi - distributed-cache-server - ${project.version} - - - diff --git a/nar-bundles/distributed-cache-services-bundle/pom.xml b/nar-bundles/distributed-cache-services-bundle/pom.xml deleted file mode 100644 index dcfa541e22..0000000000 --- a/nar-bundles/distributed-cache-services-bundle/pom.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - 4.0.0 - - - org.apache.nifi - standard-services-api-bundle - 0.0.1-SNAPSHOT - - - distributed-cache-services-bundle - 0.0.1-SNAPSHOT - Distributed Cache Services Bundle - pom - - - distributed-cache-protocol - distributed-cache-client-service - distributed-cache-server - distributed-cache-services-nar - - - - - - - org.apache.nifi - distributed-cache-client-service-api - ${standard.services.api.version} - - - org.apache.nifi - ssl-context-service-api - ${standard.services.api.version} - - - org.apache.nifi - nifi-processor-utils - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-stream-utils - 0.0.1-SNAPSHOT - - - org.apache.nifi - remote-communications-utils - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-mock - 0.0.1-SNAPSHOT - test - - - wali - wali - 3.0.0-SNAPSHOT - - - org.apache.nifi - ssl-context-service - 0.0.1-SNAPSHOT - test - - - - \ No newline at end of file diff --git a/nar-bundles/framework-bundle/framework/cluster/pom.xml b/nar-bundles/framework-bundle/framework/cluster/pom.xml index ad5dda73ae..78f4527e0e 100644 --- a/nar-bundles/framework-bundle/framework/cluster/pom.xml +++ b/nar-bundles/framework-bundle/framework/cluster/pom.xml @@ -80,7 +80,6 @@ org.apache.commons commons-compress - 1.9 diff --git a/nar-bundles/framework-bundle/framework/core/pom.xml b/nar-bundles/framework-bundle/framework/core/pom.xml index 547c75d9ef..1836d32fdb 100644 --- a/nar-bundles/framework-bundle/framework/core/pom.xml +++ b/nar-bundles/framework-bundle/framework/core/pom.xml @@ -117,9 +117,8 @@ data-provenance-utils - wali + org.apache.nifi wali - 3.0.0-SNAPSHOT org.apache.nifi diff --git a/extensions/file-authorization-provider/pom.xml b/nar-bundles/framework-bundle/framework/file-authorization-provider/pom.xml similarity index 75% rename from extensions/file-authorization-provider/pom.xml rename to nar-bundles/framework-bundle/framework/file-authorization-provider/pom.xml index f8d823f6ea..cb01488466 100644 --- a/extensions/file-authorization-provider/pom.xml +++ b/nar-bundles/framework-bundle/framework/file-authorization-provider/pom.xml @@ -17,7 +17,7 @@ 4.0.0 org.apache.nifi - nifi-parent + nifi-framework-parent 0.0.1-SNAPSHOT @@ -36,20 +36,16 @@ - com.sun.tools.xjc.maven2 - maven-jaxb-plugin + org.codehaus.mojo + jaxb2-maven-plugin - current + xjc - generate + xjc - src/main/xsd - - **/*.xsd - - org.apache.nifi.user.generated + org.apache.nifi.user.generated @@ -63,27 +59,22 @@ org.apache.nifi nifi-api - [0.0.1-SNAPSHOT, 1.0.0-SNAPSHOT) org.apache.nifi nifi-file-utils - 0.0.1-SNAPSHOT org.apache.nifi nifi-properties - [0.0.1-SNAPSHOT, 1.0.0-SNAPSHOT) - commons-lang - commons-lang - 2.6 + org.apache.commons + commons-lang3 commons-codec commons-codec - 1.10 test diff --git a/extensions/file-authorization-provider/src/main/java/org/apache/nifi/authorization/FileAuthorizationProvider.java b/nar-bundles/framework-bundle/framework/file-authorization-provider/src/main/java/org/apache/nifi/authorization/FileAuthorizationProvider.java similarity index 99% rename from extensions/file-authorization-provider/src/main/java/org/apache/nifi/authorization/FileAuthorizationProvider.java rename to nar-bundles/framework-bundle/framework/file-authorization-provider/src/main/java/org/apache/nifi/authorization/FileAuthorizationProvider.java index 55f59ba6c9..0f4a75c3ef 100644 --- a/extensions/file-authorization-provider/src/main/java/org/apache/nifi/authorization/FileAuthorizationProvider.java +++ b/nar-bundles/framework-bundle/framework/file-authorization-provider/src/main/java/org/apache/nifi/authorization/FileAuthorizationProvider.java @@ -42,7 +42,7 @@ import org.apache.nifi.user.generated.Role; import org.apache.nifi.user.generated.User; import org.apache.nifi.user.generated.Users; import org.apache.nifi.util.NiFiProperties; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.SAXException; diff --git a/extensions/file-authorization-provider/src/main/resources/META-INF/services/org.apache.nifi.authorization.AuthorityProvider b/nar-bundles/framework-bundle/framework/file-authorization-provider/src/main/resources/META-INF/services/org.apache.nifi.authorization.AuthorityProvider similarity index 100% rename from extensions/file-authorization-provider/src/main/resources/META-INF/services/org.apache.nifi.authorization.AuthorityProvider rename to nar-bundles/framework-bundle/framework/file-authorization-provider/src/main/resources/META-INF/services/org.apache.nifi.authorization.AuthorityProvider diff --git a/extensions/file-authorization-provider/src/main/xsd/users.xsd b/nar-bundles/framework-bundle/framework/file-authorization-provider/src/main/xsd/users.xsd similarity index 100% rename from extensions/file-authorization-provider/src/main/xsd/users.xsd rename to nar-bundles/framework-bundle/framework/file-authorization-provider/src/main/xsd/users.xsd diff --git a/extensions/file-authorization-provider/src/test/java/org/apache/nifi/authorization/FileAuthorizationProviderTest.java b/nar-bundles/framework-bundle/framework/file-authorization-provider/src/test/java/org/apache/nifi/authorization/FileAuthorizationProviderTest.java similarity index 100% rename from extensions/file-authorization-provider/src/test/java/org/apache/nifi/authorization/FileAuthorizationProviderTest.java rename to nar-bundles/framework-bundle/framework/file-authorization-provider/src/test/java/org/apache/nifi/authorization/FileAuthorizationProviderTest.java diff --git a/nar-bundles/framework-bundle/framework/pom.xml b/nar-bundles/framework-bundle/framework/pom.xml index 65fdaf1c85..f8ccdd078b 100644 --- a/nar-bundles/framework-bundle/framework/pom.xml +++ b/nar-bundles/framework-bundle/framework/pom.xml @@ -35,6 +35,7 @@ cluster-protocol cluster-web cluster + file-authorization-provider cluster-authorization-provider user-actions administration diff --git a/nar-bundles/framework-bundle/framework/resources/pom.xml b/nar-bundles/framework-bundle/framework/resources/pom.xml index 9c984e72bb..ea2552976a 100644 --- a/nar-bundles/framework-bundle/framework/resources/pom.xml +++ b/nar-bundles/framework-bundle/framework/resources/pom.xml @@ -29,6 +29,9 @@ maven-assembly-plugin + + true + make shared resource diff --git a/nar-bundles/framework-bundle/framework/runtime/pom.xml b/nar-bundles/framework-bundle/framework/runtime/pom.xml index af4b404a2c..e1937293e8 100644 --- a/nar-bundles/framework-bundle/framework/runtime/pom.xml +++ b/nar-bundles/framework-bundle/framework/runtime/pom.xml @@ -28,6 +28,10 @@ org.apache.nifi nifi-nar + + org.apache.nifi + nifi-properties + org.slf4j jul-to-slf4j diff --git a/nar-bundles/framework-bundle/framework/site-to-site/pom.xml b/nar-bundles/framework-bundle/framework/site-to-site/pom.xml index ce18ec73de..30cd325f61 100644 --- a/nar-bundles/framework-bundle/framework/site-to-site/pom.xml +++ b/nar-bundles/framework-bundle/framework/site-to-site/pom.xml @@ -41,6 +41,10 @@ org.apache.nifi nifi-api + + org.apache.nifi + nifi-properties + org.apache.nifi core-api @@ -68,7 +72,6 @@ org.apache.httpcomponents httpclient - 4.3.6 org.apache.nifi @@ -77,7 +80,6 @@ org.mockito mockito-core - 1.10.8 test diff --git a/nar-bundles/framework-bundle/framework/web/nifi-jetty/pom.xml b/nar-bundles/framework-bundle/framework/web/nifi-jetty/pom.xml index bde025b463..3cdeb07a64 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-jetty/pom.xml +++ b/nar-bundles/framework-bundle/framework/web/nifi-jetty/pom.xml @@ -28,86 +28,107 @@ org.apache.nifi nifi-api + compile org.apache.nifi nifi-runtime + compile org.apache.nifi nifi-nar + compile org.apache.nifi nifi-security + compile org.eclipse.jetty jetty-server + compile org.eclipse.jetty jetty-servlet + compile org.eclipse.jetty jetty-webapp + compile org.eclipse.jetty jetty-servlets + compile org.eclipse.jetty jetty-jsp + compile com.sun.jersey jersey-client + compile com.sun.jersey.contribs jersey-spring + compile com.sun.jersey.contribs jersey-multipart + compile com.sun.jersey jersey-server + compile com.sun.jersey jersey-json + compile org.aspectj aspectjweaver + compile cglib cglib-nodep + compile org.apache.nifi client-dto + compile org.apache.nifi custom-ui-utilities + compile org.apache.nifi web-security + compile org.apache.nifi nifi-web-utils + compile org.apache.nifi web-optimistic-locking + compile org.apache.nifi @@ -132,6 +153,7 @@ org.apache.nifi framework-cluster + compile 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 f4ec6b10dc..e7cb0e7c13 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 @@ -115,6 +115,7 @@ org.apache.nifi client-dto + ${project.version} sources provided true @@ -131,13 +132,15 @@ org.apache.nifi framework-cluster-web - ${project.version} provided org.apache.nifi nifi-api - provided + + + org.apache.nifi + nifi-nar org.apache.nifi @@ -295,7 +298,6 @@ org.apache.nifi volatile-provenance-repository - 0.0.1-SNAPSHOT test diff --git a/nar-bundles/framework-bundle/framework/web/pom.xml b/nar-bundles/framework-bundle/framework/web/pom.xml index 8ef5780548..12fda97cae 100644 --- a/nar-bundles/framework-bundle/framework/web/pom.xml +++ b/nar-bundles/framework-bundle/framework/web/pom.xml @@ -40,17 +40,6 @@ web-optimistic-locking ${project.version} - - org.apache.nifi - client-dto - ${project.version} - sources - - - org.apache.nifi - custom-ui-utilities - ${project.version} - org.apache.nifi web-security diff --git a/nar-bundles/framework-bundle/nar/pom.xml b/nar-bundles/framework-bundle/nar/pom.xml index d53c9e231e..5d28c6dcd2 100644 --- a/nar-bundles/framework-bundle/nar/pom.xml +++ b/nar-bundles/framework-bundle/nar/pom.xml @@ -62,52 +62,5 @@ provided - - diff --git a/nar-bundles/framework-bundle/pom.xml b/nar-bundles/framework-bundle/pom.xml index cf5b6b6d28..daa5256870 100644 --- a/nar-bundles/framework-bundle/pom.xml +++ b/nar-bundles/framework-bundle/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi - nar-container-common + nar-bundle-parent 0.0.1-SNAPSHOT @@ -31,14 +31,7 @@ framework nar - - 0.0.1-SNAPSHOT - 1.3.176 - 1.9.2 - 1.18.2 - 4.1.2.RELEASE - 3.2.5.RELEASE - + @@ -48,13 +41,13 @@ org.apache.nifi - remote-communications-utils - 0.0.1-SNAPSHOT + framework-cluster-web + ${project.version} org.apache.nifi file-authorization-provider - 0.0.1-SNAPSHOT + ${project.version} org.apache.nifi @@ -66,11 +59,6 @@ framework-cluster ${project.version} - - org.apache.nifi - nifi-nar - ${project.version} - org.apache.nifi nifi-runtime @@ -86,16 +74,6 @@ nifi-security ${project.version} - - org.apache.nifi - nifi-properties - 0.0.1-SNAPSHOT - - - org.apache.nifi - data-provenance-utils - 0.0.1-SNAPSHOT - org.apache.nifi core-api @@ -131,352 +109,6 @@ web-optimistic-locking ${project.version} - - org.apache.nifi - nifi-api - ${nifi.api.version} - - - org.apache.nifi - nifi-expression-language - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-core-flowfile-attributes - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-security-utils - 0.0.1-SNAPSHOT - - - org.bouncycastle - bcprov-jdk16 - 1.46 - - - com.google.guava - guava - 18.0 - - - org.apache.nifi - nifi-utils - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-file-utils - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-stream-utils - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-web-utils - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-socket-utils - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-logging-utils - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-mock - 0.0.1-SNAPSHOT - test - - - com.h2database - h2 - ${h2.version} - - - org.jasypt - jasypt - ${jasypt.version} - - - com.sun.jersey - jersey-server - ${jersey.version} - - - com.sun.jersey - jersey-client - ${jersey.version} - - - com.sun.jersey - jersey-json - ${jersey.version} - - - javax.mail - mail - 1.4.7 - - - stax - stax-api - 1.0.1 - - - org.quartz-scheduler - quartz - 2.2.1 - - - com.sun.jersey.contribs - jersey-spring - ${jersey.version} - - - org.springframework - spring-web - - - org.springframework - spring-core - - - org.springframework - spring-aop - - - org.springframework - spring-context - - - org.springframework - spring-beans - - - - - com.sun.jersey.contribs - jersey-multipart - ${jersey.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-context-support - ${spring.version} - - - org.springframework - spring-expression - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - - commons-logging - commons-logging - - - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-jdbc - ${spring.version} - - - org.springframework.security - spring-security-core - ${spring.security.version} - - - org.springframework - spring-web - - - org.springframework - spring-core - - - org.springframework - spring-expression - - - org.springframework - spring-aop - - - org.springframework - spring-context - - - org.springframework - spring-beans - - - - - org.springframework.security - spring-security-web - ${spring.security.version} - - - org.springframework - spring-core - - - org.springframework - spring-tx - - - org.springframework - spring-jdbc - - - org.springframework - spring-expression - - - org.springframework - spring-web - - - org.springframework - spring-aop - - - org.springframework - spring-context - - - org.springframework - spring-beans - - - - - org.springframework.security - spring-security-acl - ${spring.security.version} - - - org.springframework - spring-core - - - org.springframework - spring-tx - - - org.springframework - spring-jdbc - - - org.springframework - spring-aop - - - org.springframework - spring-context - - - - - org.springframework.security - spring-security-config - ${spring.security.version} - - - org.springframework - spring-core - - - org.springframework - spring-aop - - - org.springframework - spring-context - - - org.springframework - spring-beans - - - - - org.aspectj - aspectjweaver - 1.8.4 - - - cglib - cglib-nodep - 3.1 - - - org.apache.commons - commons-lang3 - 3.3.2 - - - commons-io - commons-io - 2.4 - - - org.apache.commons - commons-collections4 - 4.0 - - - commons-net - commons-net - 3.3 - - - org.apache.commons - commons-pool2 - 2.2 - diff --git a/nar-bundles/hadoop-bundle/hdfs-processors/pom.xml b/nar-bundles/hadoop-bundle/hdfs-processors/pom.xml index 369efe76ad..9a4bf2b06e 100644 --- a/nar-bundles/hadoop-bundle/hdfs-processors/pom.xml +++ b/nar-bundles/hadoop-bundle/hdfs-processors/pom.xml @@ -46,12 +46,6 @@ org.apache.nifi nifi-stream-utils - - - org.apache.hadoop hadoop-common @@ -62,13 +56,11 @@ hadoop-hdfs provided - org.apache.nifi nifi-mock test - commons-io commons-io diff --git a/nar-bundles/hadoop-bundle/nar/pom.xml b/nar-bundles/hadoop-bundle/nar/pom.xml index 481de92a1d..426ca86e41 100644 --- a/nar-bundles/hadoop-bundle/nar/pom.xml +++ b/nar-bundles/hadoop-bundle/nar/pom.xml @@ -22,6 +22,7 @@ hadoop-nar + 0.0.1-SNAPSHOT nar Hadoop NAR @@ -35,7 +36,6 @@ org.apache.nifi hdfs-processors - ${project.version} diff --git a/nar-bundles/hadoop-bundle/pom.xml b/nar-bundles/hadoop-bundle/pom.xml index caf23de87a..1a6a160f28 100644 --- a/nar-bundles/hadoop-bundle/pom.xml +++ b/nar-bundles/hadoop-bundle/pom.xml @@ -1,23 +1,23 @@ - + 4.0.0 org.apache.nifi - nar-container-common + nar-bundle-parent 0.0.1-SNAPSHOT @@ -32,75 +32,15 @@ hdfs-processors nar - - - - 2.5.2 - - + org.apache.nifi - nifi-core-flowfile-attributes - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-processor-utils - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-stream-utils - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-utils - 0.0.1-SNAPSHOT - - - - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - org.apache.hadoop - hadoop-hdfs - ${hadoop.version} - - - - org.apache.nifi - nifi-mock - 0.0.1-SNAPSHOT - test - - - org.apache.nifi - flowfile-packager - 0.0.1-SNAPSHOT - - - org.apache.nifi - hadoop-libraries-nar - 0.0.1-SNAPSHOT - nar - - - commons-io - commons-io - 2.4 + hdfs-processors + ${project.version} + diff --git a/nar-bundles/hadoop-libraries-bundle/nar/pom.xml b/nar-bundles/hadoop-libraries-bundle/nar/pom.xml index feb4eac10f..3e54051403 100644 --- a/nar-bundles/hadoop-libraries-bundle/nar/pom.xml +++ b/nar-bundles/hadoop-libraries-bundle/nar/pom.xml @@ -33,13 +33,6 @@ standard-services-api-nar nar - - - - org.apache.hadoop hadoop-common diff --git a/nar-bundles/hadoop-libraries-bundle/pom.xml b/nar-bundles/hadoop-libraries-bundle/pom.xml index bf813469ce..15055d896a 100644 --- a/nar-bundles/hadoop-libraries-bundle/pom.xml +++ b/nar-bundles/hadoop-libraries-bundle/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi - standard-services-api-bundle + nar-bundle-parent 0.0.1-SNAPSHOT @@ -29,32 +29,8 @@ Hadoop Libraries Bundle A bundle which provides the Hadoop libraries - - nar - - - - - - - org.apache.hadoop - hadoop-common - 2.5.2 - - - org.apache.hadoop - hadoop-hdfs - 2.5.2 - - - - diff --git a/nar-bundles/jetty-bundle/pom.xml b/nar-bundles/jetty-bundle/pom.xml index a4fa57afc7..6586f092ec 100644 --- a/nar-bundles/jetty-bundle/pom.xml +++ b/nar-bundles/jetty-bundle/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi - nar-container-common + nar-bundle-parent 0.0.1-SNAPSHOT diff --git a/nar-bundles/monitor-threshold-bundle/nar/pom.xml b/nar-bundles/monitor-threshold-bundle/nar/pom.xml index 8323a05952..480b5ee816 100644 --- a/nar-bundles/monitor-threshold-bundle/nar/pom.xml +++ b/nar-bundles/monitor-threshold-bundle/nar/pom.xml @@ -21,6 +21,7 @@ monitor-threshold-nar + 0.0.1-SNAPSHOT MonitorThreshold-NAR nar @@ -28,13 +29,11 @@ org.apache.nifi monitor-threshold-processor - ${project.version} org.apache.nifi monitor-threshold-ui war - ${project.version} diff --git a/nar-bundles/monitor-threshold-bundle/pom.xml b/nar-bundles/monitor-threshold-bundle/pom.xml index 9914b35703..6cb3af282a 100644 --- a/nar-bundles/monitor-threshold-bundle/pom.xml +++ b/nar-bundles/monitor-threshold-bundle/pom.xml @@ -16,7 +16,7 @@ 4.0.0 org.apache.nifi - nar-container-common + nar-bundle-parent 0.0.1-SNAPSHOT @@ -35,76 +35,16 @@ - org.apache.nifi - nifi-file-utils - 0.0.1-SNAPSHOT - - - - org.apache.nifi - nifi-stream-utils - 0.0.1-SNAPSHOT + monitor-threshold-processor + ${project.version} org.apache.nifi - nifi-processor-utils - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-utils - 0.0.1-SNAPSHOT - - - - - com.sun.jersey - jersey-client - 1.18.2 - - - com.sun.jersey - jersey-server - 1.18.2 - - - com.sun.jersey - jersey-core - 1.18.2 - - - com.sun.jersey - jersey-json - 1.18.2 - - - com.sun.jersey - jersey-servlet - 1.18.2 - - - junit - junit - 4.11 - test - - - org.apache.commons - commons-lang3 - 3.3.2 - - - org.apache.nifi - custom-ui-utilities - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-mock - 0.0.1-SNAPSHOT - test + monitor-threshold-ui + war + ${project.version} diff --git a/nar-bundles/nar-container-common/pom.xml b/nar-bundles/nar-container-common/pom.xml deleted file mode 100644 index a9fdf6a128..0000000000 --- a/nar-bundles/nar-container-common/pom.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - 4.0.0 - - org.apache.nifi - nifi-parent - 0.0.1-SNAPSHOT - - - nar-container-common - 0.0.1-SNAPSHOT - NiFi NAR Container Common - pom - NiFi: NAR Container Common - these are the libraries that NAR bundles can refer to as provided because the container must provide them. - - - 9.2.5.v20141112 - - - - - - org.apache.nifi - nifi-api - [0.0.1-SNAPSHOT,1.0.0-SNAPSHOT) - provided - - - org.apache.nifi - nifi-runtime - [0.0.1-SNAPSHOT,1.0.0-SNAPSHOT) - provided - - - org.apache.nifi - nifi-nar - [0.0.1-SNAPSHOT,1.0.0-SNAPSHOT) - provided - - - org.apache.nifi - nifi-properties - [0.0.1-SNAPSHOT,1.0.0-SNAPSHOT) - provided - - - org.eclipse.jetty - jetty-server - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-webapp - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-servlets - ${jetty.version} - provided - - - org.eclipse.jetty - jetty-jsp - ${jetty.version} - provided - - - javax.servlet.jsp - javax.servlet.jsp-api - 2.3.1 - provided - - - javax.el - javax.el-api - 3.0.0 - provided - - - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api - 1.2.1 - provided - - - javax.servlet - javax.servlet-api - 3.1.0 - provided - - - org.eclipse.jetty.toolchain - jetty-jsp-jdt - 2.3.3 - provided - - - - diff --git a/nar-bundles/persistent-provenance-repository-bundle/nar/pom.xml b/nar-bundles/persistent-provenance-repository-bundle/nar/pom.xml index dd67fe93b3..b58ecb8c98 100644 --- a/nar-bundles/persistent-provenance-repository-bundle/nar/pom.xml +++ b/nar-bundles/persistent-provenance-repository-bundle/nar/pom.xml @@ -1,36 +1,36 @@ - - 4.0.0 + + 4.0.0 - - org.apache.nifi - persistent-provenance-repository-bundle - 0.0.1-SNAPSHOT - + + org.apache.nifi + persistent-provenance-repository-bundle + 0.0.1-SNAPSHOT + - persistent-provenance-repository-nar - nar + persistent-provenance-repository-nar + 0.0.1-SNAPSHOT + nar - Persistent Provenance Repository Nar + Persistent Provenance Repository Nar - - - org.apache.nifi - persistent-provenance-repository - ${project.version} - - + + + org.apache.nifi + persistent-provenance-repository + + diff --git a/nar-bundles/persistent-provenance-repository-bundle/pom.xml b/nar-bundles/persistent-provenance-repository-bundle/pom.xml index c0c9f56402..7dc3f3463e 100644 --- a/nar-bundles/persistent-provenance-repository-bundle/pom.xml +++ b/nar-bundles/persistent-provenance-repository-bundle/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi - nar-container-common + nar-bundle-parent 0.0.1-SNAPSHOT @@ -30,52 +30,12 @@ persistent-provenance-repository nar - - - 4.10.2 - - org.apache.nifi - data-provenance-utils - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-utils - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-stream-utils - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-properties - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-core-flowfile-attributes - 0.0.1-SNAPSHOT - - - org.apache.lucene - lucene-core - ${lucene.version} - - - org.apache.lucene - lucene-analyzers-common - ${lucene.version} - - - org.apache.lucene - lucene-queryparser - ${lucene.version} + persistent-provenance-repository + ${project.version} diff --git a/nar-bundles/pom.xml b/nar-bundles/pom.xml new file mode 100644 index 0000000000..9daf0ba788 --- /dev/null +++ b/nar-bundles/pom.xml @@ -0,0 +1,120 @@ + + + + 4.0.0 + + + org.apache.nifi + nifi-parent + 0.0.1-SNAPSHOT + + + org.apache.nifi + nar-bundle-parent + 0.0.1-SNAPSHOT + pom + NiFi :: Nar Bundles Parent + + + framework-bundle + hadoop-bundle + hadoop-libraries-bundle + jetty-bundle + monitor-threshold-bundle + persistent-provenance-repository-bundle + standard-bundle + standard-services + update-attribute-bundle + volatile-provenance-repository-bundle + + + + + org.apache.nifi + load-distribution-service + ${project.version} + test + + + org.apache.nifi + distributed-cache-client-service + ${project.version} + + + org.apache.nifi + distributed-cache-client-service-api + ${project.version} + + + org.apache.nifi + ssl-context-service-api + ${project.version} + + + org.apache.nifi + load-distribution-service-api + ${project.version} + + + org.apache.nifi + distributed-cache-protocol + ${project.version} + + + org.apache.nifi + distributed-cache-server + ${project.version} + + + org.apache.nifi + ssl-context-service + ${project.version} + + + org.apache.nifi + volatile-provenance-repository + ${project.version} + test + + + + org.apache.nifi + nifi-api + [0.0.1-SNAPSHOT,1.0.0-SNAPSHOT) + provided + + + org.apache.nifi + nifi-runtime + [0.0.1-SNAPSHOT,1.0.0-SNAPSHOT) + provided + + + org.apache.nifi + nifi-nar + [0.0.1-SNAPSHOT,1.0.0-SNAPSHOT) + provided + + + org.apache.nifi + nifi-properties + [0.0.1-SNAPSHOT,1.0.0-SNAPSHOT) + provided + + + + diff --git a/nar-bundles/standard-bundle/jms-processors/pom.xml b/nar-bundles/standard-bundle/jms-processors/pom.xml index c29e5a5416..7dae21d15f 100644 --- a/nar-bundles/standard-bundle/jms-processors/pom.xml +++ b/nar-bundles/standard-bundle/jms-processors/pom.xml @@ -38,21 +38,17 @@ org.apache.nifi nifi-stream-utils - javax.jms javax.jms-api - 2.0 org.apache.activemq activemq-client - 5.10.0 org.hornetq hornetq-jms-client - 2.4.5.Final org.apache.nifi diff --git a/nar-bundles/standard-bundle/nar/pom.xml b/nar-bundles/standard-bundle/nar/pom.xml index 144588aec9..06f972753e 100644 --- a/nar-bundles/standard-bundle/nar/pom.xml +++ b/nar-bundles/standard-bundle/nar/pom.xml @@ -22,6 +22,7 @@ nifi-standard-nar + 0.0.1-SNAPSHOT NiFi Standard NAR nar NiFi Standard Extensions NAR @@ -35,27 +36,22 @@ org.apache.nifi standard-processors - ${project.version} org.apache.nifi standard-prioritizers - ${project.version} org.apache.nifi standard-reporting-tasks - ${project.version} org.apache.nifi standard-ganglia-reporter - ${project.version} org.apache.nifi jms-processors - ${project.version} diff --git a/nar-bundles/standard-bundle/pom.xml b/nar-bundles/standard-bundle/pom.xml index 92c9e1d43a..9903666ddc 100644 --- a/nar-bundles/standard-bundle/pom.xml +++ b/nar-bundles/standard-bundle/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi - standard-services-api-bundle + nar-bundle-parent 0.0.1-SNAPSHOT @@ -36,70 +36,36 @@ standard-reporting-tasks nar - - + org.apache.nifi - nifi-stream-utils - 0.0.1-SNAPSHOT + standard-processors + ${project.version} org.apache.nifi - nifi-processor-utils - 0.0.1-SNAPSHOT + standard-prioritizers + ${project.version} org.apache.nifi - nifi-utils - 0.0.1-SNAPSHOT + standard-reporting-tasks + ${project.version} org.apache.nifi - flowfile-packager - 0.0.1-SNAPSHOT + standard-ganglia-reporter + ${project.version} org.apache.nifi - naive-search-ring-buffer - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-search-utils - 0.0.1-SNAPSHOT - - - - org.apache.nifi - nifi-core-flowfile-attributes - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-socket-utils - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-mock - 0.0.1-SNAPSHOT - test - - - org.apache.nifi - load-distribution-service - 0.0.1-SNAPSHOT - test - - - org.apache.nifi - distributed-cache-client-service - [0.0.1-SNAPSHOT,1.0.0-SNAPSHOT) - test - + jms-processors + ${project.version} + + diff --git a/nar-bundles/standard-bundle/standard-ganglia-reporter/pom.xml b/nar-bundles/standard-bundle/standard-ganglia-reporter/pom.xml index 07967de69b..4e7a5a27a2 100644 --- a/nar-bundles/standard-bundle/standard-ganglia-reporter/pom.xml +++ b/nar-bundles/standard-bundle/standard-ganglia-reporter/pom.xml @@ -42,7 +42,6 @@ com.yammer.metrics metrics-ganglia - 2.2.0 org.apache.nifi diff --git a/nar-bundles/standard-bundle/standard-processors/pom.xml b/nar-bundles/standard-bundle/standard-processors/pom.xml index e2fa165d99..244f5246f5 100644 --- a/nar-bundles/standard-bundle/standard-processors/pom.xml +++ b/nar-bundles/standard-bundle/standard-processors/pom.xml @@ -63,46 +63,37 @@ org.apache.nifi distributed-cache-client-service-api - commons-io commons-io - 2.4 com.sun.jersey jersey-client - 1.12 com.sun.jersey jersey-server - 1.12 commons-net commons-net - 3.3 org.apache.commons commons-compress - 1.9 - commons-lang - commons-lang - 2.6 + org.apache.commons + commons-lang3 org.bouncycastle bcprov-jdk16 - 1.46 commons-codec commons-codec - 1.10 org.apache.nifi @@ -111,12 +102,10 @@ com.jcraft jsch - 0.1.51 - + com.jcraft jzlib - 1.1.1 org.eclipse.jetty @@ -129,27 +118,22 @@ org.apache.httpcomponents httpclient - 4.3.6 javax.mail mail - 1.4.7 com.github.jponge lzma-java - 1.3 org.tukaani xz - 1.5 net.sf.saxon Saxon-HE - 9.6.0-2 @@ -157,7 +141,6 @@ nifi-mock test - org.apache.nifi nifi-socket-utils @@ -166,26 +149,17 @@ org.apache.nifi load-distribution-service-api - org.apache.nifi distributed-cache-client-service - joda-time joda-time - 2.5 org.apache.nifi ssl-context-service - 0.0.1-SNAPSHOT test diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/DetectDuplicate.java b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/DetectDuplicate.java index 2d97bf128b..1fea36d2e2 100644 --- a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/DetectDuplicate.java +++ b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/DetectDuplicate.java @@ -46,7 +46,7 @@ import org.apache.nifi.processor.annotation.Tags; import org.apache.nifi.processor.exception.ProcessException; import org.apache.nifi.processor.util.StandardValidators; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; @EventDriven @SupportsBatching diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/DistributeLoad.java b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/DistributeLoad.java index 2973756f89..a755b1a22f 100644 --- a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/DistributeLoad.java +++ b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/DistributeLoad.java @@ -51,7 +51,7 @@ import org.apache.nifi.processor.annotation.Tags; import org.apache.nifi.processor.annotation.TriggerWhenAnyDestinationAvailable; import org.apache.nifi.processor.util.StandardValidators; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; @EventDriven @SideEffectFree diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateRegularExpression.java b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateRegularExpression.java index ae4c20faf6..704ec33f0e 100644 --- a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateRegularExpression.java +++ b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateRegularExpression.java @@ -47,7 +47,7 @@ import org.apache.nifi.processor.annotation.Tags; import org.apache.nifi.processor.io.InputStreamCallback; import org.apache.nifi.processor.util.StandardValidators; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; @EventDriven @SideEffectFree diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java index a67a92eb33..f430199e6b 100644 --- a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java +++ b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteStreamCommand.java @@ -56,7 +56,7 @@ import org.apache.nifi.processor.io.OutputStreamCallback; import org.apache.nifi.processor.util.StandardValidators; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** *

diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java index c899cf53de..5fc7e5a592 100644 --- a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java +++ b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/HashAttribute.java @@ -45,7 +45,7 @@ import org.apache.nifi.processor.annotation.Tags; import org.apache.nifi.processor.util.StandardValidators; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** *

diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java index 7ed1bd424a..febb37b3dc 100644 --- a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java +++ b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.processors.standard; -import static org.apache.commons.lang.StringUtils.*; +import static org.apache.commons.lang3.StringUtils.*; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -62,7 +62,7 @@ import org.apache.nifi.processor.util.StandardValidators; import org.apache.nifi.ssl.SSLContextService; import org.apache.nifi.ssl.SSLContextService.ClientAuth; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenUDP.java b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenUDP.java index c4c453386a..65b3c666fa 100644 --- a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenUDP.java +++ b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenUDP.java @@ -69,7 +69,7 @@ import org.apache.nifi.processor.util.StandardValidators; import org.apache.nifi.processors.standard.util.UDPStreamConsumer; import org.apache.nifi.util.Tuple; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** *

diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java index ead786f633..9708c49b9c 100644 --- a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java +++ b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java @@ -44,7 +44,7 @@ import org.apache.nifi.processor.io.InputStreamCallback; import org.apache.nifi.processor.util.StandardValidators; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; @EventDriven @SideEffectFree diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java index 2c1526bc09..0cce0f2b2b 100644 --- a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java +++ b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ReplaceTextWithMapping.java @@ -62,7 +62,7 @@ import org.apache.nifi.processor.io.StreamCallback; import org.apache.nifi.processor.util.StandardValidators; import org.apache.nifi.util.StopWatch; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; @EventDriven @SideEffectFree diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java index b51b7e9d4d..5f0993f458 100644 --- a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java +++ b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java @@ -49,7 +49,7 @@ import org.apache.nifi.processor.util.StandardValidators; import org.apache.nifi.processors.standard.util.XmlElementNotifier; import org.apache.nifi.util.BooleanHolder; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.StringEscapeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.Attributes; diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java index 2d4f44592f..d78c139c57 100644 --- a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java +++ b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java @@ -58,7 +58,7 @@ import org.apache.nifi.util.FlowFileUnpackagerV2; import org.apache.nifi.util.FlowFileUnpackagerV3; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; @Path(ListenHTTP.URI) public class ListenHTTPServlet extends HttpServlet { diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java index e8f9259b5c..f0802a8fc7 100644 --- a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java +++ b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/util/UDPStreamConsumer.java @@ -35,9 +35,9 @@ import org.apache.nifi.logging.ProcessorLog; import org.apache.nifi.processor.ProcessSession; import org.apache.nifi.processor.io.OutputStreamCallback; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; /** * diff --git a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java b/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java index 8ee22a13b6..4fae6edf55 100644 --- a/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java +++ b/nar-bundles/standard-bundle/standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java @@ -37,7 +37,7 @@ import org.apache.nifi.util.MockControllerServiceInitializationContext; import org.apache.nifi.util.TestRunner; import org.apache.nifi.util.TestRunners; -import org.apache.commons.lang.SerializationException; +import org.apache.commons.lang3.SerializationException; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/nar-bundles/standard-bundle/standard-reporting-tasks/pom.xml b/nar-bundles/standard-bundle/standard-reporting-tasks/pom.xml index 924c64c5ac..605614bb0d 100644 --- a/nar-bundles/standard-bundle/standard-reporting-tasks/pom.xml +++ b/nar-bundles/standard-bundle/standard-reporting-tasks/pom.xml @@ -51,16 +51,9 @@ nifi-mock test - - junit - junit - 4.9 - test - org.mockito mockito-all - 1.9.5 test diff --git a/nar-bundles/standard-services-api-bundle/pom.xml b/nar-bundles/standard-services-api-bundle/pom.xml deleted file mode 100644 index 27c0545cb5..0000000000 --- a/nar-bundles/standard-services-api-bundle/pom.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - 4.0.0 - - org.apache.nifi - nar-container-common - 0.0.1-SNAPSHOT - - - standard-services-api-bundle - 0.0.1-SNAPSHOT - pom - - Standard Services API Bundle - - - 0.0.1-SNAPSHOT - - - - distributed-cache-client-service-api - ssl-context-service-api - load-distribution-service-api - standard-services-api-nar - - - - - - org.apache.nifi - standard-services-api-nar - ${standard.services.api.version} - nar - - - org.apache.nifi - nifi-security-utils - 0.0.1-SNAPSHOT - - - org.apache.nifi - ssl-context-service-api - ${standard.services.api.version} - provided - - - org.apache.nifi - distributed-cache-client-service-api - ${standard.services.api.version} - provided - - - org.apache.nifi - load-distribution-service-api - ${standard.services.api.version} - provided - - - - diff --git a/nar-bundles/standard-services-api-bundle/standard-services-api-nar/pom.xml b/nar-bundles/standard-services-api-bundle/standard-services-api-nar/pom.xml deleted file mode 100644 index bb83a8ea4f..0000000000 --- a/nar-bundles/standard-services-api-bundle/standard-services-api-nar/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - 4.0.0 - - org.apache.nifi - standard-services-api-bundle - 0.0.1-SNAPSHOT - - - standard-services-api-nar - Standard Services API Nar - nar - - - - org.apache.nifi - ssl-context-service-api - compile - - - org.apache.nifi - distributed-cache-client-service-api - compile - - - org.apache.nifi - load-distribution-service-api - compile - - - diff --git a/nar-bundles/standard-services-api-bundle/distributed-cache-client-service-api/pom.xml b/nar-bundles/standard-services/distributed-cache-client-service-api/pom.xml similarity index 96% rename from nar-bundles/standard-services-api-bundle/distributed-cache-client-service-api/pom.xml rename to nar-bundles/standard-services/distributed-cache-client-service-api/pom.xml index 0f8040a33e..1a7241fde6 100644 --- a/nar-bundles/standard-services-api-bundle/distributed-cache-client-service-api/pom.xml +++ b/nar-bundles/standard-services/distributed-cache-client-service-api/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi - standard-services-api-bundle + standard-services-parent 0.0.1-SNAPSHOT diff --git a/nar-bundles/standard-services-api-bundle/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/Deserializer.java b/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/Deserializer.java similarity index 100% rename from nar-bundles/standard-services-api-bundle/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/Deserializer.java rename to nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/Deserializer.java diff --git a/nar-bundles/standard-services-api-bundle/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClient.java b/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClient.java similarity index 100% rename from nar-bundles/standard-services-api-bundle/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClient.java rename to nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClient.java diff --git a/nar-bundles/standard-services-api-bundle/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClient.java b/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClient.java similarity index 100% rename from nar-bundles/standard-services-api-bundle/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClient.java rename to nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClient.java diff --git a/nar-bundles/standard-services-api-bundle/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/Serializer.java b/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/Serializer.java similarity index 100% rename from nar-bundles/standard-services-api-bundle/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/Serializer.java rename to nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/Serializer.java diff --git a/nar-bundles/standard-services-api-bundle/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/exception/DeserializationException.java b/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/exception/DeserializationException.java similarity index 100% rename from nar-bundles/standard-services-api-bundle/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/exception/DeserializationException.java rename to nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/exception/DeserializationException.java diff --git a/nar-bundles/standard-services-api-bundle/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/exception/SerializationException.java b/nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/exception/SerializationException.java similarity index 100% rename from nar-bundles/standard-services-api-bundle/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/exception/SerializationException.java rename to nar-bundles/standard-services/distributed-cache-client-service-api/src/main/java/org/apache/nifi/distributed/cache/client/exception/SerializationException.java diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/pom.xml b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/pom.xml new file mode 100644 index 0000000000..a251393f86 --- /dev/null +++ b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/pom.xml @@ -0,0 +1,60 @@ + + + 4.0.0 + + + org.apache.nifi + distributed-cache-services-bundle + 0.0.1-SNAPSHOT + + + distributed-cache-client-service + jar + + Distributed Cache Client Service + Provides a Client for interfacing with a Distributed Cache + + + + org.apache.nifi + nifi-api + + + org.apache.nifi + distributed-cache-client-service-api + + + org.apache.nifi + distributed-cache-protocol + + + org.apache.nifi + remote-communications-utils + + + org.apache.nifi + nifi-processor-utils + + + org.apache.nifi + nifi-stream-utils + + + org.apache.nifi + ssl-context-service-api + + + diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/CommsSession.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/CommsSession.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/CommsSession.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/CommsSession.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClientService.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClientService.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClientService.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedMapCacheClientService.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClientService.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClientService.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClientService.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/DistributedSetCacheClientService.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/SSLCommsSession.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/SSLCommsSession.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/SSLCommsSession.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/SSLCommsSession.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/StandardCommsSession.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/StandardCommsSession.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/StandardCommsSession.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/java/org/apache/nifi/distributed/cache/client/StandardCommsSession.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/docs/org.apache.nifi.distributed.cache.client.DistributedMapCacheClientService/index.html b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/docs/org.apache.nifi.distributed.cache.client.DistributedMapCacheClientService/index.html similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/docs/org.apache.nifi.distributed.cache.client.DistributedMapCacheClientService/index.html rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/docs/org.apache.nifi.distributed.cache.client.DistributedMapCacheClientService/index.html diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/docs/org.apache.nifi.distributed.cache.client.DistributedSetCacheClientService/index.html b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/docs/org.apache.nifi.distributed.cache.client.DistributedSetCacheClientService/index.html similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/docs/org.apache.nifi.distributed.cache.client.DistributedSetCacheClientService/index.html rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-client-service/src/main/resources/docs/org.apache.nifi.distributed.cache.client.DistributedSetCacheClientService/index.html diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-protocol/pom.xml b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-protocol/pom.xml new file mode 100644 index 0000000000..f6362616b7 --- /dev/null +++ b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-protocol/pom.xml @@ -0,0 +1,39 @@ + + + 4.0.0 + + org.apache.nifi + distributed-cache-services-bundle + 0.0.1-SNAPSHOT + + + distributed-cache-protocol + Distributed Cache Protocol + + + Defines the communications protocol that is used between clients and servers + for the Distributed Cache services + + + + + + org.apache.nifi + remote-communications-utils + + + + \ No newline at end of file diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/ProtocolHandshake.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/ProtocolHandshake.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/ProtocolHandshake.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/ProtocolHandshake.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/exception/HandshakeException.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/exception/HandshakeException.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/exception/HandshakeException.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-protocol/src/main/java/org/apache/nifi/distributed/cache/protocol/exception/HandshakeException.java diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/pom.xml b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/pom.xml new file mode 100644 index 0000000000..b57d2844a1 --- /dev/null +++ b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/pom.xml @@ -0,0 +1,78 @@ + + + 4.0.0 + + + org.apache.nifi + distributed-cache-services-bundle + 0.0.1-SNAPSHOT + + + distributed-cache-server + + Distributed Cache Server + Provides a Controller Service for hosting Distributed Caches + + + + org.apache.nifi + nifi-api + + + org.apache.nifi + distributed-cache-protocol + + + org.apache.nifi + remote-communications-utils + + + org.apache.nifi + nifi-processor-utils + + + org.apache.nifi + nifi-stream-utils + + + org.apache.nifi + ssl-context-service-api + + + org.apache.nifi + wali + + + org.apache.nifi + distributed-cache-client-service-api + test + + + org.apache.nifi + distributed-cache-client-service + test + + + org.apache.nifi + nifi-mock + test + + + org.apache.nifi + ssl-context-service + + + \ No newline at end of file diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/AbstractCacheServer.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/AbstractCacheServer.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/AbstractCacheServer.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/AbstractCacheServer.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/CacheRecord.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/CacheRecord.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/CacheRecord.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/CacheRecord.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/CacheServer.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/CacheServer.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/CacheServer.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/CacheServer.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/DistributedCacheServer.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/DistributedCacheServer.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/DistributedCacheServer.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/DistributedCacheServer.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/DistributedSetCacheServer.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/DistributedSetCacheServer.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/DistributedSetCacheServer.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/DistributedSetCacheServer.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/EvictionPolicy.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/EvictionPolicy.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/EvictionPolicy.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/EvictionPolicy.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/SetCacheServer.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/SetCacheServer.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/SetCacheServer.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/SetCacheServer.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/DistributedMapCacheServer.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/DistributedMapCacheServer.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/DistributedMapCacheServer.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/DistributedMapCacheServer.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCache.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCache.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCache.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCache.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheRecord.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheRecord.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheRecord.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheRecord.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheServer.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheServer.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheServer.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapCacheServer.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapPutResult.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapPutResult.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapPutResult.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/MapPutResult.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/PersistentMapCache.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/PersistentMapCache.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/PersistentMapCache.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/PersistentMapCache.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/SimpleMapCache.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/SimpleMapCache.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/SimpleMapCache.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/map/SimpleMapCache.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/PersistentSetCache.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/PersistentSetCache.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/PersistentSetCache.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/PersistentSetCache.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCache.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCache.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCache.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCache.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCacheRecord.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCacheRecord.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCacheRecord.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCacheRecord.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCacheResult.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCacheResult.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCacheResult.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SetCacheResult.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SimpleSetCache.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SimpleSetCache.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SimpleSetCache.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/java/org/apache/nifi/distributed/cache/server/set/SimpleSetCache.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/resources/docs/org.apache.nifi.distributed.cache.server.map.DistributedMapCacheServer/index.html b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/resources/docs/org.apache.nifi.distributed.cache.server.map.DistributedMapCacheServer/index.html similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/main/resources/docs/org.apache.nifi.distributed.cache.server.map.DistributedMapCacheServer/index.html rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/main/resources/docs/org.apache.nifi.distributed.cache.server.map.DistributedMapCacheServer/index.html diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/TestServerAndClient.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/TestServerAndClient.java similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/TestServerAndClient.java rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/TestServerAndClient.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/test/resources/localhost-ks.jks b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/resources/localhost-ks.jks similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/test/resources/localhost-ks.jks rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/resources/localhost-ks.jks diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/test/resources/localhost-ts.jks b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/resources/localhost-ts.jks similarity index 100% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-server/src/test/resources/localhost-ts.jks rename to nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/resources/localhost-ts.jks diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-services-nar/pom.xml b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-services-nar/pom.xml new file mode 100644 index 0000000000..8a34581bda --- /dev/null +++ b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-services-nar/pom.xml @@ -0,0 +1,47 @@ + + + 4.0.0 + + org.apache.nifi + distributed-cache-services-bundle + 0.0.1-SNAPSHOT + + + distributed-cache-services-nar + 0.0.1-SNAPSHOT + Distributed Cache Services NAR + nar + + + + org.apache.nifi + standard-services-api-nar + nar + + + org.apache.nifi + distributed-cache-client-service + + + org.apache.nifi + distributed-cache-protocol + + + org.apache.nifi + distributed-cache-server + + + diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/pom.xml b/nar-bundles/standard-services/distributed-cache-services-bundle/pom.xml new file mode 100644 index 0000000000..f4998310d7 --- /dev/null +++ b/nar-bundles/standard-services/distributed-cache-services-bundle/pom.xml @@ -0,0 +1,35 @@ + + + 4.0.0 + + + org.apache.nifi + standard-services-parent + 0.0.1-SNAPSHOT + + + distributed-cache-services-bundle + 0.0.1-SNAPSHOT + Distributed Cache Services Bundle + pom + + + distributed-cache-protocol + distributed-cache-client-service + distributed-cache-server + distributed-cache-services-nar + + \ No newline at end of file diff --git a/nar-bundles/standard-services-api-bundle/load-distribution-service-api/pom.xml b/nar-bundles/standard-services/load-distribution-service-api/pom.xml similarity index 94% rename from nar-bundles/standard-services-api-bundle/load-distribution-service-api/pom.xml rename to nar-bundles/standard-services/load-distribution-service-api/pom.xml index df8a40cde9..c939e95f80 100644 --- a/nar-bundles/standard-services-api-bundle/load-distribution-service-api/pom.xml +++ b/nar-bundles/standard-services/load-distribution-service-api/pom.xml @@ -17,11 +17,12 @@ org.apache.nifi - standard-services-api-bundle + standard-services-parent 0.0.1-SNAPSHOT load-distribution-service-api + 0.0.1-SNAPSHOT jar Load Distribution Service API diff --git a/nar-bundles/standard-services-api-bundle/load-distribution-service-api/src/main/java/org/apache/nifi/loading/LoadDistributionListener.java b/nar-bundles/standard-services/load-distribution-service-api/src/main/java/org/apache/nifi/loading/LoadDistributionListener.java similarity index 100% rename from nar-bundles/standard-services-api-bundle/load-distribution-service-api/src/main/java/org/apache/nifi/loading/LoadDistributionListener.java rename to nar-bundles/standard-services/load-distribution-service-api/src/main/java/org/apache/nifi/loading/LoadDistributionListener.java diff --git a/nar-bundles/standard-services-api-bundle/load-distribution-service-api/src/main/java/org/apache/nifi/loading/LoadDistributionService.java b/nar-bundles/standard-services/load-distribution-service-api/src/main/java/org/apache/nifi/loading/LoadDistributionService.java similarity index 100% rename from nar-bundles/standard-services-api-bundle/load-distribution-service-api/src/main/java/org/apache/nifi/loading/LoadDistributionService.java rename to nar-bundles/standard-services/load-distribution-service-api/src/main/java/org/apache/nifi/loading/LoadDistributionService.java diff --git a/nar-bundles/distributed-cache-services-bundle/distributed-cache-protocol/pom.xml b/nar-bundles/standard-services/pom.xml similarity index 56% rename from nar-bundles/distributed-cache-services-bundle/distributed-cache-protocol/pom.xml rename to nar-bundles/standard-services/pom.xml index bc612aeb86..047d642960 100644 --- a/nar-bundles/distributed-cache-services-bundle/distributed-cache-protocol/pom.xml +++ b/nar-bundles/standard-services/pom.xml @@ -1,4 +1,4 @@ - + - 4.0.0 - - org.apache.nifi - distributed-cache-services-bundle - 0.0.1-SNAPSHOT - + + 4.0.0 + + org.apache.nifi + nar-bundle-parent + 0.0.1-SNAPSHOT + - distributed-cache-protocol - Distributed Cache Protocol + standard-services-parent + 0.0.1-SNAPSHOT + pom - - Defines the communications protocol that is used between clients and servers - for the Distributed Cache services - + Standard Services Parent + + distributed-cache-client-service-api + distributed-cache-services-bundle + load-distribution-service-api + ssl-context-bundle + ssl-context-service-api + standard-services-api-nar + - - - org.apache.nifi - remote-communications-utils - - - - \ No newline at end of file + diff --git a/nar-bundles/ssl-context-bundle/nar/pom.xml b/nar-bundles/standard-services/ssl-context-bundle/nar/pom.xml similarity index 96% rename from nar-bundles/ssl-context-bundle/nar/pom.xml rename to nar-bundles/standard-services/ssl-context-bundle/nar/pom.xml index ac7a14522c..ec1e93791f 100644 --- a/nar-bundles/ssl-context-bundle/nar/pom.xml +++ b/nar-bundles/standard-services/ssl-context-bundle/nar/pom.xml @@ -21,6 +21,7 @@ ssl-context-service-nar + 0.0.1-SNAPSHOT SSL Context Services Nar nar @@ -33,7 +34,6 @@ org.apache.nifi ssl-context-service - ${project.version} \ No newline at end of file diff --git a/nar-bundles/ssl-context-bundle/pom.xml b/nar-bundles/standard-services/ssl-context-bundle/pom.xml similarity index 69% rename from nar-bundles/ssl-context-bundle/pom.xml rename to nar-bundles/standard-services/ssl-context-bundle/pom.xml index 1fa2a74ed4..305e242ef3 100644 --- a/nar-bundles/ssl-context-bundle/pom.xml +++ b/nar-bundles/standard-services/ssl-context-bundle/pom.xml @@ -16,7 +16,7 @@ 4.0.0 org.apache.nifi - standard-services-api-bundle + standard-services-parent 0.0.1-SNAPSHOT @@ -30,20 +30,5 @@ ssl-context-service nar - - - - - org.apache.nifi - nifi-mock - 0.0.1-SNAPSHOT - test - - - org.apache.nifi - nifi-processor-utils - 0.0.1-SNAPSHOT - - - + \ No newline at end of file diff --git a/nar-bundles/ssl-context-bundle/ssl-context-service/pom.xml b/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/pom.xml similarity index 98% rename from nar-bundles/ssl-context-bundle/ssl-context-service/pom.xml rename to nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/pom.xml index f667574061..9e18e572de 100644 --- a/nar-bundles/ssl-context-bundle/ssl-context-service/pom.xml +++ b/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/pom.xml @@ -46,6 +46,7 @@ org.apache.nifi nifi-mock + test diff --git a/nar-bundles/ssl-context-bundle/ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java b/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java similarity index 100% rename from nar-bundles/ssl-context-bundle/ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java rename to nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java diff --git a/nar-bundles/ssl-context-bundle/ssl-context-service/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService b/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService similarity index 100% rename from nar-bundles/ssl-context-bundle/ssl-context-service/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService rename to nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/resources/META-INF/services/org.apache.nifi.controller.ControllerService diff --git a/nar-bundles/ssl-context-bundle/ssl-context-service/src/main/resources/docs/org.apache.nifi.ssl.StandardSSLContextService/index.html b/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/resources/docs/org.apache.nifi.ssl.StandardSSLContextService/index.html similarity index 100% rename from nar-bundles/ssl-context-bundle/ssl-context-service/src/main/resources/docs/org.apache.nifi.ssl.StandardSSLContextService/index.html rename to nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/main/resources/docs/org.apache.nifi.ssl.StandardSSLContextService/index.html diff --git a/nar-bundles/ssl-context-bundle/ssl-context-service/src/test/java/org/apache/nifi/ssl/SSLContextServiceTest.java b/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/java/org/apache/nifi/ssl/SSLContextServiceTest.java similarity index 100% rename from nar-bundles/ssl-context-bundle/ssl-context-service/src/test/java/org/apache/nifi/ssl/SSLContextServiceTest.java rename to nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/java/org/apache/nifi/ssl/SSLContextServiceTest.java diff --git a/nar-bundles/ssl-context-bundle/ssl-context-service/src/test/java/org/apache/nifi/ssl/TestProcessor.java b/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/java/org/apache/nifi/ssl/TestProcessor.java similarity index 100% rename from nar-bundles/ssl-context-bundle/ssl-context-service/src/test/java/org/apache/nifi/ssl/TestProcessor.java rename to nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/java/org/apache/nifi/ssl/TestProcessor.java diff --git a/nar-bundles/ssl-context-bundle/ssl-context-service/src/test/resources/localhost-ks.jks b/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/resources/localhost-ks.jks similarity index 100% rename from nar-bundles/ssl-context-bundle/ssl-context-service/src/test/resources/localhost-ks.jks rename to nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/resources/localhost-ks.jks diff --git a/nar-bundles/ssl-context-bundle/ssl-context-service/src/test/resources/localhost-ts.jks b/nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/resources/localhost-ts.jks similarity index 100% rename from nar-bundles/ssl-context-bundle/ssl-context-service/src/test/resources/localhost-ts.jks rename to nar-bundles/standard-services/ssl-context-bundle/ssl-context-service/src/test/resources/localhost-ts.jks diff --git a/nar-bundles/standard-services-api-bundle/ssl-context-service-api/pom.xml b/nar-bundles/standard-services/ssl-context-service-api/pom.xml similarity index 96% rename from nar-bundles/standard-services-api-bundle/ssl-context-service-api/pom.xml rename to nar-bundles/standard-services/ssl-context-service-api/pom.xml index a25e62478e..e71cabbb2a 100644 --- a/nar-bundles/standard-services-api-bundle/ssl-context-service-api/pom.xml +++ b/nar-bundles/standard-services/ssl-context-service-api/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi - standard-services-api-bundle + standard-services-parent 0.0.1-SNAPSHOT diff --git a/nar-bundles/standard-services-api-bundle/ssl-context-service-api/src/main/java/org/apache/nifi/ssl/SSLContextService.java b/nar-bundles/standard-services/ssl-context-service-api/src/main/java/org/apache/nifi/ssl/SSLContextService.java similarity index 100% rename from nar-bundles/standard-services-api-bundle/ssl-context-service-api/src/main/java/org/apache/nifi/ssl/SSLContextService.java rename to nar-bundles/standard-services/ssl-context-service-api/src/main/java/org/apache/nifi/ssl/SSLContextService.java diff --git a/nar-bundles/standard-services/standard-services-api-nar/pom.xml b/nar-bundles/standard-services/standard-services-api-nar/pom.xml new file mode 100644 index 0000000000..18cb7c8385 --- /dev/null +++ b/nar-bundles/standard-services/standard-services-api-nar/pom.xml @@ -0,0 +1,45 @@ + + + 4.0.0 + + org.apache.nifi + standard-services-parent + 0.0.1-SNAPSHOT + + + standard-services-api-nar + 0.0.1-SNAPSHOT + Standard Services API Nar + nar + + + + org.apache.nifi + ssl-context-service-api + compile + + + org.apache.nifi + distributed-cache-client-service-api + compile + + + org.apache.nifi + load-distribution-service-api + compile + + + diff --git a/nar-bundles/update-attribute-bundle/nar/pom.xml b/nar-bundles/update-attribute-bundle/nar/pom.xml index dcebdd11bc..8a5a5c7df8 100644 --- a/nar-bundles/update-attribute-bundle/nar/pom.xml +++ b/nar-bundles/update-attribute-bundle/nar/pom.xml @@ -1,18 +1,18 @@ - + 4.0.0 org.apache.nifi @@ -28,24 +28,21 @@ - org.apache.nifi - nifi-processor-utils - + org.apache.nifi + nifi-processor-utils + org.apache.nifi update-attribute-processor - ${project.version} org.apache.nifi update-attribute-model - ${project.version} org.apache.nifi update-attribute-ui war - ${project.version} diff --git a/nar-bundles/update-attribute-bundle/pom.xml b/nar-bundles/update-attribute-bundle/pom.xml index bc43337277..18d16da47a 100644 --- a/nar-bundles/update-attribute-bundle/pom.xml +++ b/nar-bundles/update-attribute-bundle/pom.xml @@ -17,7 +17,7 @@ 4.0.0 org.apache.nifi - nar-container-common + nar-bundle-parent 0.0.1-SNAPSHOT @@ -26,7 +26,6 @@ Update Attribute Bundle pom - model processor @@ -38,31 +37,19 @@ org.apache.nifi - nifi-processor-utils - 0.0.1-SNAPSHOT + update-attribute-model + ${project.version} org.apache.nifi - nifi-expression-language - 0.0.1-SNAPSHOT + update-attribute-processor + ${project.version} org.apache.nifi - nifi-core-flowfile-attributes - 0.0.1-SNAPSHOT - - - org.apache.nifi - custom-ui-utilities - 0.0.1-SNAPSHOT - - - - - org.apache.nifi - nifi-mock - 0.0.1-SNAPSHOT - test + update-attribute-ui + war + ${project.version} diff --git a/nar-bundles/update-attribute-bundle/processor/pom.xml b/nar-bundles/update-attribute-bundle/processor/pom.xml index eba467a8af..5167de6ed5 100644 --- a/nar-bundles/update-attribute-bundle/processor/pom.xml +++ b/nar-bundles/update-attribute-bundle/processor/pom.xml @@ -28,7 +28,6 @@ org.apache.nifi update-attribute-model - ${project.version} org.slf4j diff --git a/nar-bundles/update-attribute-bundle/ui/pom.xml b/nar-bundles/update-attribute-bundle/ui/pom.xml index 8fab0e9028..458027f344 100644 --- a/nar-bundles/update-attribute-bundle/ui/pom.xml +++ b/nar-bundles/update-attribute-bundle/ui/pom.xml @@ -27,7 +27,6 @@ org.apache.nifi update-attribute-model - ${project.version} provided @@ -71,27 +70,22 @@ com.sun.jersey jersey-server - 1.12 com.sun.jersey jersey-core - 1.12 com.sun.jersey jersey-json - 1.12 com.sun.jersey jersey-servlet - 1.12 - commons-lang - commons-lang - 2.6 + org.apache.commons + commons-lang3 diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/api/RuleResource.java b/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/api/RuleResource.java index 6cb9b53eea..cb978cc2ff 100644 --- a/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/api/RuleResource.java +++ b/nar-bundles/update-attribute-bundle/ui/src/main/java/org/apache/nifi/update/attributes/api/RuleResource.java @@ -64,7 +64,7 @@ import org.apache.nifi.web.NiFiWebContextConfig; import org.apache.nifi.web.ProcessorInfo; import org.apache.nifi.web.Revision; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.sun.jersey.api.NotFoundException; import org.apache.nifi.update.attributes.FlowFilePolicy; diff --git a/nar-bundles/volatile-provenance-repository-bundle/nar/pom.xml b/nar-bundles/volatile-provenance-repository-bundle/nar/pom.xml index 8e85dd9c0b..bfa9daa001 100644 --- a/nar-bundles/volatile-provenance-repository-bundle/nar/pom.xml +++ b/nar-bundles/volatile-provenance-repository-bundle/nar/pom.xml @@ -17,11 +17,12 @@ org.apache.nifi - volatile-provenance-repository-bundle + volatile-provenance-repository-parent 0.0.1-SNAPSHOT volatile-provenance-repository-nar + 0.0.1-SNAPSHOT nar volatile-provenance-repository-nar @@ -30,7 +31,6 @@ org.apache.nifi volatile-provenance-repository - ${project.version} diff --git a/nar-bundles/volatile-provenance-repository-bundle/pom.xml b/nar-bundles/volatile-provenance-repository-bundle/pom.xml index 4449e30654..34b1fa1b7b 100644 --- a/nar-bundles/volatile-provenance-repository-bundle/pom.xml +++ b/nar-bundles/volatile-provenance-repository-bundle/pom.xml @@ -17,11 +17,11 @@ org.apache.nifi - nar-container-common + nar-bundle-parent 0.0.1-SNAPSHOT - volatile-provenance-repository-bundle + volatile-provenance-repository-parent 0.0.1-SNAPSHOT Volatile Provenance Repository pom @@ -30,19 +30,15 @@ volatile-provenance-repository nar - + org.apache.nifi - data-provenance-utils - 0.0.1-SNAPSHOT - - - org.apache.nifi - nifi-utils - 0.0.1-SNAPSHOT + volatile-provenance-repository + ${project.version} + diff --git a/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/pom.xml b/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/pom.xml index 5bc0cc3be7..854bf3182a 100644 --- a/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/pom.xml +++ b/nar-bundles/volatile-provenance-repository-bundle/volatile-provenance-repository/pom.xml @@ -17,7 +17,7 @@ org.apache.nifi - volatile-provenance-repository-bundle + volatile-provenance-repository-parent 0.0.1-SNAPSHOT diff --git a/nar-maven-plugin/pom.xml b/nar-maven-plugin/pom.xml new file mode 100644 index 0000000000..7b7aabf41d --- /dev/null +++ b/nar-maven-plugin/pom.xml @@ -0,0 +1,76 @@ + + + + 4.0.0 + + + org.apache.nifi + nifi-parent + 0.0.1-SNAPSHOT + + + org.apache.nifi + nar-maven-plugin + 0.0.1-SNAPSHOT + maven-plugin + Apache NiFi NAR Plugin + + + + org.apache.maven.plugins + maven-plugin-plugin + + + default-descriptor + + descriptor + + process-classes + + + help-descriptor + + helpmojo + + process-classes + + + + + + + + org.apache.maven + maven-plugin-api + + + org.apache.maven.plugins + maven-dependency-plugin + maven-plugin + + + + org.apache.maven.plugins + maven-jar-plugin + + + org.apache.maven.plugin-tools + maven-plugin-annotations + provided + + + diff --git a/nar-maven-plugin/src/main/java/nifi/NarMojo.java b/nar-maven-plugin/src/main/java/nifi/NarMojo.java new file mode 100644 index 0000000000..5196f73555 --- /dev/null +++ b/nar-maven-plugin/src/main/java/nifi/NarMojo.java @@ -0,0 +1,610 @@ +/* + * 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. + */ +package nifi; + +import java.io.File; +import java.io.IOException; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import org.apache.maven.archiver.MavenArchiveConfiguration; +import org.apache.maven.archiver.MavenArchiver; +import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.DependencyResolutionRequiredException; +import org.apache.maven.artifact.factory.ArtifactFactory; +import org.apache.maven.artifact.installer.ArtifactInstaller; +import org.apache.maven.artifact.metadata.ArtifactMetadataSource; +import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; +import org.apache.maven.artifact.resolver.ArtifactCollector; +import org.apache.maven.artifact.resolver.ArtifactNotFoundException; +import org.apache.maven.artifact.resolver.ArtifactResolutionException; +import org.apache.maven.artifact.resolver.ArtifactResolver; +import org.apache.maven.plugin.AbstractMojo; +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugin.dependency.utils.DependencyStatusSets; +import org.apache.maven.plugin.dependency.utils.DependencyUtil; +import org.apache.maven.plugin.dependency.utils.filters.DestFileFilter; +import org.apache.maven.plugin.dependency.utils.resolvers.ArtifactsResolver; +import org.apache.maven.plugin.dependency.utils.resolvers.DefaultArtifactsResolver; +import org.apache.maven.plugin.dependency.utils.translators.ArtifactTranslator; +import org.apache.maven.plugin.dependency.utils.translators.ClassifierTypeTranslator; +import org.apache.maven.plugins.annotations.LifecyclePhase; +import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.plugins.annotations.ResolutionScope; +import org.apache.maven.project.MavenProject; +import org.apache.maven.execution.MavenSession; +import org.apache.maven.plugins.annotations.Component; +import org.apache.maven.project.MavenProjectHelper; +import org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException; +import org.apache.maven.shared.artifact.filter.collection.ArtifactIdFilter; +import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter; +import org.apache.maven.shared.artifact.filter.collection.ClassifierFilter; +import org.apache.maven.shared.artifact.filter.collection.FilterArtifacts; +import org.apache.maven.shared.artifact.filter.collection.GroupIdFilter; +import org.apache.maven.shared.artifact.filter.collection.ScopeFilter; +import org.apache.maven.shared.artifact.filter.collection.ProjectTransitivityFilter; +import org.apache.maven.shared.artifact.filter.collection.TypeFilter; +import org.codehaus.plexus.archiver.ArchiverException; +import org.codehaus.plexus.archiver.jar.JarArchiver; +import org.codehaus.plexus.archiver.jar.ManifestException; +import org.codehaus.plexus.archiver.manager.ArchiverManager; +import org.codehaus.plexus.util.FileUtils; +import org.codehaus.plexus.util.StringUtils; + +/** + * Packages the current project as an Apache NiFi Archive (NAR). + * + * The following code is derived from maven-dependencies-plugin and + * maven-jar-plugin. The functionality of CopyDependenciesMojo and JarMojo was + * simplified to the use case of NarMojo. + * + */ +@Mojo(name = "nar", defaultPhase = LifecyclePhase.PACKAGE, threadSafe = false, requiresDependencyResolution = ResolutionScope.RUNTIME) +public class NarMojo extends AbstractMojo { + + private static final String[] DEFAULT_EXCLUDES = new String[]{"**/package.html"}; + private static final String[] DEFAULT_INCLUDES = new String[]{"**/**"}; + + /** + * POM + * + */ + @Parameter(defaultValue = "${project}", readonly = true, required = true) + protected MavenProject project; + + @Parameter(defaultValue = "${session}", readonly = true, required = true) + protected MavenSession session; + + /** + * List of files to include. Specified as fileset patterns. + */ + @Parameter(property = "includes") + protected String[] includes; + /** + * List of files to exclude. Specified as fileset patterns. + */ + @Parameter(property = "excludes") + protected String[] excludes; + /** + * Name of the generated NAR. + * + */ + @Parameter(alias = "narName", property = "nar.finalName", defaultValue = "${project.build.finalName}", required = true) + protected String finalName; + + /** + * The Jar archiver. + * + * \@\component role="org.codehaus.plexus.archiver.Archiver" roleHint="jar" + */ + @Component(role = org.codehaus.plexus.archiver.Archiver.class, hint = "jar") + private JarArchiver jarArchiver; + /** + * The archive configuration to use. + * + * See the + * documentation for Maven Archiver. + * + */ + @Parameter(property = "archive") + protected final MavenArchiveConfiguration archive = new MavenArchiveConfiguration(); + /** + * Path to the default MANIFEST file to use. It will be used if + * useDefaultManifestFile is set to true. + * + */ + @Parameter(property = "defaultManifestFiles", defaultValue = "${project.build.outputDirectory}/META-INF/MANIFEST.MF", readonly = true, required = true) + protected File defaultManifestFile; + + /** + * Set this to true to enable the use of the + * defaultManifestFile. + * + * @since 2.2 + */ + @Parameter(property = "nar.useDefaultManifestFile", defaultValue = "false") + protected boolean useDefaultManifestFile; + + @Component + protected MavenProjectHelper projectHelper; + + /** + * Whether creating the archive should be forced. + * + */ + @Parameter(property = "nar.forceCreation", defaultValue = "false") + protected boolean forceCreation; + + /** + * Classifier to add to the artifact generated. If given, the artifact will + * be an attachment instead. + * + */ + @Parameter(property = "classifier") + protected String classifier; + + @Component + protected ArtifactInstaller installer; + + @Component + protected ArtifactRepositoryFactory repositoryFactory; + + /** + * This only applies if the classifier parameter is used. + * + */ + @Parameter(property = "mdep.failOnMissingClassifierArtifact", defaultValue = "true", required = false) + protected boolean failOnMissingClassifierArtifact = true; + + /** + * Comma Separated list of Types to include. Empty String indicates include + * everything (default). + * + */ + @Parameter(property = "includeTypes", required = false) + protected String includeTypes; + + /** + * Comma Separated list of Types to exclude. Empty String indicates don't + * exclude anything (default). + * + */ + @Parameter(property = "excludeTypes", required = false) + protected String excludeTypes; + + /** + * Scope to include. An Empty string indicates all scopes (default). + * + */ + @Parameter(property = "includeScope", required = false) + protected String includeScope; + + /** + * Scope to exclude. An Empty string indicates no scopes (default). + * + */ + @Parameter(property = "excludeScope", required = false) + protected String excludeScope; + + /** + * Comma Separated list of Classifiers to include. Empty String indicates + * include everything (default). + * + */ + @Parameter(property = "includeClassifiers", required = false) + protected String includeClassifiers; + + /** + * Comma Separated list of Classifiers to exclude. Empty String indicates + * don't exclude anything (default). + * + */ + @Parameter(property = "excludeClassifiers", required = false) + protected String excludeClassifiers; + + /** + * Specify classifier to look for. Example: sources + * + */ + @Parameter(property = "classifier", required = false) + protected String copyDepClassifier; + + /** + * Specify type to look for when constructing artifact based on classifier. + * Example: java-source,jar,war, nar + * + */ + @Parameter(property = "type", required = false, defaultValue = "nar") + protected String type; + + /** + * Comma separated list of Artifact names too exclude. + * + */ + @Parameter(property = "excludeArtifacts", required = false) + protected String excludeArtifactIds; + + /** + * Comma separated list of Artifact names to include. + * + */ + @Parameter(property = "includeArtifacts", required = false) + protected String includeArtifactIds; + + /** + * Comma separated list of GroupId Names to exclude. + * + */ + @Parameter(property = "excludeArtifacts", required = false) + protected String excludeGroupIds; + + /** + * Comma separated list of GroupIds to include. + * + */ + @Parameter(property = "includeGroupIds", required = false) + protected String includeGroupIds; + + /** + * Directory to store flag files + * + */ + @Parameter(property = "markersDirectory", required = false, defaultValue = "${project.build.directory}/dependency-maven-plugin-markers") + protected File markersDirectory; + + /** + * Overwrite release artifacts + * + */ + @Parameter(property = "overWriteReleases", required = false) + protected boolean overWriteReleases; + + /** + * Overwrite snapshot artifacts + * + */ + @Parameter(property = "overWriteSnapshots", required = false) + protected boolean overWriteSnapshots; + + /** + * Overwrite artifacts that don't exist or are older than the source. + * + */ + @Parameter(property = "overWriteIfNewer", required = false, defaultValue = "true") + protected boolean overWriteIfNewer; + + /** + * Used to look up Artifacts in the remote repository. + */ + @Component + protected ArtifactFactory factory; + + /** + * Used to look up Artifacts in the remote repository. + * + */ + @Component + protected ArtifactResolver resolver; + + /** + * Artifact collector, needed to resolve dependencies. + * + */ + @Component(role = org.apache.maven.artifact.resolver.ArtifactCollector.class) + protected ArtifactCollector artifactCollector; + + @Component(role = org.apache.maven.artifact.metadata.ArtifactMetadataSource.class) + protected ArtifactMetadataSource artifactMetadataSource; + + /** + * Location of the local repository. + * + */ + @Parameter(property = "localRepository", required = true, readonly = true) + protected ArtifactRepository local; + + /** + * List of Remote Repositories used by the resolver + * + */ + @Parameter(property = "project.remoteArtifactRepositories", required = true, readonly = true) + protected List remoteRepos; + + /** + * To look up Archiver/UnArchiver implementations + * + */ + @Component + protected ArchiverManager archiverManager; + + /** + * Contains the full list of projects in the reactor. + * + */ + @Parameter(property = "reactorProjects", required = true, readonly = true) + protected List reactorProjects; + + /** + * If the plugin should be silent. + * + */ + @Parameter(property = "silent", required = false, defaultValue = "false") + public boolean silent; + + /** + * Output absolute filename for resolved artifacts + * + */ + @Parameter(property = "outputAbsoluteArtifactFilename", defaultValue = "false", required = false) + protected boolean outputAbsoluteArtifactFilename; + + @Override + public void execute() throws MojoExecutionException, MojoFailureException { + copyDependencies(); + makeNar(); + } + + private void copyDependencies() throws MojoExecutionException { + DependencyStatusSets dss = getDependencySets(this.failOnMissingClassifierArtifact); + Set artifacts = dss.getResolvedDependencies(); + + for (Object artifactObj : artifacts) { + copyArtifact((Artifact) artifactObj); + } + + artifacts = dss.getSkippedDependencies(); + for (Object artifactOjb : artifacts) { + Artifact artifact = (Artifact) artifactOjb; + getLog().info(artifact.getFile().getName() + " already exists in destination."); + } + } + + protected void copyArtifact(Artifact artifact) throws MojoExecutionException { + String destFileName = DependencyUtil.getFormattedFileName(artifact, false); + final File destDir = DependencyUtil.getFormattedOutputDirectory(false, false, false, false, false, getDependenciesDirectory(), artifact); + final File destFile = new File(destDir, destFileName); + copyFile(artifact.getFile(), destFile); + } + + protected Artifact getResolvedPomArtifact(Artifact artifact) { + Artifact pomArtifact = this.factory.createArtifact(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), "", "pom"); + // Resolve the pom artifact using repos + try { + this.resolver.resolve(pomArtifact, this.remoteRepos, this.local); + } catch (ArtifactResolutionException | ArtifactNotFoundException e) { + getLog().info(e.getMessage()); + } + return pomArtifact; + } + + protected ArtifactsFilter getMarkedArtifactFilter() { + return new DestFileFilter(this.overWriteReleases, this.overWriteSnapshots, this.overWriteIfNewer, false, false, false, false, false, getDependenciesDirectory()); + } + + protected DependencyStatusSets getDependencySets(boolean stopOnFailure) throws MojoExecutionException { + // add filters in well known order, least specific to most specific + FilterArtifacts filter = new FilterArtifacts(); + + filter.addFilter(new ProjectTransitivityFilter(project.getDependencyArtifacts(), false)); + filter.addFilter(new ScopeFilter(this.includeScope, this.excludeScope)); + filter.addFilter(new TypeFilter(this.includeTypes, this.excludeTypes)); + filter.addFilter(new ClassifierFilter(this.includeClassifiers, this.excludeClassifiers)); + filter.addFilter(new GroupIdFilter(this.includeGroupIds, this.excludeGroupIds)); + filter.addFilter(new ArtifactIdFilter(this.includeArtifactIds, this.excludeArtifactIds)); + + // explicitly filter our nar dependencies + filter.addFilter(new TypeFilter("", "nar")); + + // start with all artifacts. + Set artifacts = project.getArtifacts(); + + // perform filtering + try { + artifacts = filter.filter(artifacts); + } catch (ArtifactFilterException e) { + throw new MojoExecutionException(e.getMessage(), e); + } + + // transform artifacts if classifier is set + final DependencyStatusSets status; + if (StringUtils.isNotEmpty(copyDepClassifier)) { + status = getClassifierTranslatedDependencies(artifacts, stopOnFailure); + } else { + status = filterMarkedDependencies(artifacts); + } + + return status; + } + + protected DependencyStatusSets getClassifierTranslatedDependencies(Set artifacts, boolean stopOnFailure) throws MojoExecutionException { + Set unResolvedArtifacts = new HashSet(); + Set resolvedArtifacts = artifacts; + DependencyStatusSets status = new DependencyStatusSets(); + + // possibly translate artifacts into a new set of artifacts based on the + // classifier and type + // if this did something, we need to resolve the new artifacts + if (StringUtils.isNotEmpty(copyDepClassifier)) { + ArtifactTranslator translator = new ClassifierTypeTranslator(this.copyDepClassifier, this.type, this.factory); + artifacts = translator.translate(artifacts, getLog()); + + status = filterMarkedDependencies(artifacts); + + // the unskipped artifacts are in the resolved set. + artifacts = status.getResolvedDependencies(); + + // resolve the rest of the artifacts + ArtifactsResolver artifactsResolver = new DefaultArtifactsResolver(this.resolver, this.local, + this.remoteRepos, stopOnFailure); + resolvedArtifacts = artifactsResolver.resolve(artifacts, getLog()); + + // calculate the artifacts not resolved. + unResolvedArtifacts.addAll(artifacts); + unResolvedArtifacts.removeAll(resolvedArtifacts); + } + + // return a bean of all 3 sets. + status.setResolvedDependencies(resolvedArtifacts); + status.setUnResolvedDependencies(unResolvedArtifacts); + + return status; + } + + protected DependencyStatusSets filterMarkedDependencies(Set artifacts) throws MojoExecutionException { + // remove files that have markers already + FilterArtifacts filter = new FilterArtifacts(); + filter.clearFilters(); + filter.addFilter(getMarkedArtifactFilter()); + + Set unMarkedArtifacts; + try { + unMarkedArtifacts = filter.filter(artifacts); + } catch (ArtifactFilterException e) { + throw new MojoExecutionException(e.getMessage(), e); + } + + // calculate the skipped artifacts + Set skippedArtifacts = new HashSet(); + skippedArtifacts.addAll(artifacts); + skippedArtifacts.removeAll(unMarkedArtifacts); + + return new DependencyStatusSets(unMarkedArtifacts, null, skippedArtifacts); + } + + protected void copyFile(File artifact, File destFile) throws MojoExecutionException { + try { + getLog().info("Copying " + (this.outputAbsoluteArtifactFilename ? artifact.getAbsolutePath() : artifact.getName()) + " to " + destFile); + FileUtils.copyFile(artifact, destFile); + } catch (Exception e) { + throw new MojoExecutionException("Error copying artifact from " + artifact + " to " + destFile, e); + } + } + + private File getClassesDirectory() { + final File outputDirectory = new File(project.getBasedir(), "target"); + return new File(outputDirectory, "classes"); + } + + private File getDependenciesDirectory() { + return new File(getClassesDirectory(), "META-INF/dependencies"); + } + + private void makeNar() throws MojoExecutionException { + File narFile = createArchive(); + + if (classifier != null) { + projectHelper.attachArtifact(project, "nar", classifier, narFile); + } else { + project.getArtifact().setFile(narFile); + } + } + + public File createArchive() throws MojoExecutionException { + final File outputDirectory = new File(project.getBasedir(), "target"); + File narFile = getNarFile(outputDirectory, finalName, classifier); + MavenArchiver archiver = new MavenArchiver(); + archiver.setArchiver(jarArchiver); + archiver.setOutputFile(narFile); + archive.setForced(forceCreation); + + try { + File contentDirectory = getClassesDirectory(); + if (!contentDirectory.exists()) { + getLog().warn("NAR will be empty - no content was marked for inclusion!"); + } else { + archiver.getArchiver().addDirectory(contentDirectory, getIncludes(), getExcludes()); + } + + File existingManifest = defaultManifestFile; + if (useDefaultManifestFile && existingManifest.exists() && archive.getManifestFile() == null) { + getLog().info("Adding existing MANIFEST to archive. Found under: " + existingManifest.getPath()); + archive.setManifestFile(existingManifest); + } + + // automatically add the artifact id to the manifest + archive.addManifestEntry("Nar-Id", project.getArtifactId()); + + // look for a nar dependency + String narDependency = getNarDependency(); + if (narDependency != null) { + archive.addManifestEntry("Nar-Dependency-Id", narDependency); + } + + archiver.createArchive(session, project, archive); + return narFile; + } catch (ArchiverException | MojoExecutionException | ManifestException | IOException | DependencyResolutionRequiredException e) { + throw new MojoExecutionException("Error assembling NAR", e); + } + } + + private String[] getIncludes() { + if (includes != null && includes.length > 0) { + return includes; + } + return DEFAULT_INCLUDES; + } + + private String[] getExcludes() { + if (excludes != null && excludes.length > 0) { + return excludes; + } + return DEFAULT_EXCLUDES; + } + + protected File getNarFile(File basedir, String finalName, String classifier) { + if (classifier == null) { + classifier = ""; + } else if (classifier.trim().length() > 0 && !classifier.startsWith("-")) { + classifier = "-" + classifier; + } + + return new File(basedir, finalName + classifier + ".nar"); + } + + private String getNarDependency() throws MojoExecutionException { + String narDependency = null; + + // get nar dependencies + FilterArtifacts filter = new FilterArtifacts(); + filter.addFilter(new TypeFilter("nar", "")); + + // start with all artifacts. + Set artifacts = project.getArtifacts(); + + // perform filtering + try { + artifacts = filter.filter(artifacts); + } catch (ArtifactFilterException e) { + throw new MojoExecutionException(e.getMessage(), e); + } + + // ensure there is a single nar dependency + if (artifacts.size() > 1) { + throw new MojoExecutionException("Each NAR represents a ClassLoader. A NAR dependency allows that NAR's ClassLoader to be " + + "used as the parent of this NAR's ClassLoader. As a result, only a single NAR dependency is allowed."); + } else if (artifacts.size() == 1) { + final Artifact artifact = (Artifact) artifacts.iterator().next(); + narDependency = artifact.getArtifactId(); + } + + return narDependency; + } +} diff --git a/nar-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/nar-maven-plugin/src/main/resources/META-INF/plexus/components.xml new file mode 100644 index 0000000000..0680d18e23 --- /dev/null +++ b/nar-maven-plugin/src/main/resources/META-INF/plexus/components.xml @@ -0,0 +1,52 @@ + + + + + + org.apache.maven.lifecycle.mapping.LifecycleMapping + nar + org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping + + + + default + + org.apache.maven.plugins:maven-resources-plugin:resources + org.apache.maven.plugins:maven-compiler-plugin:compile + org.apache.maven.plugins:maven-resources-plugin:testResources + org.apache.maven.plugins:maven-compiler-plugin:testCompile + org.apache.maven.plugins:maven-surefire-plugin:test + org.apache.nifi:nar-maven-plugin:nar + org.apache.maven.plugins:maven-install-plugin:install + org.apache.maven.plugins:maven-deploy-plugin:deploy + + + + + + + org.apache.maven.artifact.handler.ArtifactHandler + nar + org.apache.maven.artifact.handler.DefaultArtifactHandler + + nar + java + false + true + + + + diff --git a/nifi-api/pom.xml b/nifi-api/pom.xml index 3fe1d45ed2..4d334b9002 100644 --- a/nifi-api/pom.xml +++ b/nifi-api/pom.xml @@ -15,6 +15,7 @@ --> 4.0.0 + org.apache.nifi nifi-parent @@ -27,6 +28,4 @@ jar NiFi Api - - diff --git a/nifi-bootstrap/pom.xml b/nifi-bootstrap/pom.xml index a992018d94..b82adb3c1b 100644 --- a/nifi-bootstrap/pom.xml +++ b/nifi-bootstrap/pom.xml @@ -1,5 +1,5 @@ - - 4.0.0 + 4.0.0 - - org.apache.nifi - nifi-parent - 0.0.1-SNAPSHOT - + + org.apache.nifi + nifi-parent + 0.0.1-SNAPSHOT + - nifi-bootstrap - jar + nifi-bootstrap + jar - nifi-bootstrap + nifi-bootstrap - - diff --git a/nifi-mock/pom.xml b/nifi-mock/pom.xml index 0e6e264637..2bd53c77fb 100644 --- a/nifi-mock/pom.xml +++ b/nifi-mock/pom.xml @@ -30,34 +30,28 @@ org.apache.nifi nifi-api - [0.0.1-SNAPSHOT, 1.0.0-SNAPSHOT) org.apache.nifi nifi-utils - 0.0.1-SNAPSHOT org.apache.nifi nifi-expression-language - 0.0.1-SNAPSHOT org.apache.nifi nifi-core-flowfile-attributes - 0.0.1-SNAPSHOT org.apache.nifi data-provenance-utils - 0.0.1-SNAPSHOT junit junit - 4.11 provided diff --git a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java index 474bca5650..552780cbba 100644 --- a/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java +++ b/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessSession.java @@ -40,7 +40,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Pattern; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.nifi.flowfile.FlowFile; import org.apache.nifi.flowfile.attributes.CoreAttributes; import org.apache.nifi.processor.FlowFileFilter; diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000000..8747bc4206 --- /dev/null +++ b/pom.xml @@ -0,0 +1,966 @@ + + + + 4.0.0 + + org.apache + apache + 16 + + org.apache.nifi + nifi-parent + 0.0.1-SNAPSHOT + pom + Apache NiFi (incubating) Parent + Apache NiFi is a dataflow system based on the concepts of flow-based programming. It is currently a part of the Apache Incubator. + http://nifi.incubator.apache.org/maven-site/ + + Apache NiFi (incubating) Project + http://nifi.incubating.apache.org/ + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + Dev + dev-subscribe@nifi.incubator.apache.org + dev-unsubscribe@nifi.incubator.apache.org + dev@nifi.incubator.apache.org + http://mail-archives.apache.org/mod_mbox/incubator-nifi-dev + + + Commits + commits-subscribe@nifi.incubator.apache.org + commits-unsubscribe@nifi.incubator.apache.org + commits@nifi.incubator.apache.org + http://mail-archives.apache.org/mod_mbox/incubator-nifi-commits + + + + ${maven.min-version} + + + commons + + + nifi-api + nifi-bootstrap + nifi-mock + nar-bundles + assembly + + + scm:git:git://git.apache.org/incubator-nifi.git + scm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git + https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git + + + JIRA + https://issues.apache.org/jira/browse/NIFI + + + UTF-8 + UTF-8 + 1.7.8 + 9.2.5.v20141112 + 4.10.2 + 4.1.2.RELEASE + 3.2.5.RELEASE + 1.18.3 + + + + + ch.qos.logback + logback-classic + 1.1.2 + + + ch.qos.logback + jcl-over-slf4j + 1.1.2 + provided + + + org.slf4j + slf4j-api + + + + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + provided + + + org.slf4j + log4j-over-slf4j + ${org.slf4j.version} + provided + + + org.slf4j + jul-to-slf4j + ${org.slf4j.version} + provided + + + org.slf4j + slf4j-api + ${org.slf4j.version} + provided + + + org.apache.maven + maven-plugin-api + 2.0.11 + + + org.apache.maven.plugins + maven-dependency-plugin + 2.9 + maven-plugin + + + org.apache.maven.plugins + maven-jar-plugin + 2.5 + + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.3 + + + junit + junit + 4.12 + + + org.mockito + mockito-core + 1.10.16 + + + org.mockito + mockito-all + 1.10.8 + test + + + org.slf4j + slf4j-simple + ${org.slf4j.version} + + + org.apache.commons + commons-compress + 1.9 + + + org.apache.commons + commons-lang3 + 3.3.2 + + + org.antlr + antlr-runtime + 3.5.2 + + + commons-codec + commons-codec + 1.10 + + + commons-net + commons-net + 3.3 + + + commons-io + commons-io + 2.4 + + + org.bouncycastle + bcprov-jdk16 + 1.46 + + + com.jcraft + jsch + 0.1.51 + + + org.apache.httpcomponents + httpclient + 4.3.6 + + + javax.mail + mail + 1.4.7 + + + com.github.jponge + lzma-java + 1.3 + + + org.tukaani + xz + 1.5 + + + net.sf.saxon + Saxon-HE + 9.6.0-3 + + + stax + stax-api + 1.0.1 + + + org.quartz-scheduler + quartz + 2.2.1 + + + com.sun.jersey.contribs + jersey-spring + ${jersey.version} + + + org.springframework + spring-web + + + org.springframework + spring-core + + + org.springframework + spring-aop + + + org.springframework + spring-context + + + org.springframework + spring-beans + + + + + com.sun.jersey.contribs + jersey-multipart + ${jersey.version} + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-context-support + ${spring.version} + + + org.springframework + spring-expression + ${spring.version} + + + org.springframework + spring-tx + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + + commons-logging + commons-logging + + + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-aop + ${spring.version} + + + org.springframework + spring-jdbc + ${spring.version} + + + org.springframework.security + spring-security-core + ${spring.security.version} + + + org.springframework + spring-web + + + org.springframework + spring-core + + + org.springframework + spring-expression + + + org.springframework + spring-aop + + + org.springframework + spring-context + + + org.springframework + spring-beans + + + + + org.springframework.security + spring-security-web + ${spring.security.version} + + + org.springframework + spring-core + + + org.springframework + spring-tx + + + org.springframework + spring-jdbc + + + org.springframework + spring-expression + + + org.springframework + spring-web + + + org.springframework + spring-aop + + + org.springframework + spring-context + + + org.springframework + spring-beans + + + + + org.springframework.security + spring-security-acl + ${spring.security.version} + + + org.springframework + spring-core + + + org.springframework + spring-tx + + + org.springframework + spring-jdbc + + + org.springframework + spring-aop + + + org.springframework + spring-context + + + + + org.springframework.security + spring-security-config + ${spring.security.version} + + + org.springframework + spring-core + + + org.springframework + spring-aop + + + org.springframework + spring-context + + + org.springframework + spring-beans + + + + + org.aspectj + aspectjweaver + 1.8.4 + + + cglib + cglib-nodep + 3.1 + + + org.apache.commons + commons-collections4 + 4.0 + + + org.apache.commons + commons-pool2 + 2.2 + + + com.jcraft + jzlib + 1.1.3 + + + joda-time + joda-time + 2.6 + + + com.yammer.metrics + metrics-ganglia + 2.2.0 + + + javax.jms + javax.jms-api + 2.0 + + + org.apache.activemq + activemq-client + 5.10.0 + + + org.hornetq + hornetq-jms-client + 2.4.5.Final + + + org.apache.lucene + lucene-core + ${lucene.version} + + + org.apache.lucene + lucene-analyzers-common + ${lucene.version} + + + org.apache.lucene + lucene-queryparser + ${lucene.version} + + + org.apache.hadoop + hadoop-common + 2.5.2 + + + org.apache.hadoop + hadoop-hdfs + 2.5.2 + + + com.sun.jersey + jersey-server + ${jersey.version} + + + com.sun.jersey + jersey-core + ${jersey.version} + + + com.sun.jersey + jersey-json + ${jersey.version} + + + com.sun.jersey + jersey-servlet + ${jersey.version} + + + com.sun.jersey + jersey-client + ${jersey.version} + + + org.eclipse.jetty + jetty-server + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-webapp + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-servlets + ${jetty.version} + provided + + + org.eclipse.jetty + jetty-jsp + ${jetty.version} + provided + + + javax.servlet.jsp + javax.servlet.jsp-api + 2.3.1 + provided + + + javax.el + javax.el-api + 3.0.0 + provided + + + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + 1.2.1 + provided + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + org.eclipse.jetty.toolchain + jetty-jsp-jdt + 2.3.3 + provided + + + com.google.guava + guava + 18.0 + + + com.h2database + h2 + 1.3.176 + + + org.jasypt + jasypt + 1.9.2 + + + + org.apache.nifi + nifi-api + ${project.version} + + + org.apache.nifi + nifi-utils + ${project.version} + + + org.apache.nifi + nifi-web-utils + ${project.version} + + + org.apache.nifi + nifi-file-utils + ${project.version} + + + org.apache.nifi + nifi-expression-language + ${project.version} + + + org.apache.nifi + custom-ui-utilities + ${project.version} + + + org.apache.nifi + nifi-core-flowfile-attributes + ${project.version} + + + org.apache.nifi + flowfile-packager + ${project.version} + + + org.apache.nifi + naive-search-ring-buffer + ${project.version} + + + org.apache.nifi + nifi-search-utils + ${project.version} + + + org.apache.nifi + nifi-socket-utils + ${project.version} + + + org.apache.nifi + data-provenance-utils + ${project.version} + + + org.apache.nifi + nifi-runtime + ${project.version} + + + org.apache.nifi + nifi-bootstrap + ${project.version} + + + org.apache.nifi + nifi-resources + ${project.version} + resources + provided + zip + + + org.apache.nifi + nifi-framework-nar + ${project.version} + nar + + + org.apache.nifi + volatile-provenance-repository-nar + ${project.version} + nar + + + org.apache.nifi + persistent-provenance-repository-nar + ${project.version} + nar + + + org.apache.nifi + standard-services-api-nar + ${project.version} + nar + + + org.apache.nifi + ssl-context-service-nar + ${project.version} + nar + + + org.apache.nifi + distributed-cache-services-nar + ${project.version} + nar + + + org.apache.nifi + nifi-standard-nar + ${project.version} + nar + + + org.apache.nifi + nifi-jetty-bundle + ${project.version} + nar + + + org.apache.nifi + update-attribute-nar + ${project.version} + nar + + + org.apache.nifi + monitor-threshold-nar + ${project.version} + nar + + + org.apache.nifi + hadoop-libraries-nar + ${project.version} + nar + + + org.apache.nifi + hadoop-nar + ${project.version} + nar + + + org.apache.nifi + nifi-stream-utils + ${project.version} + + + org.apache.nifi + nifi-properties + ${project.version} + + + org.apache.nifi + nifi-security-utils + ${project.version} + + + org.apache.nifi + nifi-logging-utils + ${project.version} + + + org.apache.nifi + nifi-nar + ${project.version} + + + org.apache.nifi + nifi-processor-utils + ${project.version} + + + org.apache.nifi + remote-communications-utils + ${project.version} + + + org.apache.nifi + nifi-mock + ${project.version} + test + + + org.apache.nifi + wali + ${project.version} + + + + + + junit + junit + test + + + org.mockito + mockito-core + test + + + org.slf4j + slf4j-simple + test + + + + + + + org.apache.nifi + nar-maven-plugin + ${project.version} + + + org.apache.maven.plugins + maven-compiler-plugin + 3.2 + + 1.7 + 1.7 + true + true + UTF-8 + true + true + + + + maven-jar-plugin + 2.5 + + + maven-war-plugin + 2.5 + + + org.apache.maven.plugins + maven-plugin-plugin + 3.3 + + + org.apache.maven.plugins + maven-dependency-plugin + 2.9 + + + org.apache.maven.plugins + maven-resources-plugin + 2.7 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.18 + + -Xmx1G + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.5.2 + + false + gnu + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.1 + + + org.codehaus.mojo + jaxb2-maven-plugin + 1.6 + + + org.apache.maven.plugins + maven-source-plugin + 2.4 + + + org.apache.maven.plugins + maven-site-plugin + 3.4 + + + org.codehaus.mojo + exec-maven-plugin + 1.3.2 + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.1 + + false + true + private + + + + org.codehaus.mojo + rpm-maven-plugin + 2.1.1 + + + org.antlr + antlr3-maven-plugin + 3.5.2 + + + + + + org.apache.nifi + nar-maven-plugin + ${project.version} + true + + + +