You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/01/20 15:01:40 UTC
[04/42] incubator-nifi git commit: NIFI-270: rework to assume that
each maven item is released independently.
NIFI-270: rework to assume that each maven item is released independently.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/3ed0d13d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3ed0d13d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3ed0d13d
Branch: refs/heads/NIFI-250
Commit: 3ed0d13da1bf4388f85998da38efc4506ddac7ca
Parents: c222859
Author: Benson Margulies <bi...@apache.org>
Authored: Fri Jan 16 08:05:15 2015 -0500
Committer: Benson Margulies <bi...@apache.org>
Committed: Fri Jan 16 08:05:15 2015 -0500
----------------------------------------------------------------------
maven-plugins/nar-maven-plugin/pom.xml | 161 ++++++++++++-
maven-plugins/pom.xml | 358 ----------------------------
nifi/pom.xml | 2 +-
3 files changed, 159 insertions(+), 362 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3ed0d13d/maven-plugins/nar-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml
index cb09ff8..dba4ca2 100644
--- a/maven-plugins/nar-maven-plugin/pom.xml
+++ b/maven-plugins/nar-maven-plugin/pom.xml
@@ -17,16 +17,167 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.nifi</groupId>
- <artifactId>maven-plugins</artifactId>
- <version>0.0.2-test-incubating-SNAPSHOT</version>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>16</version>
+ <relativePath />
</parent>
+
<artifactId>nar-maven-plugin</artifactId>
<version>0.0.2-test-incubating-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>
+ <url>http://nifi.incubator.apache.org/maven-site/</url>
+ <organization>
+ <name>Apache NiFi (incubating) Project</name>
+ <url>http://nifi.incubating.apache.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ </license>
+ </licenses>
+ <mailingLists>
+ <mailingList>
+ <name>Dev</name>
+ <subscribe>dev-subscribe@nifi.incubator.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe@nifi.incubator.apache.org</unsubscribe>
+ <post>dev@nifi.incubator.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/incubator-nifi-dev</archive>
+ </mailingList>
+ <mailingList>
+ <name>Commits</name>
+ <subscribe>commits-subscribe@nifi.incubator.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe@nifi.incubator.apache.org</unsubscribe>
+ <post>commits@nifi.incubator.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/incubator-nifi-commits</archive>
+ </mailingList>
+ </mailingLists>
+ <scm>
+ <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>
+ <url>https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git</url>
+ <tag>HEAD</tag>
+ </scm>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://issues.apache.org/jira/browse/NIFI</url>
+ </issueManagement>
+ <properties>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.version>3.0.5</maven.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
+ <prerequisites>
+ <maven>${maven.min-version}</maven>
+ </prerequisites>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.2</version>
+ <configuration>
+ <fork>true</fork>
+ <optimize>true</optimize>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.18</version>
+ <configuration>
+ <argLine>-Xmx1G</argLine>
+ </configuration>
+ </plugin>
+ <plugin>
+ <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.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.3.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.1</version>
+ <configuration>
+ <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>
+ <useReleaseProfile>true</useReleaseProfile>
+ <releaseProfiles>apache-release,check-licenses</releaseProfiles>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <goals>deploy</goals>
+ <tagNameFormat>@{project.artifactId}-@{project.version}</tagNameFormat>
+ <pushChanges>false</pushChanges>
+ <localCheckout>true</localCheckout>
+ </configuration>
+ <executions>
+ <execution>
+ <id>default</id>
+ <goals>
+ <goal>perform</goal>
+ </goals>
+ <configuration>
+ <pomFileName>maven-plugins/nar-maven-plugin/pom.xml</pomFileName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Implementation-Build>${mvngit.commit.id}</Implementation-Build>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -54,22 +205,26 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
+ <version>3.0.5</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<type>maven-plugin</type>
+ <version>2.9</version>
</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>
+ <version>2.5</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<scope>provided</scope>
+ <version>3.3</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3ed0d13d/maven-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml
deleted file mode 100644
index 22be9c9..0000000
--- a/maven-plugins/pom.xml
+++ /dev/null
@@ -1,358 +0,0 @@
-<?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</groupId>
- <artifactId>apache</artifactId>
- <version>16</version>
- <relativePath />
- </parent>
- <groupId>org.apache.nifi</groupId>
- <artifactId>maven-plugins</artifactId>
- <version>0.0.2-test-incubating-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Apache NiFi Maven Plugins</name>
- <description>Apache NiFi Maven Plugins. It is currently a part of the Apache Incubator.</description>
- <url>http://nifi.incubator.apache.org/maven-site/</url>
- <organization>
- <name>Apache NiFi (incubating) Project</name>
- <url>http://nifi.incubating.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
- <mailingLists>
- <mailingList>
- <name>Dev</name>
- <subscribe>dev-subscribe@nifi.incubator.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@nifi.incubator.apache.org</unsubscribe>
- <post>dev@nifi.incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-nifi-dev</archive>
- </mailingList>
- <mailingList>
- <name>Commits</name>
- <subscribe>commits-subscribe@nifi.incubator.apache.org</subscribe>
- <unsubscribe>commits-unsubscribe@nifi.incubator.apache.org</unsubscribe>
- <post>commits@nifi.incubator.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/incubator-nifi-commits</archive>
- </mailingList>
- </mailingLists>
- <prerequisites>
- <maven>${maven.min-version}</maven>
- </prerequisites>
- <modules>
- <module>nar-maven-plugin</module>
- </modules>
- <scm>
- <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>
- <url>https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git</url>
- <tag>HEAD</tag>
- </scm>
- <issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/NIFI</url>
- </issueManagement>
- <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
- <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>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
- <configuration>
- <fork>true</fork>
- <optimize>true</optimize>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>3.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.9</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.18</version>
- <configuration>
- <argLine>-Xmx1G</argLine>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.2</version>
- <configuration>
- <attach>false</attach>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <version>1.6</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.4</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.3.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.1</version>
- <configuration>
- <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>
- <useReleaseProfile>true</useReleaseProfile>
- <releaseProfiles>apache-release,check-licenses</releaseProfiles>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- <goals>deploy</goals>
- <tagNameFormat>@{project.artifactId}-@{project.version}</tagNameFormat>
- <pushChanges>false</pushChanges>
- <localCheckout>true</localCheckout>
- </configuration>
- <executions>
- <execution>
- <id>default</id>
- <goals>
- <goal>perform</goal>
- </goals>
- <configuration>
- <pomFileName>maven-plugins/pom.xml</pomFileName>
- </configuration>
- </execution>
- </executions>
- </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>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.3</version>
- <extensions>true</extensions>
- <configuration>
- <serverId>repository.apache.org</serverId>
- <nexusUrl>https://repository.apache.org/</nexusUrl>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-maven</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireSameVersions>
- <plugins>
- <plugin>org.apache.maven.plugins:maven-surefire-plugin</plugin>
- <plugin>org.apache.maven.plugins:maven-failsafe-plugin</plugin>
- <plugin>org.apache.maven.plugins:maven-surefire-report-plugin</plugin>
- </plugins>
- </requireSameVersions>
- <requireMavenVersion>
- <version>${maven.version}</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0.11</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.9</version>
- <type>maven-plugin</type>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-annotations</artifactId>
- <version>3.3</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <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.artifactId}-${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.artifactId}-${project.version}-source-release.tar.gz nifi-${project.artifactId}-${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/3ed0d13d/nifi/pom.xml
----------------------------------------------------------------------
diff --git a/nifi/pom.xml b/nifi/pom.xml
index c79ef51..e74d2be 100644
--- a/nifi/pom.xml
+++ b/nifi/pom.xml
@@ -988,7 +988,7 @@
<plugin>
<groupId>org.apache.nifi</groupId>
<artifactId>nar-maven-plugin</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-test-incubating-SNAPSHOT</version>
<extensions>true</extensions>
</plugin>
</plugins>