Repository: incubator-nifi Updated Branches: refs/heads/develop ed8b2f602 -> 7d85962e4
NIFI-242 RTC process deviation as this changeset is for must-have license headers. Apache RAT now integrated and working in build Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/7d85962e Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/7d85962e Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/7d85962e Branch: refs/heads/develop Commit: 7d85962e4d5274e1e3cda9e3ca9adb40bbd65762 Parents: ed8b2f6 Author: joewitt <joew...@apache.org> Authored: Sat Jan 10 22:29:13 2015 -0500 Committer: joewitt <joew...@apache.org> Committed: Sat Jan 10 22:29:13 2015 -0500 ---------------------------------------------------------------------- LICENSE | 3 + .../output/AttributeExpressionLexer.tokens | 16 +++ .../src/main/resources/conf/bootstrap.conf | 17 +++ .../apache/nifi/processors/kafka/GetKafka.java | 16 +++ .../org.apache.nifi.processor.Processor | 14 ++ .../nifi/processors/kafka/TestPutKafka.java | 16 +++ .../ui/src/main/webapp/META-INF/nifi-processor | 16 ++- .../index.html | 51 ++++++++ .../ui/src/main/webapp/META-INF/nifi-processor | 16 ++- nar-maven-plugin/pom.xml | 131 +++++++++++++++++-- pom.xml | 16 +++ 11 files changed, 301 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7d85962e/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 3757939..d10784d 100644 --- a/LICENSE +++ b/LICENSE @@ -584,3 +584,6 @@ For details see http://aopalliance.sourceforge.net This product bundles 'json2.js' which is available in the 'public domain'. For details see https://github.com/douglascrockford/JSON-js +This product bundles 'reset.css' which is available in the 'public domain'. +For details see http://meyerweb.com/eric/tools/css/reset/ + http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7d85962e/commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/output/AttributeExpressionLexer.tokens ---------------------------------------------------------------------- diff --git a/commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/output/AttributeExpressionLexer.tokens b/commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/output/AttributeExpressionLexer.tokens index 1b973c8..0265bfb 100755 --- a/commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/output/AttributeExpressionLexer.tokens +++ b/commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/output/AttributeExpressionLexer.tokens @@ -1,3 +1,19 @@ +/* + * 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. + */ ALL_ATTRIBUTES=4 ALL_DELINEATED_VALUES=5 ALL_MATCHING_ATTRIBUTES=6 http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7d85962e/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf b/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf index 8568e64..c1536d8 100644 --- a/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf +++ b/nar-bundles/framework-bundle/framework/resources/src/main/resources/conf/bootstrap.conf @@ -1,3 +1,20 @@ +# +# 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. +# + # Java command to use when running NiFi java=java http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7d85962e/nar-bundles/kafka-bundle/kafka-processors/src/main/java/org/apache/nifi/processors/kafka/GetKafka.java ---------------------------------------------------------------------- diff --git a/nar-bundles/kafka-bundle/kafka-processors/src/main/java/org/apache/nifi/processors/kafka/GetKafka.java b/nar-bundles/kafka-bundle/kafka-processors/src/main/java/org/apache/nifi/processors/kafka/GetKafka.java index ea4296e..8c6ca4c 100644 --- a/nar-bundles/kafka-bundle/kafka-processors/src/main/java/org/apache/nifi/processors/kafka/GetKafka.java +++ b/nar-bundles/kafka-bundle/kafka-processors/src/main/java/org/apache/nifi/processors/kafka/GetKafka.java @@ -1,3 +1,19 @@ +/* + * 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 org.apache.nifi.processors.kafka; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7d85962e/nar-bundles/kafka-bundle/kafka-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor ---------------------------------------------------------------------- diff --git a/nar-bundles/kafka-bundle/kafka-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor b/nar-bundles/kafka-bundle/kafka-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor index 6ae3da1..b478d9f 100644 --- a/nar-bundles/kafka-bundle/kafka-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor +++ b/nar-bundles/kafka-bundle/kafka-processors/src/main/resources/META-INF/services/org.apache.nifi.processor.Processor @@ -1,2 +1,16 @@ +# 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. org.apache.nifi.processors.kafka.GetKafka org.apache.nifi.processors.kafka.PutKafka \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7d85962e/nar-bundles/kafka-bundle/kafka-processors/src/test/java/org/apache/nifi/processors/kafka/TestPutKafka.java ---------------------------------------------------------------------- diff --git a/nar-bundles/kafka-bundle/kafka-processors/src/test/java/org/apache/nifi/processors/kafka/TestPutKafka.java b/nar-bundles/kafka-bundle/kafka-processors/src/test/java/org/apache/nifi/processors/kafka/TestPutKafka.java index cf7ed68..06a4604 100644 --- a/nar-bundles/kafka-bundle/kafka-processors/src/test/java/org/apache/nifi/processors/kafka/TestPutKafka.java +++ b/nar-bundles/kafka-bundle/kafka-processors/src/test/java/org/apache/nifi/processors/kafka/TestPutKafka.java @@ -1,3 +1,19 @@ +/* + * 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 org.apache.nifi.processors.kafka; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7d85962e/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/META-INF/nifi-processor ---------------------------------------------------------------------- diff --git a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/META-INF/nifi-processor b/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/META-INF/nifi-processor index 4596f1e..2c0091a 100755 --- a/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/META-INF/nifi-processor +++ b/nar-bundles/monitor-threshold-bundle/ui/src/main/webapp/META-INF/nifi-processor @@ -1 +1,15 @@ -org.apache.nifi.processors.monitor.MonitorThreshold \ No newline at end of file +# 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. +org.apache.nifi.processors.monitor.MonitorThreshold http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7d85962e/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-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 index e69de29..ed1801c 100755 --- a/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 +++ 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 @@ -0,0 +1,51 @@ +<!DOCTYPE html> +<html lang="en"> + <!-- + 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. + --> + <head> + <meta charset="utf-8" /> + <title>Distributed Map Cache Client Service</title> + <link rel="stylesheet" href="../../css/component-usage.css" type="text/css" /> + </head> + + <body> + <h2>Description:</h2> + + <p>A Controller Service that can be used to communicate with a + Distributed Set Cache Server.</p> + + + + <p> + <strong>Properties:</strong> + </p> + <p>In the list below, the names of required properties appear + in bold. Any other properties (not in bold) are considered optional. + If a property has a default value, it is indicated. If a property + supports the use of the NiFi Expression Language (or simply, + "expression language"), that is also indicated.</p> + + <ul> + </ul> + + + <i>See Also:</i> + <ul> + <li><a href="../org.apache.nifi.distributed.cache.server.map.DistributedMapCacheServer/index.html">Distributed Map Cache Server</a></li> + <li><a href="../org.apache.nifi.ssl.StandardSSLContextService/index.html">Standard SSL Context Service</a></li> + </ul> + + </body> +</html> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7d85962e/nar-bundles/update-attribute-bundle/ui/src/main/webapp/META-INF/nifi-processor ---------------------------------------------------------------------- diff --git a/nar-bundles/update-attribute-bundle/ui/src/main/webapp/META-INF/nifi-processor b/nar-bundles/update-attribute-bundle/ui/src/main/webapp/META-INF/nifi-processor index 30c3320..6eda457 100755 --- a/nar-bundles/update-attribute-bundle/ui/src/main/webapp/META-INF/nifi-processor +++ b/nar-bundles/update-attribute-bundle/ui/src/main/webapp/META-INF/nifi-processor @@ -1 +1,15 @@ -org.apache.nifi.processors.attributes.UpdateAttribute \ No newline at end of file +# 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. +org.apache.nifi.processors.attributes.UpdateAttribute http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7d85962e/nar-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/nar-maven-plugin/pom.xml b/nar-maven-plugin/pom.xml index c63f272..7d1a7e6 100644 --- a/nar-maven-plugin/pom.xml +++ b/nar-maven-plugin/pom.xml @@ -73,6 +73,7 @@ <maven.version>3.0.5</maven.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <sealJars>false</sealJars> </properties> <build> <pluginManagement> @@ -89,10 +90,6 @@ </configuration> </plugin> <plugin> - <artifactId>maven-jar-plugin</artifactId> - <version>2.5</version> - </plugin> - <plugin> <artifactId>maven-war-plugin</artifactId> <version>2.5</version> </plugin> @@ -129,11 +126,6 @@ </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.5.1</version> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jaxb2-maven-plugin</artifactId> <version>1.6</version> @@ -161,6 +153,38 @@ <failOnError>false</failOnError> <quiet>true</quiet> <show>private</show> + <encoding>UTF-8</encoding> + <quiet>true</quiet> + <javadocVersion>1.7</javadocVersion> + <additionalJOption>-J-Xmx512m</additionalJOption> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.5.1</version> + <configuration> + <arguments>-P apache-release,check-licenses</arguments> + <autoVersionSubmodules>true</autoVersionSubmodules> + <goals>clean compile javadoc:aggregate deploy</goals> + <preparationGoals>clean compile javadoc:aggregate verify</preparationGoals> + <tagNameFormat>@{project.version}</tagNameFormat> + <releaseProfiles>seal-jars</releaseProfiles> + <useReleaseProfile>false</useReleaseProfile> + <pushChanges>false</pushChanges> + <localCheckout>true</localCheckout> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestEntries> + <Sealed>${sealJars}</Sealed> + <Implementation-Build>${mvngit.commit.id}</Implementation-Build> + </manifestEntries> + </archive> </configuration> </plugin> </plugins> @@ -261,4 +285,93 @@ <scope>provided</scope> </dependency> </dependencies> + <profiles> + <profile> + <id>apache-release</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.apache.resources</groupId> + <artifactId>apache-source-release-assembly-descriptor</artifactId> + <version>1.0.4</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>source-release-assembly</id> + <goals> + <goal>single</goal> + </goals> + <phase>validate</phase> + <configuration> + <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> + <finalName>nifi-${project.version}</finalName> + <descriptorRefs> + <descriptorRef>source-release-zip-tar</descriptorRef> + </descriptorRefs> + <tarLongFileFormat>gnu</tarLongFileFormat> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>rename-source-release-assembly</id> + <goals> + <goal>exec</goal> + </goals> + <phase>validate</phase> + <configuration> + <executable>mv</executable> + <workingDirectory>${project.build.directory}</workingDirectory> + <commandlineArgs>-n nifi-${project.version}-source-release.tar.gz nifi-${project.version}-src.tar.gz</commandlineArgs> + <successCodes> + <successCode>0</successCode> + <successCode>1</successCode> + </successCodes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <!-- Seal jars and skip tests when the + apache-release profile is activated. --> + <id>seal-jars</id> + <properties> + <sealJars>true</sealJars> + <skipTests>true</skipTests> + </properties> + </profile> + <profile> + <!-- Automatically check for licenses. + Activate with -P check-licenses --> + <id>check-licenses</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>check</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/7d85962e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9b74e5f..a297ddd 100644 --- a/pom.xml +++ b/pom.xml @@ -976,6 +976,22 @@ </executions> </plugin> <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>src/main/webapp/js/json2.js</exclude> + <exclude>src/main/webapp/js/jquery/</exclude> + <exclude>src/main/webapp/js/d3/d3.min.js</exclude> + <exclude>src/main/webapp/js/codemirror/</exclude> + <exclude>src/main/webapp/css/reset.css</exclude> + <exclude>src/test/resources/</exclude> <!-- Test datasets --> + <exclude>nb-configuration.xml</exclude> + <exclude>nar-maven-plugin/</exclude> + </excludes> + </configuration> + </plugin> + <plugin> <groupId>org.apache.nifi</groupId> <artifactId>nar-maven-plugin</artifactId> <version>0.0.1-SNAPSHOT</version>
