You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2014/12/24 04:28:57 UTC
[1/5] incubator-nifi git commit: [NIFI-198] Prerequisites is not
correctly checked Using maven-enforcer-plugin to check the correct maven
version.
Repository: incubator-nifi
Updated Branches:
refs/heads/develop d997fd1b5 -> 9b0a9a641
[NIFI-198] Prerequisites is not correctly checked
Using maven-enforcer-plugin to check the correct maven version.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/07547a74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/07547a74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/07547a74
Branch: refs/heads/develop
Commit: 07547a74f1324fb44ae67b2c60c6f9a531db856b
Parents: df9529c
Author: Karl-Heinz Marbaise <kh...@apache.org>
Authored: Tue Dec 23 22:53:33 2014 +0100
Committer: Karl-Heinz Marbaise <kh...@apache.org>
Committed: Tue Dec 23 22:53:33 2014 +0100
----------------------------------------------------------------------
pom.xml | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 42 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/07547a74/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 85bbf19..3835439 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,8 +52,13 @@
<archive>http://mail-archives.apache.org/mod_mbox/incubator-nifi-commits</archive>
</mailingList>
</mailingLists>
+ <!--
+ ! This marked as deprecated for Maven 3.X. This is checked by maven-enforcer-plugin
+ ! http://jira.codehaus.org/browse/MNG-4840
+ ! http://jira.codehaus.org/browse/MNG-5297
+ -->
<prerequisites>
- <maven>${maven.min-version}</maven>
+ <maven>${maven.version}</maven>
</prerequisites>
<modules>
<!--
@@ -80,6 +85,16 @@
<url>https://issues.apache.org/jira/browse/NIFI</url>
</issueManagement>
<properties>
+ <!--
+ ! Configure the maven-compiler-plugin to use 1.7 for source/target.
+ -->
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ <!--
+ ! Maven minimum version 3.0.5
+ -->
+ <maven.version>3.0.5</maven.version>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<org.slf4j.version>1.7.8</org.slf4j.version>
@@ -836,11 +851,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
<fork>true</fork>
<optimize>true</optimize>
- <encoding>UTF-8</encoding>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
@@ -929,6 +941,32 @@
</pluginManagement>
<plugins>
<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>
+ <plugin>
<groupId>org.apache.nifi</groupId>
<artifactId>nar-maven-plugin</artifactId>
<version>0.0.1-SNAPSHOT</version>
[2/5] incubator-nifi git commit: [NIFI-199] Removed plugin
dependencies from main project cause they are not needed at the moment.
Posted by jo...@apache.org.
[NIFI-199] Removed plugin dependencies from main project cause they are
not needed at the moment.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/03f2ce50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/03f2ce50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/03f2ce50
Branch: refs/heads/develop
Commit: 03f2ce50006ef526ae55876492261ef09fe2e789
Parents: df9529c
Author: Karl-Heinz Marbaise <kh...@apache.org>
Authored: Tue Dec 23 22:58:39 2014 +0100
Committer: Karl-Heinz Marbaise <kh...@apache.org>
Committed: Tue Dec 23 22:58:39 2014 +0100
----------------------------------------------------------------------
pom.xml | 26 +-------------------------
1 file changed, 1 insertion(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/03f2ce50/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 85bbf19..fa6c886 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,22 +133,6 @@
<scope>provided</scope>
</dependency>
<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.plugin-tools</groupId>
- <artifactId>maven-plugin-annotations</artifactId>
- <version>3.3</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
@@ -846,20 +830,12 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<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>
[3/5] incubator-nifi git commit: Merge branch 'NIFI-198' of
https://github.com/khmarbaise/incubator-nifi into develop
Posted by jo...@apache.org.
Merge branch 'NIFI-198' of https://github.com/khmarbaise/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/508b6329
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/508b6329
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/508b6329
Branch: refs/heads/develop
Commit: 508b6329c5d7ee255f3b8e6600b9c12894e32fa0
Parents: d997fd1 07547a7
Author: joewitt <jo...@apache.org>
Authored: Tue Dec 23 22:01:41 2014 -0500
Committer: joewitt <jo...@apache.org>
Committed: Tue Dec 23 22:01:41 2014 -0500
----------------------------------------------------------------------
pom.xml | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 42 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[4/5] incubator-nifi git commit: Merge branch 'NIFI-199' of
https://github.com/khmarbaise/incubator-nifi into develop
Posted by jo...@apache.org.
Merge branch 'NIFI-199' of https://github.com/khmarbaise/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/32bc17db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/32bc17db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/32bc17db
Branch: refs/heads/develop
Commit: 32bc17db852140de427406690b02257fc1fc461e
Parents: 508b632 03f2ce5
Author: joewitt <jo...@apache.org>
Authored: Tue Dec 23 22:12:14 2014 -0500
Committer: joewitt <jo...@apache.org>
Committed: Tue Dec 23 22:12:14 2014 -0500
----------------------------------------------------------------------
pom.xml | 26 +-------------------------
1 file changed, 1 insertion(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/32bc17db/pom.xml
----------------------------------------------------------------------
[5/5] incubator-nifi git commit: NIFI-198 formatting adjustment,
removed comments provided as guides to understand previous patch
Posted by jo...@apache.org.
NIFI-198 formatting adjustment, removed comments provided as guides to understand previous patch
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/9b0a9a64
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/9b0a9a64
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/9b0a9a64
Branch: refs/heads/develop
Commit: 9b0a9a6415f84a170c19cf226b505cb52d48ee04
Parents: 32bc17d
Author: joewitt <jo...@apache.org>
Authored: Tue Dec 23 22:28:42 2014 -0500
Committer: joewitt <jo...@apache.org>
Committed: Tue Dec 23 22:28:42 2014 -0500
----------------------------------------------------------------------
nar-maven-plugin/pom.xml | 32 ++++++++++++++++++++++---
pom.xml | 55 +++++++++++++++++++------------------------
2 files changed, 53 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9b0a9a64/nar-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/nar-maven-plugin/pom.xml b/nar-maven-plugin/pom.xml
index e539f0a..c63f272 100644
--- a/nar-maven-plugin/pom.xml
+++ b/nar-maven-plugin/pom.xml
@@ -68,6 +68,9 @@
<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>
@@ -79,11 +82,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
<fork>true</fork>
<optimize>true</optimize>
- <encoding>UTF-8</encoding>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
@@ -186,6 +186,32 @@
</execution>
</executions>
</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>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9b0a9a64/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index af2b2f7..58831a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,16 +85,9 @@
<url>https://issues.apache.org/jira/browse/NIFI</url>
</issueManagement>
<properties>
- <!--
- ! Configure the maven-compiler-plugin to use 1.7 for source/target.
- -->
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
- <!--
- ! Maven minimum version 3.0.5
- -->
<maven.version>3.0.5</maven.version>
-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<org.slf4j.version>1.7.8</org.slf4j.version>
@@ -917,30 +910,30 @@
</pluginManagement>
<plugins>
<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>
+ <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>
<plugin>
<groupId>org.apache.nifi</groupId>