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/23 03:51:13 UTC
[1/4] incubator-nifi git commit: [NIFI-194] get mvn clean package
working correctly - Removed phase definition for maven-source-plugin -
Changed goal to jar-no-fork to prevent life cylcle forking - Removed version
ranges.
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 13578e2d4 -> df9529c56
[NIFI-194] get mvn clean package working correctly
- Removed phase definition for maven-source-plugin
- Changed goal to jar-no-fork to prevent life cylcle forking
- Removed version ranges.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/3b4a7a63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3b4a7a63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3b4a7a63
Branch: refs/heads/develop
Commit: 3b4a7a63c61ccfd303e7187319b439e85bcc6e58
Parents: 0d8da14
Author: Karl-Heinz Marbaise <kh...@apache.org>
Authored: Mon Dec 22 21:48:35 2014 +0100
Committer: Karl-Heinz Marbaise <kh...@apache.org>
Committed: Mon Dec 22 21:48:35 2014 +0100
----------------------------------------------------------------------
nar-bundles/framework-bundle/framework/client-dto/pom.xml | 3 +--
nar-bundles/pom.xml | 8 ++++----
pom.xml | 2 +-
3 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3b4a7a63/nar-bundles/framework-bundle/framework/client-dto/pom.xml
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/client-dto/pom.xml b/nar-bundles/framework-bundle/framework/client-dto/pom.xml
index 4b210da..924e83a 100644
--- a/nar-bundles/framework-bundle/framework/client-dto/pom.xml
+++ b/nar-bundles/framework-bundle/framework/client-dto/pom.xml
@@ -35,9 +35,8 @@
<executions>
<execution>
<id>attach-sources</id>
- <phase>verify</phase>
<goals>
- <goal>jar</goal>
+ <goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3b4a7a63/nar-bundles/pom.xml
----------------------------------------------------------------------
diff --git a/nar-bundles/pom.xml b/nar-bundles/pom.xml
index 01f7207..4985cdc 100644
--- a/nar-bundles/pom.xml
+++ b/nar-bundles/pom.xml
@@ -97,25 +97,25 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>[0.0.1-SNAPSHOT,1.0.0-SNAPSHOT)</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-runtime</artifactId>
- <version>[0.0.1-SNAPSHOT,1.0.0-SNAPSHOT)</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar</artifactId>
- <version>[0.0.1-SNAPSHOT,1.0.0-SNAPSHOT)</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties</artifactId>
- <version>[0.0.1-SNAPSHOT,1.0.0-SNAPSHOT)</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3b4a7a63/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9607386..8d19fda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -946,4 +946,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
[3/4] incubator-nifi git commit: Merge branch 'NIFI-194' of
https://github.com/khmarbaise/incubator-nifi into develop
Posted by jo...@apache.org.
Merge branch 'NIFI-194' 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/9fc7e646
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/9fc7e646
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/9fc7e646
Branch: refs/heads/develop
Commit: 9fc7e6463c3fc9af3f43b0ac3ae27147bc270b8b
Parents: 13578e2 3b4a7a6
Author: joewitt <jo...@apache.org>
Authored: Mon Dec 22 21:11:05 2014 -0500
Committer: joewitt <jo...@apache.org>
Committed: Mon Dec 22 21:11:05 2014 -0500
----------------------------------------------------------------------
nar-bundles/framework-bundle/framework/client-dto/pom.xml | 3 +--
nar-bundles/pom.xml | 8 ++++----
pom.xml | 2 +-
3 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[4/4] incubator-nifi git commit: Merge branch 'NIFI-195' of
https://github.com/khmarbaise/incubator-nifi into develop
Posted by jo...@apache.org.
Merge branch 'NIFI-195' 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/df9529c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/df9529c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/df9529c5
Branch: refs/heads/develop
Commit: df9529c5616844a0f3d7b6854781339f89dd9b55
Parents: 9fc7e64 3192121
Author: joewitt <jo...@apache.org>
Authored: Mon Dec 22 21:18:45 2014 -0500
Committer: joewitt <jo...@apache.org>
Committed: Mon Dec 22 21:18:45 2014 -0500
----------------------------------------------------------------------
pom.xml | 10 ----------
1 file changed, 10 deletions(-)
----------------------------------------------------------------------
[2/4] incubator-nifi git commit: [NIFI-195] Take advantage of
inheritance from ASF parent version 16
Posted by jo...@apache.org.
[NIFI-195] Take advantage of inheritance from ASF parent version 16
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/31921212
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/31921212
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/31921212
Branch: refs/heads/develop
Commit: 31921212da0e5406d55838493654b429bdc54070
Parents: 0d8da14
Author: Karl-Heinz Marbaise <kh...@apache.org>
Authored: Mon Dec 22 22:41:07 2014 +0100
Committer: Karl-Heinz Marbaise <kh...@apache.org>
Committed: Mon Dec 22 22:41:07 2014 +0100
----------------------------------------------------------------------
pom.xml | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/31921212/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9607386..85bbf19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,11 +144,6 @@
<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>
@@ -891,11 +886,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>
@@ -946,4 +936,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>