NIFI-805 addressed a series of sonar identified formatting issues
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/90ebc3a9 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/90ebc3a9 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/90ebc3a9 Branch: refs/heads/NIFI-744 Commit: 90ebc3a91ef6873a884cce6730d229d6700f0cef Parents: 496ebfb Author: joewitt <[email protected]> Authored: Mon Aug 3 23:32:48 2015 -0400 Committer: joewitt <[email protected]> Committed: Mon Aug 3 23:32:48 2015 -0400 ---------------------------------------------------------------------- .../authorization/DownloadAuthorization.java | 2 +- nifi/nifi-bootstrap/pom.xml | 37 +- .../nifi-hl7-query-language/pom.xml | 6 +- nifi/nifi-docs/pom.xml | 19 +- .../nifi-aws-bundle/nifi-aws-processors/pom.xml | 4 - .../nifi-flume-bundle/nifi-flume-nar/pom.xml | 3 +- .../nifi-flume-processors/pom.xml | 32 +- nifi/nifi-nar-bundles/nifi-flume-bundle/pom.xml | 29 +- .../nifi-framework/nifi-site-to-site/pom.xml | 2 +- .../src/main/webapp/WEB-INF/web.xml | 11 +- .../nifi-geo-bundle/nifi-geo-nar/pom.xml | 2 +- .../nifi-hdfs-processors/pom.xml | 4 +- .../nifi-kafka-processors/pom.xml | 1 - .../nifi-twitter-processors/pom.xml | 2 - .../nifi-standard-processors/pom.xml | 553 +++++++++---------- .../nifi-dbcp-service/pom.xml | 28 +- .../nifi-http-context-map/pom.xml | 4 +- .../nifi-standard-services-api-nar/pom.xml | 11 +- 18 files changed, 374 insertions(+), 376 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/90ebc3a9/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/DownloadAuthorization.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/DownloadAuthorization.java b/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/DownloadAuthorization.java index 02fd839..416f3cf 100644 --- a/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/DownloadAuthorization.java +++ b/nifi/nifi-api/src/main/java/org/apache/nifi/authorization/DownloadAuthorization.java @@ -25,7 +25,7 @@ public class DownloadAuthorization { Approved, Denied; - }; + } private static final DownloadAuthorization APPROVED = new DownloadAuthorization(Result.Approved, null); http://git-wip-us.apache.org/repos/asf/nifi/blob/90ebc3a9/nifi/nifi-bootstrap/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-bootstrap/pom.xml b/nifi/nifi-bootstrap/pom.xml index 508697b..2975a5a 100644 --- a/nifi/nifi-bootstrap/pom.xml +++ b/nifi/nifi-bootstrap/pom.xml @@ -1,18 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <!-- - 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. - --> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.nifi</groupId> @@ -23,9 +24,9 @@ <packaging>jar</packaging> <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/nifi/blob/90ebc3a9/nifi/nifi-commons/nifi-hl7-query-language/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-commons/nifi-hl7-query-language/pom.xml b/nifi/nifi-commons/nifi-hl7-query-language/pom.xml index 297b106..8b04e5c 100644 --- a/nifi/nifi-commons/nifi-hl7-query-language/pom.xml +++ b/nifi/nifi-commons/nifi-hl7-query-language/pom.xml @@ -15,13 +15,13 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - + <parent> <groupId>org.apache.nifi</groupId> <artifactId>nifi-commons</artifactId> <version>0.3.0-SNAPSHOT</version> </parent> - + <artifactId>nifi-hl7-query-language</artifactId> <packaging>jar</packaging> <build> @@ -69,7 +69,7 @@ <groupId>org.antlr</groupId> <artifactId>antlr-runtime</artifactId> </dependency> - + <!-- HAPI to parse v2 messages --> <dependency> <groupId>ca.uhn.hapi</groupId> http://git-wip-us.apache.org/repos/asf/nifi/blob/90ebc3a9/nifi/nifi-docs/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-docs/pom.xml b/nifi/nifi-docs/pom.xml index b69c7b5..42a1775 100644 --- a/nifi/nifi-docs/pom.xml +++ b/nifi/nifi-docs/pom.xml @@ -1,4 +1,18 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> @@ -108,7 +122,8 @@ <artifactId>apache-rat-plugin</artifactId> <configuration> <excludes combine.children="append"> - <exclude>src/main/asciidoc/asciidoc-mod.css</exclude> <!-- MIT license confirmed. Excluding due to parse error--> + <!-- MIT license confirmed. Excluding due to parse error--> + <exclude>src/main/asciidoc/asciidoc-mod.css</exclude> </excludes> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/nifi/blob/90ebc3a9/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml index e20babf..b784524 100644 --- a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml @@ -15,16 +15,13 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <parent> <groupId>org.apache.nifi</groupId> <artifactId>nifi-aws-bundle</artifactId> <version>0.3.0-SNAPSHOT</version> </parent> - <artifactId>nifi-aws-processors</artifactId> <packaging>jar</packaging> - <dependencies> <dependency> <groupId>org.apache.nifi</groupId> @@ -38,7 +35,6 @@ <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk</artifactId> </dependency> - <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-mock</artifactId> http://git-wip-us.apache.org/repos/asf/nifi/blob/90ebc3a9/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/pom.xml index 649eda2..5180f6d 100644 --- a/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/pom.xml @@ -1,4 +1,4 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -13,6 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.nifi</groupId> http://git-wip-us.apache.org/repos/asf/nifi/blob/90ebc3a9/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml index b3e1061..e793255 100644 --- a/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml @@ -1,18 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <!-- - 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. - --> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.nifi</groupId> @@ -158,7 +159,8 @@ <artifactId>apache-rat-plugin</artifactId> <configuration> <excludes> - <exclude>src/test/resources/testdata/*</exclude> <!-- test data --> + <!-- test data --> + <exclude>src/test/resources/testdata/*</exclude> </excludes> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/nifi/blob/90ebc3a9/nifi/nifi-nar-bundles/nifi-flume-bundle/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-flume-bundle/pom.xml b/nifi/nifi-nar-bundles/nifi-flume-bundle/pom.xml index e545c9c..56ca257 100644 --- a/nifi/nifi-nar-bundles/nifi-flume-bundle/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-flume-bundle/pom.xml @@ -1,18 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <!-- - 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. - --> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.nifi</groupId> http://git-wip-us.apache.org/repos/asf/nifi/blob/90ebc3a9/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml index 4d6d3f1..113797f 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml @@ -22,7 +22,7 @@ </parent> <artifactId>nifi-site-to-site</artifactId> <dependencies> - <dependency> <!-- This can be removed after testing.... --> + <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-security</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/nifi/blob/90ebc3a9/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/webapp/WEB-INF/web.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/webapp/WEB-INF/web.xml index e7a0aee..4ce319e 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/webapp/WEB-INF/web.xml +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/webapp/WEB-INF/web.xml @@ -15,7 +15,6 @@ --> <web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";> <display-name>nifi-api</display-name> - <context-param> <param-name>contextConfigLocation</param-name> <param-value> @@ -27,15 +26,12 @@ classpath:nifi-cluster-protocol-context.xml </param-value> </context-param> - <listener> <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> </listener> - <listener> <listener-class>org.apache.nifi.web.contextlistener.ApplicationStartupContextListener</listener-class> </listener> - <servlet> <servlet-name>jerseySpring</servlet-name> <servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class> @@ -57,7 +53,6 @@ <filter-name>timer</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> - <filter> <filter-name>threadLocal</filter-name> <filter-class>org.apache.nifi.web.filter.ThreadLocalFilter</filter-class> @@ -66,7 +61,6 @@ <filter-name>threadLocal</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> - <filter> <filter-name>springSecurityFilterChain</filter-name> <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class> @@ -75,7 +69,6 @@ <filter-name>springSecurityFilterChain</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> - <filter> <filter-name>requestLogger</filter-name> <filter-class>org.apache.nifi.web.filter.RequestLogger</filter-class> @@ -84,11 +77,10 @@ <filter-name>requestLogger</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> - <filter> <filter-name>gzipCompressionFilter</filter-name> <filter-class>org.eclipse.jetty.servlets.GzipFilter</filter-class> - <init-param> + <init-param> <param-name>methods</param-name> <param-value>get,post,put</param-value> </init-param> @@ -97,7 +89,6 @@ <filter-name>gzipCompressionFilter</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> - <filter> <filter-name>nodeRequestFilter</filter-name> <filter-class>org.apache.nifi.web.filter.NodeRequestFilter</filter-class> http://git-wip-us.apache.org/repos/asf/nifi/blob/90ebc3a9/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml index bda7bb1..ad36981 100644 --- a/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-geo-bundle/nifi-geo-nar/pom.xml @@ -23,7 +23,7 @@ <artifactId>nifi-geo-nar</artifactId> <packaging>nar</packaging> <description>NiFi Geo Enrichment NAR</description> - + <dependencies> <dependency> <groupId>org.apache.nifi</groupId> http://git-wip-us.apache.org/repos/asf/nifi/blob/90ebc3a9/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml index adf05f2..6bc110f 100644 --- a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml @@ -44,8 +44,8 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-distributed-cache-client-service-api</artifactId> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-distributed-cache-client-service-api</artifactId> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/nifi/blob/90ebc3a9/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/pom.xml index 187a2b5..8cee490 100644 --- a/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-processors/pom.xml @@ -55,7 +55,6 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-mock</artifactId> http://git-wip-us.apache.org/repos/asf/nifi/blob/90ebc3a9/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml index 4ade504..41bc45f 100644 --- a/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml @@ -34,13 +34,11 @@ <groupId>org.apache.nifi</groupId> <artifactId>nifi-processor-utils</artifactId> </dependency> - <dependency> <groupId>com.twitter</groupId> <artifactId>hbc-twitter4j</artifactId> <version>2.2.0</version> </dependency> - <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-mock</artifactId> http://git-wip-us.apache.org/repos/asf/nifi/blob/90ebc3a9/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml index de4e4f6..4d1e542 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml @@ -1,283 +1,282 @@ <?xml version="1.0"?> <!-- 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. --> +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. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-standard-bundle</artifactId> - <version>0.3.0-SNAPSHOT</version> - </parent> - <artifactId>nifi-standard-processors</artifactId> - <packaging>jar</packaging> - <dependencies> - <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-processor-utils</artifactId> - </dependency> - <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-utils</artifactId> - </dependency> - <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-ssl-context-service-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-flowfile-packager</artifactId> - </dependency> - <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-distributed-cache-client-service-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-http-context-map-api</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-client</artifactId> - </dependency> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-server</artifactId> - </dependency> - <dependency> - <groupId>commons-net</groupId> - <artifactId>commons-net</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk16</artifactId> - </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpg-jdk16</artifactId> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </dependency> - <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-security-utils</artifactId> - </dependency> - <dependency> - <groupId>com.jcraft</groupId> - <artifactId>jsch</artifactId> - </dependency> - <dependency> - <groupId>com.jcraft</groupId> - <artifactId>jzlib</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> - <dependency> - <groupId>com.github.jponge</groupId> - <artifactId>lzma-java</artifactId> - </dependency> - <dependency> - <groupId>org.tukaani</groupId> - <artifactId>xz</artifactId> - </dependency> - <dependency> - <groupId>net.sf.saxon</groupId> - <artifactId>Saxon-HE</artifactId> - </dependency> - <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-mock</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-socket-utils</artifactId> - </dependency> - <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-load-distribution-service-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-distributed-cache-client-service</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> - </dependency> - <dependency> - <groupId>javax.jms</groupId> - <artifactId>javax.jms-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-client</artifactId> - </dependency> - <dependency> - <groupId>com.jayway.jsonpath</groupId> - <artifactId>json-path</artifactId> - </dependency> - <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-ssl-context-service</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.tika</groupId> - <artifactId>tika-core</artifactId> - <version>1.7</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </dependency> - <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro</artifactId> - </dependency> - <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-dbcp-service-api</artifactId> - </dependency> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-standard-bundle</artifactId> + <version>0.3.0-SNAPSHOT</version> + </parent> + <artifactId>nifi-standard-processors</artifactId> + <packaging>jar</packaging> + <dependencies> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-processor-utils</artifactId> + </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-utils</artifactId> + </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-ssl-context-service-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-flowfile-packager</artifactId> + </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-distributed-cache-client-service-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-http-context-map-api</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-client</artifactId> + </dependency> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-server</artifactId> + </dependency> + <dependency> + <groupId>commons-net</groupId> + <artifactId>commons-net</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk16</artifactId> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpg-jdk16</artifactId> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-security-utils</artifactId> + </dependency> + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jsch</artifactId> + </dependency> + <dependency> + <groupId>com.jcraft</groupId> + <artifactId>jzlib</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </dependency> + <dependency> + <groupId>com.github.jponge</groupId> + <artifactId>lzma-java</artifactId> + </dependency> + <dependency> + <groupId>org.tukaani</groupId> + <artifactId>xz</artifactId> + </dependency> + <dependency> + <groupId>net.sf.saxon</groupId> + <artifactId>Saxon-HE</artifactId> + </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-mock</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-socket-utils</artifactId> + </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-load-distribution-service-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-distributed-cache-client-service</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + </dependency> + <dependency> + <groupId>javax.jms</groupId> + <artifactId>javax.jms-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-client</artifactId> + </dependency> + <dependency> + <groupId>com.jayway.jsonpath</groupId> + <artifactId>json-path</artifactId> + </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-ssl-context-service</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.tika</groupId> + <artifactId>tika-core</artifactId> + <version>1.7</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-dbcp-service-api</artifactId> + </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>10.11.1.1</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <scope>test</scope> + </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes combine.children="append"> - <exclude>src/test/resources/localhost.cer</exclude> - <exclude>src/test/resources/hello.txt</exclude> - <exclude>src/test/resources/CharacterSetConversionSamples/Converted.txt</exclude> - <exclude>src/test/resources/CharacterSetConversionSamples/Original.txt</exclude> - <exclude>src/test/resources/CompressedData/SampleFile.txt</exclude> - <exclude>src/test/resources/CompressedData/SampleFileConcat.txt</exclude> - <exclude>src/test/resources/ExecuteCommand/1000bytes.txt</exclude> - <exclude>src/test/resources/ExecuteCommand/test.txt</exclude> - <exclude>src/test/resources/ScanAttribute/dictionary-with-empty-new-lines</exclude> - <exclude>src/test/resources/ScanAttribute/dictionary-with-extra-info</exclude> - <exclude>src/test/resources/ScanAttribute/dictionary1</exclude> - <exclude>src/test/resources/TestEncryptContent/text.txt</exclude> - <exclude>src/test/resources/TestEncryptContent/text.txt.asc</exclude> - <exclude>src/test/resources/TestIdentifyMimeType/1.txt</exclude> - <exclude>src/test/resources/TestJson/json-sample.json</exclude> - <exclude>src/test/resources/TestJson/control-characters.json</exclude> - <exclude>src/test/resources/TestMergeContent/demarcate</exclude> - <exclude>src/test/resources/TestMergeContent/foot</exclude> - <exclude>src/test/resources/TestMergeContent/head</exclude> - <exclude>src/test/resources/TestModifyBytes/noFooter.txt</exclude> - <exclude>src/test/resources/TestModifyBytes/noFooter_noHeader.txt</exclude> - <exclude>src/test/resources/TestModifyBytes/noHeader.txt</exclude> - <exclude>src/test/resources/TestModifyBytes/testFile.txt</exclude> - <exclude>src/test/resources/TestReplaceTextLineByLine/$1$1.txt</exclude> - <exclude>src/test/resources/TestReplaceTextLineByLine/BRue_cRue_RiRey.txt</exclude> - <exclude>src/test/resources/TestReplaceTextLineByLine/Blu$2e_clu$2e.txt</exclude> - <exclude>src/test/resources/TestReplaceTextLineByLine/D$d_h$d.txt</exclude> - <exclude>src/test/resources/TestReplaceTextLineByLine/Good.txt</exclude> - <exclude>src/test/resources/TestReplaceTextLineByLine/Spider.txt</exclude> - <exclude>src/test/resources/TestReplaceTextLineByLine/[DODO].txt</exclude> - <exclude>src/test/resources/TestReplaceTextLineByLine/cu[$1]_Po[$1].txt</exclude> - <exclude>src/test/resources/TestReplaceTextLineByLine/cu_Po.txt</exclude> - <exclude>src/test/resources/TestReplaceTextLineByLine/food.txt</exclude> - <exclude>src/test/resources/TestReplaceTextLineByLine/testFile.txt</exclude> - <exclude>src/test/resources/TestReplaceTextWithMapping/color-fruit-backreference-mapping.txt</exclude> - <exclude>src/test/resources/TestReplaceTextWithMapping/color-fruit-blank-mapping.txt</exclude> - <exclude>src/test/resources/TestReplaceTextWithMapping/color-fruit-escaped-dollar-mapping.txt</exclude> - <exclude>src/test/resources/TestReplaceTextWithMapping/color-fruit-excessive-backreference-mapping-simple.txt</exclude> - <exclude>src/test/resources/TestReplaceTextWithMapping/color-fruit-excessive-backreference-mapping.txt</exclude> - <exclude>src/test/resources/TestReplaceTextWithMapping/color-fruit-invalid-backreference-mapping.txt</exclude> - <exclude>src/test/resources/TestReplaceTextWithMapping/color-fruit-mapping.txt</exclude> - <exclude>src/test/resources/TestReplaceTextWithMapping/color-fruit-no-match-mapping.txt</exclude> - <exclude>src/test/resources/TestReplaceTextWithMapping/color-fruit-space-mapping.txt</exclude> - <exclude>src/test/resources/TestReplaceTextWithMapping/colors-without-dashes.txt</exclude> - <exclude>src/test/resources/TestReplaceTextWithMapping/colors.txt</exclude> - <exclude>src/test/resources/TestScanContent/helloWorld</exclude> - <exclude>src/test/resources/TestScanContent/wellthengood-bye</exclude> - <exclude>src/test/resources/TestSplitText/1.txt</exclude> - <exclude>src/test/resources/TestSplitText/2.txt</exclude> - <exclude>src/test/resources/TestSplitText/3.txt</exclude> - <exclude>src/test/resources/TestSplitText/4.txt</exclude> - <exclude>src/test/resources/TestSplitText/5.txt</exclude> - <exclude>src/test/resources/TestSplitText/6.txt</exclude> - <exclude>src/test/resources/TestSplitText/original.txt</exclude> - <exclude>src/test/resources/TestTransformXml/math.html</exclude> - <exclude>src/test/resources/TestTransformXml/tokens.csv</exclude> - <exclude>src/test/resources/TestTransformXml/tokens.xml</exclude> - <exclude>src/test/resources/TestUnpackContent/folder/cal.txt</exclude> - <exclude>src/test/resources/TestUnpackContent/folder/date.txt</exclude> - <exclude>src/test/resources/TestUnpackContent/data.flowfilev2</exclude> - <exclude>src/test/resources/TestUnpackContent/data.flowfilev3</exclude> - <exclude>src/test/resources/TestXml/xml-bundle-1</exclude> - <exclude>src/test/resources/CompressedData/SampleFile.txt.bz2</exclude> - <exclude>src/test/resources/CompressedData/SampleFile.txt.gz</exclude> - <exclude>src/test/resources/CompressedData/SampleFile1.txt.bz2</exclude> - <exclude>src/test/resources/CompressedData/SampleFile1.txt.gz</exclude> - <exclude>src/test/resources/CompressedData/SampleFileConcat.txt.bz2</exclude> - <exclude>src/test/resources/ExecuteCommand/TestIngestAndUpdate.jar</exclude> - <exclude>src/test/resources/ExecuteCommand/TestSuccess.jar</exclude> - <exclude>src/test/resources/ExecuteCommand/TestDynamicEnvironment.jar</exclude> - <exclude>src/test/resources/TestIdentifyMimeType/1.jar</exclude> - <exclude>src/test/resources/TestIdentifyMimeType/1.tar</exclude> - <exclude>src/test/resources/TestIdentifyMimeType/1.tar.gz</exclude> - <exclude>src/test/resources/TestIdentifyMimeType/1.txt.bz2</exclude> - <exclude>src/test/resources/TestIdentifyMimeType/1.txt.gz</exclude> - <exclude>src/test/resources/TestIdentifyMimeType/1.zip</exclude> - <exclude>src/test/resources/TestIdentifyMimeType/flowfilev1.tar</exclude> - <exclude>src/test/resources/TestUnpackContent/data.tar</exclude> - <exclude>src/test/resources/TestUnpackContent/data.zip</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes combine.children="append"> + <exclude>src/test/resources/localhost.cer</exclude> + <exclude>src/test/resources/hello.txt</exclude> + <exclude>src/test/resources/CharacterSetConversionSamples/Converted.txt</exclude> + <exclude>src/test/resources/CharacterSetConversionSamples/Original.txt</exclude> + <exclude>src/test/resources/CompressedData/SampleFile.txt</exclude> + <exclude>src/test/resources/CompressedData/SampleFileConcat.txt</exclude> + <exclude>src/test/resources/ExecuteCommand/1000bytes.txt</exclude> + <exclude>src/test/resources/ExecuteCommand/test.txt</exclude> + <exclude>src/test/resources/ScanAttribute/dictionary-with-empty-new-lines</exclude> + <exclude>src/test/resources/ScanAttribute/dictionary-with-extra-info</exclude> + <exclude>src/test/resources/ScanAttribute/dictionary1</exclude> + <exclude>src/test/resources/TestEncryptContent/text.txt</exclude> + <exclude>src/test/resources/TestEncryptContent/text.txt.asc</exclude> + <exclude>src/test/resources/TestIdentifyMimeType/1.txt</exclude> + <exclude>src/test/resources/TestJson/json-sample.json</exclude> + <exclude>src/test/resources/TestJson/control-characters.json</exclude> + <exclude>src/test/resources/TestMergeContent/demarcate</exclude> + <exclude>src/test/resources/TestMergeContent/foot</exclude> + <exclude>src/test/resources/TestMergeContent/head</exclude> + <exclude>src/test/resources/TestModifyBytes/noFooter.txt</exclude> + <exclude>src/test/resources/TestModifyBytes/noFooter_noHeader.txt</exclude> + <exclude>src/test/resources/TestModifyBytes/noHeader.txt</exclude> + <exclude>src/test/resources/TestModifyBytes/testFile.txt</exclude> + <exclude>src/test/resources/TestReplaceTextLineByLine/$1$1.txt</exclude> + <exclude>src/test/resources/TestReplaceTextLineByLine/BRue_cRue_RiRey.txt</exclude> + <exclude>src/test/resources/TestReplaceTextLineByLine/Blu$2e_clu$2e.txt</exclude> + <exclude>src/test/resources/TestReplaceTextLineByLine/D$d_h$d.txt</exclude> + <exclude>src/test/resources/TestReplaceTextLineByLine/Good.txt</exclude> + <exclude>src/test/resources/TestReplaceTextLineByLine/Spider.txt</exclude> + <exclude>src/test/resources/TestReplaceTextLineByLine/[DODO].txt</exclude> + <exclude>src/test/resources/TestReplaceTextLineByLine/cu[$1]_Po[$1].txt</exclude> + <exclude>src/test/resources/TestReplaceTextLineByLine/cu_Po.txt</exclude> + <exclude>src/test/resources/TestReplaceTextLineByLine/food.txt</exclude> + <exclude>src/test/resources/TestReplaceTextLineByLine/testFile.txt</exclude> + <exclude>src/test/resources/TestReplaceTextWithMapping/color-fruit-backreference-mapping.txt</exclude> + <exclude>src/test/resources/TestReplaceTextWithMapping/color-fruit-blank-mapping.txt</exclude> + <exclude>src/test/resources/TestReplaceTextWithMapping/color-fruit-escaped-dollar-mapping.txt</exclude> + <exclude>src/test/resources/TestReplaceTextWithMapping/color-fruit-excessive-backreference-mapping-simple.txt</exclude> + <exclude>src/test/resources/TestReplaceTextWithMapping/color-fruit-excessive-backreference-mapping.txt</exclude> + <exclude>src/test/resources/TestReplaceTextWithMapping/color-fruit-invalid-backreference-mapping.txt</exclude> + <exclude>src/test/resources/TestReplaceTextWithMapping/color-fruit-mapping.txt</exclude> + <exclude>src/test/resources/TestReplaceTextWithMapping/color-fruit-no-match-mapping.txt</exclude> + <exclude>src/test/resources/TestReplaceTextWithMapping/color-fruit-space-mapping.txt</exclude> + <exclude>src/test/resources/TestReplaceTextWithMapping/colors-without-dashes.txt</exclude> + <exclude>src/test/resources/TestReplaceTextWithMapping/colors.txt</exclude> + <exclude>src/test/resources/TestScanContent/helloWorld</exclude> + <exclude>src/test/resources/TestScanContent/wellthengood-bye</exclude> + <exclude>src/test/resources/TestSplitText/1.txt</exclude> + <exclude>src/test/resources/TestSplitText/2.txt</exclude> + <exclude>src/test/resources/TestSplitText/3.txt</exclude> + <exclude>src/test/resources/TestSplitText/4.txt</exclude> + <exclude>src/test/resources/TestSplitText/5.txt</exclude> + <exclude>src/test/resources/TestSplitText/6.txt</exclude> + <exclude>src/test/resources/TestSplitText/original.txt</exclude> + <exclude>src/test/resources/TestTransformXml/math.html</exclude> + <exclude>src/test/resources/TestTransformXml/tokens.csv</exclude> + <exclude>src/test/resources/TestTransformXml/tokens.xml</exclude> + <exclude>src/test/resources/TestUnpackContent/folder/cal.txt</exclude> + <exclude>src/test/resources/TestUnpackContent/folder/date.txt</exclude> + <exclude>src/test/resources/TestUnpackContent/data.flowfilev2</exclude> + <exclude>src/test/resources/TestUnpackContent/data.flowfilev3</exclude> + <exclude>src/test/resources/TestXml/xml-bundle-1</exclude> + <exclude>src/test/resources/CompressedData/SampleFile.txt.bz2</exclude> + <exclude>src/test/resources/CompressedData/SampleFile.txt.gz</exclude> + <exclude>src/test/resources/CompressedData/SampleFile1.txt.bz2</exclude> + <exclude>src/test/resources/CompressedData/SampleFile1.txt.gz</exclude> + <exclude>src/test/resources/CompressedData/SampleFileConcat.txt.bz2</exclude> + <exclude>src/test/resources/ExecuteCommand/TestIngestAndUpdate.jar</exclude> + <exclude>src/test/resources/ExecuteCommand/TestSuccess.jar</exclude> + <exclude>src/test/resources/ExecuteCommand/TestDynamicEnvironment.jar</exclude> + <exclude>src/test/resources/TestIdentifyMimeType/1.jar</exclude> + <exclude>src/test/resources/TestIdentifyMimeType/1.tar</exclude> + <exclude>src/test/resources/TestIdentifyMimeType/1.tar.gz</exclude> + <exclude>src/test/resources/TestIdentifyMimeType/1.txt.bz2</exclude> + <exclude>src/test/resources/TestIdentifyMimeType/1.txt.gz</exclude> + <exclude>src/test/resources/TestIdentifyMimeType/1.zip</exclude> + <exclude>src/test/resources/TestIdentifyMimeType/flowfilev1.tar</exclude> + <exclude>src/test/resources/TestUnpackContent/data.tar</exclude> + <exclude>src/test/resources/TestUnpackContent/data.zip</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/nifi/blob/90ebc3a9/nifi/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/pom.xml index fb196bb..6bcdc84 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/pom.xml @@ -19,14 +19,12 @@ <artifactId>nifi-dbcp-service-bundle</artifactId> <version>0.3.0-SNAPSHOT</version> </parent> - <artifactId>nifi-dbcp-service</artifactId> <packaging>jar</packaging> <dependencies> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-dbcp-service-api</artifactId> - <version>0.3.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> @@ -46,20 +44,18 @@ <scope>test</scope> </dependency> <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - <version>1.4</version> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <version>1.3</version> </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>10.11.1.1</version> - </dependency> - <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> - <version>1.3</version> - </dependency> </dependencies> - </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/90ebc3a9/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml index 657c1fe..fc63899 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-http-context-map-bundle/nifi-http-context-map/pom.xml @@ -19,10 +19,10 @@ <artifactId>nifi-http-context-map-bundle</artifactId> <version>0.3.0-SNAPSHOT</version> </parent> - + <artifactId>nifi-http-context-map</artifactId> <packaging>jar</packaging> - + <dependencies> <dependency> <groupId>org.apache.nifi</groupId> http://git-wip-us.apache.org/repos/asf/nifi/blob/90ebc3a9/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml index e6480b4..02c29c6 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-standard-services/nifi-standard-services-api-nar/pom.xml @@ -37,15 +37,14 @@ <artifactId>nifi-load-distribution-service-api</artifactId> <scope>compile</scope> </dependency> - <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-http-context-map-api</artifactId> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-http-context-map-api</artifactId> + <scope>compile</scope> + </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-dbcp-service-api</artifactId> - <version>0.3.0-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies>
