mirror of https://github.com/apache/nifi.git
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
This commit is contained in:
commit
4b852ebc65
14
README.md
14
README.md
|
@ -1,3 +1,17 @@
|
|||
<!--
|
||||
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.
|
||||
-->
|
||||
# Apache NiFi
|
||||
|
||||
Apache NiFi is a dataflow system based on the concepts of flow-based programming. It is currently apart of the Apache Incubator.
|
||||
|
|
|
@ -1,3 +1,17 @@
|
|||
<!--
|
||||
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.
|
||||
-->
|
||||
# Apache NiFi NAR Maven Plugin
|
||||
|
||||
Apache NiFi NAR Maven Plugin helps to build NiFi Archive bundles to support the classloader isolation model of NiFi.
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
<version>1.0.1-incubating-SNAPSHOT</version>
|
||||
<packaging>maven-plugin</packaging>
|
||||
<description>Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator.</description>
|
||||
<url>http://nifi.incubator.apache.org/maven-site/</url>
|
||||
<url>http://nifi.incubator.apache.org</url>
|
||||
<organization>
|
||||
<name>Apache NiFi (incubating)</name>
|
||||
<url>http://nifi.incubator.apache.org/</url>
|
||||
|
@ -206,9 +206,9 @@
|
|||
<artifactId>apache-rat-plugin</artifactId>
|
||||
<configuration>
|
||||
<excludes>
|
||||
<exclude>nb-configuration.xml</exclude>
|
||||
<exclude>nbactions.xml</exclude>
|
||||
<exclude>DEPENDENCIES</exclude>
|
||||
<exclude>nb-configuration.xml</exclude> <!-- convenience exclude for netbeans users -->
|
||||
<exclude>nbactions.xml</exclude> <!-- convenience excludes for netbeans users -->
|
||||
<exclude>DEPENDENCIES</exclude> <!-- auto generated by maven while building sources zip and more -->
|
||||
</excludes>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
|
|
@ -1,3 +1,17 @@
|
|||
<!--
|
||||
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.
|
||||
-->
|
||||
# About
|
||||
[Apache NiFi project] (http://nifi.incubator.apache.org).
|
||||
|
||||
|
|
|
@ -1,3 +1,17 @@
|
|||
<!--
|
||||
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.
|
||||
-->
|
||||
# Apache NiFi
|
||||
|
||||
Apache NiFi is a dataflow system based on the concepts of flow-based programming. It is currently apart of the Apache Incubator.
|
||||
|
|
|
@ -43,6 +43,7 @@
|
|||
<descriptors>
|
||||
<descriptor>src/main/assembly/dependencies.xml</descriptor>
|
||||
</descriptors>
|
||||
<tarLongFileMode>posix</tarLongFileMode>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
|
|
21
nifi/pom.xml
21
nifi/pom.xml
|
@ -26,7 +26,7 @@
|
|||
<version>0.0.2-incubating-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<description>Apache NiFi is a dataflow system based on the concepts of flow-based programming. It is currently a part of the Apache Incubator.</description>
|
||||
<url>http://nifi.incubator.apache.org/maven-site/</url>
|
||||
<url>http://nifi.incubator.apache.org</url>
|
||||
<organization>
|
||||
<name>Apache NiFi (incubating)</name>
|
||||
<url>http://nifi.incubator.apache.org/</url>
|
||||
|
@ -842,9 +842,6 @@
|
|||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<version>2.5.2</version>
|
||||
<configuration>
|
||||
<tarLongFileMode>gnu</tarLongFileMode>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
|
@ -959,15 +956,15 @@
|
|||
<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/main/webapp/js/json2.js</exclude> <!-- license/notice accounted for -->
|
||||
<exclude>src/main/webapp/js/jquery/</exclude> <!-- license/notice accounted for -->
|
||||
<exclude>src/main/webapp/js/d3/d3.min.js</exclude> <!-- license/notice accounted for -->
|
||||
<exclude>src/main/webapp/js/codemirror/</exclude> <!-- license/notice accounted for -->
|
||||
<exclude>src/main/webapp/css/reset.css</exclude> <!-- license/notice accounted for -->
|
||||
<exclude>src/test/resources/</exclude> <!-- Test datasets -->
|
||||
<exclude>nb-configuration.xml</exclude>
|
||||
<exclude>nbactions.xml</exclude>
|
||||
<exclude>DEPENDENCIES</exclude>
|
||||
<exclude>nb-configuration.xml</exclude><!-- courtesy exclude for netbeans users -->
|
||||
<exclude>nbactions.xml</exclude> <!-- courtesy exclude for netbeans users -->
|
||||
<exclude>DEPENDENCIES</exclude> <!-- auto generated file by maven while building sources.zip -->
|
||||
</excludes>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
|
Loading…
Reference in New Issue