From 9335b46aaf0e75f3e227ec903d88c2c9d11891ec Mon Sep 17 00:00:00 2001 From: Benson Margulies Date: Fri, 16 Jan 2015 07:29:17 -0500 Subject: [PATCH 01/15] NIFI-270: fix version to be 'incubating' * nexus staging plugin. * clean up release config. --- maven-plugins/nar-maven-plugin/pom.xml | 4 +-- maven-plugins/pom.xml | 47 ++++++++++++++++---------- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index c0236fd9f4..af313ad226 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -19,10 +19,10 @@ org.apache.nifi maven-plugins - 0.0.1-SNAPSHOT + 0.0.1-incubating-SNAPSHOT nar-maven-plugin - 0.0.1-SNAPSHOT + 0.0.1-incubating-SNAPSHOT maven-plugin Apache NiFi NAR Plugin Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator. diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml index 31d2bdca04..83f3cc3e8d 100644 --- a/maven-plugins/pom.xml +++ b/maven-plugins/pom.xml @@ -24,7 +24,7 @@ org.apache.nifi maven-plugins - 0.0.1-SNAPSHOT + 0.0.1-incubating-SNAPSHOT pom Apache NiFi Maven Plugins Apache NiFi Maven Plugins. It is currently a part of the Apache Incubator. @@ -166,24 +166,25 @@ org.apache.maven.plugins maven-release-plugin 2.5.1 + + true + apache-release,check-licenses + true + deploy + @{project.artifactId}-@{project.version} + false + true + - - default - - prepare - perform - - - platform/pom.xml - -P apache-release,check-licenses - true - apache-release - deploy - @{project.artifactId}-@{project.version} - false - true - - + + default + + perform + + + maven-plugins/pom.xml + + @@ -201,6 +202,16 @@ + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.3 + true + + repository.apache.org + https://repository.apache.org/ + + org.apache.maven.plugins maven-enforcer-plugin From 763251499361f96bdea122c8ba06e669806aae8b Mon Sep 17 00:00:00 2001 From: Benson Margulies Date: Fri, 16 Jan 2015 07:47:49 -0500 Subject: [PATCH 02/15] [maven-release-plugin] prepare release maven-plugins-0.0.1-test-incubating --- maven-plugins/nar-maven-plugin/pom.xml | 4 ++-- maven-plugins/pom.xml | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index af313ad226..fcf9c54cd6 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -19,10 +19,10 @@ org.apache.nifi maven-plugins - 0.0.1-incubating-SNAPSHOT + 0.0.1-test-incubating nar-maven-plugin - 0.0.1-incubating-SNAPSHOT + 0.0.1-test-incubating maven-plugin Apache NiFi NAR Plugin Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator. diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml index 83f3cc3e8d..127fde488f 100644 --- a/maven-plugins/pom.xml +++ b/maven-plugins/pom.xml @@ -20,11 +20,11 @@ org.apache apache 16 - + org.apache.nifi maven-plugins - 0.0.1-incubating-SNAPSHOT + 0.0.1-test-incubating pom Apache NiFi Maven Plugins Apache NiFi Maven Plugins. It is currently a part of the Apache Incubator. @@ -65,7 +65,8 @@ scm:git:git://git.apache.org/incubator-nifi.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git - + maven-plugins-0.0.1-test-incubating + JIRA https://issues.apache.org/jira/browse/NIFI From c222859a2510cf27aa1cb24caa719717bf98bb80 Mon Sep 17 00:00:00 2001 From: Benson Margulies Date: Fri, 16 Jan 2015 07:47:59 -0500 Subject: [PATCH 03/15] [maven-release-plugin] prepare for next development iteration --- maven-plugins/nar-maven-plugin/pom.xml | 4 ++-- maven-plugins/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index fcf9c54cd6..cb09ff8c03 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -19,10 +19,10 @@ org.apache.nifi maven-plugins - 0.0.1-test-incubating + 0.0.2-test-incubating-SNAPSHOT nar-maven-plugin - 0.0.1-test-incubating + 0.0.2-test-incubating-SNAPSHOT maven-plugin Apache NiFi NAR Plugin Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator. diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml index 127fde488f..22be9c96d0 100644 --- a/maven-plugins/pom.xml +++ b/maven-plugins/pom.xml @@ -24,7 +24,7 @@ org.apache.nifi maven-plugins - 0.0.1-test-incubating + 0.0.2-test-incubating-SNAPSHOT pom Apache NiFi Maven Plugins Apache NiFi Maven Plugins. It is currently a part of the Apache Incubator. @@ -65,7 +65,7 @@ scm:git:git://git.apache.org/incubator-nifi.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git - maven-plugins-0.0.1-test-incubating + HEAD JIRA From 3ed0d13da1bf4388f85998da38efc4506ddac7ca Mon Sep 17 00:00:00 2001 From: Benson Margulies Date: Fri, 16 Jan 2015 08:05:15 -0500 Subject: [PATCH 04/15] NIFI-270: rework to assume that each maven item is released independently. --- maven-plugins/nar-maven-plugin/pom.xml | 161 ++++++++++- maven-plugins/pom.xml | 358 ------------------------- nifi/pom.xml | 2 +- 3 files changed, 159 insertions(+), 362 deletions(-) delete mode 100644 maven-plugins/pom.xml diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index cb09ff8c03..dba4ca24ef 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -17,16 +17,167 @@ 4.0.0 - org.apache.nifi - maven-plugins - 0.0.2-test-incubating-SNAPSHOT + org.apache + apache + 16 + + nar-maven-plugin 0.0.2-test-incubating-SNAPSHOT maven-plugin Apache NiFi NAR Plugin Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator. + http://nifi.incubator.apache.org/maven-site/ + + Apache NiFi (incubating) Project + http://nifi.incubating.apache.org/ + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + Dev + dev-subscribe@nifi.incubator.apache.org + dev-unsubscribe@nifi.incubator.apache.org + dev@nifi.incubator.apache.org + http://mail-archives.apache.org/mod_mbox/incubator-nifi-dev + + + Commits + commits-subscribe@nifi.incubator.apache.org + commits-unsubscribe@nifi.incubator.apache.org + commits@nifi.incubator.apache.org + http://mail-archives.apache.org/mod_mbox/incubator-nifi-commits + + + + scm:git:git://git.apache.org/incubator-nifi.git + scm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git + https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git + HEAD + + + JIRA + https://issues.apache.org/jira/browse/NIFI + + + 1.7 + 1.7 + 3.0.5 + UTF-8 + UTF-8 + + + ${maven.min-version} + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.2 + + true + true + true + true + + + + org.apache.maven.plugins + maven-resources-plugin + 2.7 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.18 + + -Xmx1G + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.5.2 + + gnu + + + + org.apache.maven.plugins + maven-source-plugin + 2.4 + + + org.apache.maven.plugins + maven-site-plugin + 3.4 + + + org.codehaus.mojo + exec-maven-plugin + 1.3.2 + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.1 + + false + true + private + UTF-8 + true + 1.7 + -J-Xmx512m + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.1 + + true + apache-release,check-licenses + true + deploy + @{project.artifactId}-@{project.version} + false + true + + + + default + + perform + + + maven-plugins/nar-maven-plugin/pom.xml + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.5 + + + + ${mvngit.commit.id} + + + + + + org.apache.maven.plugins @@ -54,22 +205,26 @@ org.apache.maven maven-plugin-api + 3.0.5 org.apache.maven.plugins maven-dependency-plugin maven-plugin + 2.9 org.apache.maven.plugins maven-jar-plugin + 2.5 org.apache.maven.plugin-tools maven-plugin-annotations provided + 3.3 diff --git a/maven-plugins/pom.xml b/maven-plugins/pom.xml deleted file mode 100644 index 22be9c96d0..0000000000 --- a/maven-plugins/pom.xml +++ /dev/null @@ -1,358 +0,0 @@ - - - - 4.0.0 - - - org.apache - apache - 16 - - - org.apache.nifi - maven-plugins - 0.0.2-test-incubating-SNAPSHOT - pom - Apache NiFi Maven Plugins - Apache NiFi Maven Plugins. It is currently a part of the Apache Incubator. - http://nifi.incubator.apache.org/maven-site/ - - Apache NiFi (incubating) Project - http://nifi.incubating.apache.org/ - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - - - - Dev - dev-subscribe@nifi.incubator.apache.org - dev-unsubscribe@nifi.incubator.apache.org - dev@nifi.incubator.apache.org - http://mail-archives.apache.org/mod_mbox/incubator-nifi-dev - - - Commits - commits-subscribe@nifi.incubator.apache.org - commits-unsubscribe@nifi.incubator.apache.org - commits@nifi.incubator.apache.org - http://mail-archives.apache.org/mod_mbox/incubator-nifi-commits - - - - ${maven.min-version} - - - nar-maven-plugin - - - scm:git:git://git.apache.org/incubator-nifi.git - scm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git - https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git - HEAD - - - JIRA - https://issues.apache.org/jira/browse/NIFI - - - 1.7 - 1.7 - 3.0.5 - UTF-8 - UTF-8 - false - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.2 - - true - true - true - true - - - - maven-war-plugin - 2.5 - - - org.apache.maven.plugins - maven-plugin-plugin - 3.3 - - - org.apache.maven.plugins - maven-dependency-plugin - 2.9 - - - org.apache.maven.plugins - maven-resources-plugin - 2.7 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.18 - - -Xmx1G - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.5.2 - - false - gnu - - - - org.codehaus.mojo - jaxb2-maven-plugin - 1.6 - - - org.apache.maven.plugins - maven-source-plugin - 2.4 - - - org.apache.maven.plugins - maven-site-plugin - 3.4 - - - org.codehaus.mojo - exec-maven-plugin - 1.3.2 - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.1 - - false - true - private - UTF-8 - true - 1.7 - -J-Xmx512m - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.1 - - true - apache-release,check-licenses - true - deploy - @{project.artifactId}-@{project.version} - false - true - - - - default - - perform - - - maven-plugins/pom.xml - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - ${sealJars} - ${mvngit.commit.id} - - - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.3 - true - - repository.apache.org - https://repository.apache.org/ - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-maven - - enforce - - - - - - org.apache.maven.plugins:maven-surefire-plugin - org.apache.maven.plugins:maven-failsafe-plugin - org.apache.maven.plugins:maven-surefire-report-plugin - - - - ${maven.version} - - - - - - - - - - - - org.apache.maven - maven-plugin-api - 2.0.11 - - - org.apache.maven.plugins - maven-dependency-plugin - 2.9 - maven-plugin - - - org.apache.maven.plugins - maven-jar-plugin - 2.5 - - - org.apache.maven.plugin-tools - maven-plugin-annotations - 3.3 - - - - - - apache-release - - - - org.apache.maven.plugins - maven-assembly-plugin - - - org.apache.apache.resources - apache-source-release-assembly-descriptor - 1.0.4 - - - - - source-release-assembly - - single - - validate - - true - nifi-${project.artifactId}-${project.version} - - source-release-zip-tar - - gnu - - - - - - org.codehaus.mojo - exec-maven-plugin - - - rename-source-release-assembly - - exec - - validate - - mv - ${project.build.directory} - -n nifi-${project.artifactId}-${project.version}-source-release.tar.gz nifi-${project.artifactId}-${project.version}-src.tar.gz - - 0 - 1 - - - - - - - - - - - seal-jars - - true - true - - - - - check-licenses - - - - org.apache.rat - apache-rat-plugin - - - - check - - verify - - - - - - - - diff --git a/nifi/pom.xml b/nifi/pom.xml index c79ef51eb9..e74d2bef5c 100644 --- a/nifi/pom.xml +++ b/nifi/pom.xml @@ -988,7 +988,7 @@ org.apache.nifi nar-maven-plugin - 0.0.1-SNAPSHOT + 0.0.2-test-incubating-SNAPSHOT true From 8c5e866b77dc4d5dc01a1288335486e646522433 Mon Sep 17 00:00:00 2001 From: Benson Margulies Date: Fri, 16 Jan 2015 08:10:15 -0500 Subject: [PATCH 05/15] NIFI-270: restore nexus staging. --- maven-plugins/nar-maven-plugin/pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index dba4ca24ef..6e77ef004a 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -179,6 +179,16 @@ + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.5 + true + + repository.apache.org + https://repository.apache.org/ + + org.apache.maven.plugins maven-plugin-plugin From d2160fe985661b79e6d08b863247f8747da27a12 Mon Sep 17 00:00:00 2001 From: Benson Margulies Date: Fri, 16 Jan 2015 08:21:22 -0500 Subject: [PATCH 06/15] NIFI-270: fix groupId. --- maven-plugins/nar-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index 6e77ef004a..5b557c9ddd 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -22,7 +22,7 @@ 16 - + org.apache.nifi nar-maven-plugin 0.0.2-test-incubating-SNAPSHOT maven-plugin From 7a70a1744e76b571d3ea2c94473e813b06d72bee Mon Sep 17 00:00:00 2001 From: Benson Margulies Date: Fri, 16 Jan 2015 08:23:44 -0500 Subject: [PATCH 07/15] NIFI-270: retreat to old maven plugin API version. --- maven-plugins/nar-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index 5b557c9ddd..715503bfee 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -215,7 +215,7 @@ org.apache.maven maven-plugin-api - 3.0.5 + 2.2.1 org.apache.maven.plugins From 14877a48b9156f7f0cc300bba09fc54f22d93e84 Mon Sep 17 00:00:00 2001 From: Benson Margulies Date: Fri, 16 Jan 2015 08:35:24 -0500 Subject: [PATCH 08/15] [maven-release-plugin] prepare release nar-maven-plugin-0.0.2-test-incubating --- maven-plugins/nar-maven-plugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index 715503bfee..773b908572 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.nifi nar-maven-plugin - 0.0.2-test-incubating-SNAPSHOT + 0.0.2-test-incubating maven-plugin Apache NiFi NAR Plugin Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator. @@ -59,7 +59,7 @@ scm:git:git://git.apache.org/incubator-nifi.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git - HEAD + nar-maven-plugin-0.0.2-test-incubating JIRA From ab2032e63cdbc481966fda6c6fed53bbfd84b521 Mon Sep 17 00:00:00 2001 From: Benson Margulies Date: Fri, 16 Jan 2015 08:35:34 -0500 Subject: [PATCH 09/15] [maven-release-plugin] prepare for next development iteration --- maven-plugins/nar-maven-plugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index 773b908572..124850ddfc 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.nifi nar-maven-plugin - 0.0.2-test-incubating + 0.0.3-test-incubating-SNAPSHOT maven-plugin Apache NiFi NAR Plugin Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator. @@ -59,7 +59,7 @@ scm:git:git://git.apache.org/incubator-nifi.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git - nar-maven-plugin-0.0.2-test-incubating + HEAD JIRA From 314241ba81d5c0aec53d1df26b3d8d3e92544dba Mon Sep 17 00:00:00 2001 From: Benson Margulies Date: Fri, 16 Jan 2015 08:40:47 -0500 Subject: [PATCH 10/15] NIFI-270: remove reference to nonexistent check-license profile. --- maven-plugins/nar-maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index 124850ddfc..b176de6fde 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -145,7 +145,7 @@ 2.5.1 true - apache-release,check-licenses + apache-release true deploy @{project.artifactId}-@{project.version} From a2f63c7c886495ccee52a448e7a9625ad65ad1f9 Mon Sep 17 00:00:00 2001 From: joewitt Date: Fri, 16 Jan 2015 11:59:49 -0500 Subject: [PATCH 11/15] NIFI-270 updating poms approaching release - about to practice another staging build --- maven-plugins/nar-maven-plugin/pom.xml | 91 +++++++++++++------- nifi/pom.xml | 114 +++++++------------------ 2 files changed, 93 insertions(+), 112 deletions(-) diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index b176de6fde..5c9bc62a38 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -59,8 +59,8 @@ scm:git:git://git.apache.org/incubator-nifi.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git - HEAD - + HEAD + JIRA https://issues.apache.org/jira/browse/NIFI @@ -68,7 +68,7 @@ 1.7 1.7 - 3.0.5 + 3.0.5 UTF-8 UTF-8 @@ -144,24 +144,24 @@ maven-release-plugin 2.5.1 - true - apache-release - true - deploy - @{project.artifactId}-@{project.version} - false - true + true + apache-release + true + deploy + @{project.artifactId}-@{project.version} + false + true - - default - - perform - - - maven-plugins/nar-maven-plugin/pom.xml - - + + default + + perform + + + maven-plugins/nar-maven-plugin/pom.xml + + @@ -179,16 +179,16 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.5 - true - - repository.apache.org - https://repository.apache.org/ - - + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.5 + true + + repository.apache.org + https://repository.apache.org/ + + org.apache.maven.plugins maven-plugin-plugin @@ -209,6 +209,16 @@ + + org.apache.rat + apache-rat-plugin + + + nb-configuration.xml + nbactions.xml + + + @@ -237,4 +247,27 @@ 3.3 + + + + check-licenses + + + + org.apache.rat + apache-rat-plugin + + + + check + + verify + + + + + + + diff --git a/nifi/pom.xml b/nifi/pom.xml index e74d2bef5c..d6d312df01 100644 --- a/nifi/pom.xml +++ b/nifi/pom.xml @@ -19,6 +19,7 @@ org.apache apache 16 + org.apache.nifi nifi-parent @@ -53,13 +54,8 @@ http://mail-archives.apache.org/mod_mbox/incubator-nifi-commits - - ${maven.version} + ${maven.min-version} commons @@ -74,6 +70,7 @@ scm:git:git://git.apache.org/incubator-nifi.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git + HEAD JIRA @@ -82,7 +79,7 @@ 1.7 1.7 - 3.0.5 + 3.0.5 UTF-8 UTF-8 1.7.8 @@ -91,7 +88,6 @@ 4.1.2.RELEASE 3.2.5.RELEASE 1.18.3 - false @@ -894,7 +890,6 @@ - ${sealJars} ${mvngit.commit.id} @@ -919,16 +914,25 @@ maven-release-plugin 2.5.1 - -P apache-release,check-licenses + true + apache-release true - clean compile javadoc:aggregate deploy - clean compile javadoc:aggregate verify - @{project.version} - seal-jars - false + deploy + @{project.artifactId}-@{project.version} false true + + + default + + perform + + + nifi/pom.xml + + + org.codehaus.mojo @@ -943,6 +947,16 @@ + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.5 + true + + repository.apache.org + https://repository.apache.org/ + + org.apache.maven.plugins maven-enforcer-plugin @@ -962,7 +976,7 @@ - ${maven.version} + ${maven.min-version} @@ -988,78 +1002,12 @@ org.apache.nifi nar-maven-plugin - 0.0.2-test-incubating-SNAPSHOT + 0.0.2-test-incubating true - - apache-release - - - - org.apache.maven.plugins - maven-assembly-plugin - - - org.apache.apache.resources - apache-source-release-assembly-descriptor - 1.0.4 - - - - - source-release-assembly - - single - - validate - - true - nifi-${project.version} - - source-release-zip-tar - - gnu - - - - - - org.codehaus.mojo - exec-maven-plugin - - - rename-source-release-assembly - - exec - - validate - - mv - ${project.build.directory} - -n nifi-${project.version}-source-release.tar.gz nifi-${project.version}-src.tar.gz - - 0 - 1 - - - - - - - - - - - seal-jars - - true - true - - From eb3d59920aaf329254fe23abb1dbfdd4873fd8dd Mon Sep 17 00:00:00 2001 From: joewitt Date: Fri, 16 Jan 2015 12:01:17 -0500 Subject: [PATCH 12/15] [maven-release-plugin] prepare release nar-maven-plugin-0.0.3-test-incubating --- maven-plugins/nar-maven-plugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index 5c9bc62a38..2bbfeb64e5 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.nifi nar-maven-plugin - 0.0.3-test-incubating-SNAPSHOT + 0.0.3-test-incubating maven-plugin Apache NiFi NAR Plugin Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator. @@ -59,7 +59,7 @@ scm:git:git://git.apache.org/incubator-nifi.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git - HEAD + nar-maven-plugin-0.0.3-test-incubating JIRA From b1be36e6221d1275cd81f160238f04ebf0c7dbe1 Mon Sep 17 00:00:00 2001 From: joewitt Date: Fri, 16 Jan 2015 12:01:27 -0500 Subject: [PATCH 13/15] [maven-release-plugin] prepare for next development iteration --- maven-plugins/nar-maven-plugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index 2bbfeb64e5..9e2ba9726c 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.nifi nar-maven-plugin - 0.0.3-test-incubating + 0.0.4-test-incubating-SNAPSHOT maven-plugin Apache NiFi NAR Plugin Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator. @@ -59,7 +59,7 @@ scm:git:git://git.apache.org/incubator-nifi.git scm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git - nar-maven-plugin-0.0.3-test-incubating + HEAD JIRA From 9c8c1c4f48b951c06301077ffbcd51eb470d31cc Mon Sep 17 00:00:00 2001 From: joewitt Date: Fri, 16 Jan 2015 12:20:20 -0500 Subject: [PATCH 14/15] NIFI-270 staging build for nar plugin good. Now to try for full build --- nifi/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi/pom.xml b/nifi/pom.xml index d6d312df01..f64f13bf3a 100644 --- a/nifi/pom.xml +++ b/nifi/pom.xml @@ -1002,7 +1002,7 @@ org.apache.nifi nar-maven-plugin - 0.0.2-test-incubating + 0.0.3-test-incubating true From c91d875f3649b73ce909585780b2e218736e76d6 Mon Sep 17 00:00:00 2001 From: joewitt Date: Fri, 16 Jan 2015 12:32:07 -0500 Subject: [PATCH 15/15] NIFI-270 nar maven plugin now on proper version scheme for incubator --- maven-plugins/nar-maven-plugin/pom.xml | 2 +- nifi/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-plugins/nar-maven-plugin/pom.xml b/maven-plugins/nar-maven-plugin/pom.xml index 9e2ba9726c..4d762e98fd 100644 --- a/maven-plugins/nar-maven-plugin/pom.xml +++ b/maven-plugins/nar-maven-plugin/pom.xml @@ -24,7 +24,7 @@ org.apache.nifi nar-maven-plugin - 0.0.4-test-incubating-SNAPSHOT + 0.0.1-incubating-SNAPSHOT maven-plugin Apache NiFi NAR Plugin Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator. diff --git a/nifi/pom.xml b/nifi/pom.xml index f64f13bf3a..78a81ad035 100644 --- a/nifi/pom.xml +++ b/nifi/pom.xml @@ -1002,7 +1002,7 @@ org.apache.nifi nar-maven-plugin - 0.0.3-test-incubating + 0.0.1-incubating-SNAPSHOT true