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:
Matt Gilman
commit
db23609986
|
|
@ -0,0 +1,75 @@
|
||||||
|
<?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.
|
||||||
|
-->
|
||||||
|
<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>maven-plugins</artifactId>
|
||||||
|
<version>0.0.1-SNAPSHOT</version>
|
||||||
|
</parent>
|
||||||
|
<artifactId>nar-maven-plugin</artifactId>
|
||||||
|
<version>0.0.1-SNAPSHOT</version>
|
||||||
|
<packaging>maven-plugin</packaging>
|
||||||
|
<name>Apache NiFi NAR Plugin</name>
|
||||||
|
<description>Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator.</description>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-plugin-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>default-descriptor</id>
|
||||||
|
<goals>
|
||||||
|
<goal>descriptor</goal>
|
||||||
|
</goals>
|
||||||
|
<phase>process-classes</phase>
|
||||||
|
</execution>
|
||||||
|
<execution>
|
||||||
|
<id>help-descriptor</id>
|
||||||
|
<goals>
|
||||||
|
<goal>helpmojo</goal>
|
||||||
|
</goals>
|
||||||
|
<phase>process-classes</phase>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.maven</groupId>
|
||||||
|
<artifactId>maven-plugin-api</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-dependency-plugin</artifactId>
|
||||||
|
<type>maven-plugin</type>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<!-- No code from maven-jar-plugin is actually used; it's included
|
||||||
|
just to simplify the dependencies list. -->
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.maven.plugin-tools</groupId>
|
||||||
|
<artifactId>maven-plugin-annotations</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</project>
|
||||||
|
|
@ -23,11 +23,11 @@
|
||||||
<relativePath/>
|
<relativePath/>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.apache.nifi</groupId>
|
<groupId>org.apache.nifi</groupId>
|
||||||
<artifactId>nar-maven-plugin</artifactId>
|
<artifactId>maven-plugins</artifactId>
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
<version>0.0.1-SNAPSHOT</version>
|
||||||
<packaging>maven-plugin</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>Apache NiFi NAR Plugin</name>
|
<name>Apache NiFi Maven Plugins</name>
|
||||||
<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>
|
<description>Apache NiFi Maven Plugins. 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/maven-site/</url>
|
||||||
<organization>
|
<organization>
|
||||||
<name>Apache NiFi (incubating) Project</name>
|
<name>Apache NiFi (incubating) Project</name>
|
||||||
|
|
@ -58,6 +58,9 @@
|
||||||
<prerequisites>
|
<prerequisites>
|
||||||
<maven>${maven.min-version}</maven>
|
<maven>${maven.min-version}</maven>
|
||||||
</prerequisites>
|
</prerequisites>
|
||||||
|
<modules>
|
||||||
|
<module>nar-maven-plugin</module>
|
||||||
|
</modules>
|
||||||
<scm>
|
<scm>
|
||||||
<connection>scm:git:git://git.apache.org/incubator-nifi.git</connection>
|
<connection>scm:git:git://git.apache.org/incubator-nifi.git</connection>
|
||||||
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git</developerConnection>
|
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git</developerConnection>
|
||||||
|
|
@ -164,23 +167,23 @@
|
||||||
<artifactId>maven-release-plugin</artifactId>
|
<artifactId>maven-release-plugin</artifactId>
|
||||||
<version>2.5.1</version>
|
<version>2.5.1</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>default</id>
|
<id>default</id>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>prepare</goal>
|
<goal>prepare</goal>
|
||||||
<goal>perform</goal>
|
<goal>perform</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<pomFileName>platform/pom.xml</pomFileName>
|
<pomFileName>platform/pom.xml</pomFileName>
|
||||||
<arguments>-P apache-release,check-licenses</arguments>
|
<arguments>-P apache-release,check-licenses</arguments>
|
||||||
<autoVersionSubmodules>true</autoVersionSubmodules>
|
<autoVersionSubmodules>true</autoVersionSubmodules>
|
||||||
<releaseProfiles>apache-release</releaseProfiles>
|
<releaseProfiles>apache-release</releaseProfiles>
|
||||||
<goals>deploy</goals>
|
<goals>deploy</goals>
|
||||||
<tagNameFormat>nar-maven-plugin-@{project.version}</tagNameFormat>
|
<tagNameFormat>@{project.artifactId}-@{project.version}</tagNameFormat>
|
||||||
<pushChanges>false</pushChanges>
|
<pushChanges>false</pushChanges>
|
||||||
<localCheckout>true</localCheckout>
|
<localCheckout>true</localCheckout>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
|
@ -198,26 +201,6 @@
|
||||||
</plugins>
|
</plugins>
|
||||||
</pluginManagement>
|
</pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-plugin-plugin</artifactId>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>default-descriptor</id>
|
|
||||||
<goals>
|
|
||||||
<goal>descriptor</goal>
|
|
||||||
</goals>
|
|
||||||
<phase>process-classes</phase>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
|
||||||
<id>help-descriptor</id>
|
|
||||||
<goals>
|
|
||||||
<goal>helpmojo</goal>
|
|
||||||
</goals>
|
|
||||||
<phase>process-classes</phase>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
<artifactId>maven-enforcer-plugin</artifactId>
|
||||||
|
|
@ -271,28 +254,6 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</dependencyManagement>
|
</dependencyManagement>
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.maven</groupId>
|
|
||||||
<artifactId>maven-plugin-api</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-dependency-plugin</artifactId>
|
|
||||||
<type>maven-plugin</type>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<!-- No code from maven-jar-plugin is actually used; it's included
|
|
||||||
just to simplify the dependencies list. -->
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.maven.plugin-tools</groupId>
|
|
||||||
<artifactId>maven-plugin-annotations</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>apache-release</id>
|
<id>apache-release</id>
|
||||||
|
|
@ -317,7 +278,7 @@
|
||||||
<phase>validate</phase>
|
<phase>validate</phase>
|
||||||
<configuration>
|
<configuration>
|
||||||
<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
|
<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
|
||||||
<finalName>nifi-${project.version}</finalName>
|
<finalName>nifi-${project.artifactId}-${project.version}</finalName>
|
||||||
<descriptorRefs>
|
<descriptorRefs>
|
||||||
<descriptorRef>source-release-zip-tar</descriptorRef>
|
<descriptorRef>source-release-zip-tar</descriptorRef>
|
||||||
</descriptorRefs>
|
</descriptorRefs>
|
||||||
|
|
@ -339,7 +300,7 @@
|
||||||
<configuration>
|
<configuration>
|
||||||
<executable>mv</executable>
|
<executable>mv</executable>
|
||||||
<workingDirectory>${project.build.directory}</workingDirectory>
|
<workingDirectory>${project.build.directory}</workingDirectory>
|
||||||
<commandlineArgs>-n nifi-${project.version}-source-release.tar.gz nifi-${project.version}-src.tar.gz</commandlineArgs>
|
<commandlineArgs>-n nifi-${project.artifactId}-${project.version}-source-release.tar.gz nifi-${project.artifactId}-${project.version}-src.tar.gz</commandlineArgs>
|
||||||
<successCodes>
|
<successCodes>
|
||||||
<successCode>0</successCode>
|
<successCode>0</successCode>
|
||||||
<successCode>1</successCode>
|
<successCode>1</successCode>
|
||||||
|
|
@ -385,16 +385,16 @@
|
||||||
<directory>/opt/nifi/nifi-${project.version}</directory>
|
<directory>/opt/nifi/nifi-${project.version}</directory>
|
||||||
<sources>
|
<sources>
|
||||||
<source>
|
<source>
|
||||||
<location>../LICENSE</location>
|
<location>../../LICENSE</location>
|
||||||
</source>
|
</source>
|
||||||
<source>
|
<source>
|
||||||
<location>../NOTICE</location>
|
<location>../../NOTICE</location>
|
||||||
</source>
|
</source>
|
||||||
<source>
|
<source>
|
||||||
<location>../DISCLAIMER</location>
|
<location>../../DISCLAIMER</location>
|
||||||
</source>
|
</source>
|
||||||
<source>
|
<source>
|
||||||
<location>../README.md</location>
|
<location>../../README.md</location>
|
||||||
<destination>README</destination>
|
<destination>README</destination>
|
||||||
</source>
|
</source>
|
||||||
</sources>
|
</sources>
|
||||||
|
|
@ -109,28 +109,28 @@
|
||||||
</dependencySets>
|
</dependencySets>
|
||||||
<files>
|
<files>
|
||||||
<file>
|
<file>
|
||||||
<source>../README.md</source>
|
<source>../../README.md</source>
|
||||||
<outputDirectory>./</outputDirectory>
|
<outputDirectory>./</outputDirectory>
|
||||||
<destName>README</destName>
|
<destName>README</destName>
|
||||||
<fileMode>0644</fileMode>
|
<fileMode>0644</fileMode>
|
||||||
<filtered>true</filtered>
|
<filtered>true</filtered>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<source>../DISCLAIMER</source>
|
<source>../../DISCLAIMER</source>
|
||||||
<outputDirectory>./</outputDirectory>
|
<outputDirectory>./</outputDirectory>
|
||||||
<destName>DISCLAIMER</destName>
|
<destName>DISCLAIMER</destName>
|
||||||
<fileMode>0644</fileMode>
|
<fileMode>0644</fileMode>
|
||||||
<filtered>true</filtered>
|
<filtered>true</filtered>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<source>../LICENSE</source>
|
<source>../../LICENSE</source>
|
||||||
<outputDirectory>./</outputDirectory>
|
<outputDirectory>./</outputDirectory>
|
||||||
<destName>LICENSE</destName>
|
<destName>LICENSE</destName>
|
||||||
<fileMode>0644</fileMode>
|
<fileMode>0644</fileMode>
|
||||||
<filtered>true</filtered>
|
<filtered>true</filtered>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<source>../NOTICE</source>
|
<source>../../NOTICE</source>
|
||||||
<outputDirectory>./</outputDirectory>
|
<outputDirectory>./</outputDirectory>
|
||||||
<destName>NOTICE</destName>
|
<destName>NOTICE</destName>
|
||||||
<fileMode>0644</fileMode>
|
<fileMode>0644</fileMode>
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue