From d696ba53ca7fb24fe586042518540948df60591e Mon Sep 17 00:00:00 2001 From: joewitt Date: Sat, 21 Mar 2015 12:09:59 -0400 Subject: [PATCH] NIFI-271 initial move with everything as-was except now we have a nifi-parent. Will add checkstyle/license check to build process soon --- nifi-nar-maven-plugin/pom.xml | 181 +--------------------- nifi-parent/pom.xml | 278 ++++++++++++++++++++++++++++++++++ nifi/pom.xml | 220 +-------------------------- 3 files changed, 288 insertions(+), 391 deletions(-) create mode 100644 nifi-parent/pom.xml diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml index 7ba2d7c002..361c6fae75 100644 --- a/nifi-nar-maven-plugin/pom.xml +++ b/nifi-nar-maven-plugin/pom.xml @@ -15,142 +15,22 @@ --> 4.0.0 - - org.apache - apache - 16 + org.apache.nifi + nifi-parent + 1-incubating-SNAPSHOT - org.apache.nifi nifi-nar-maven-plugin 1.0.1-incubating-SNAPSHOT maven-plugin Apache NiFi Nar Plugin. It is currently a part of the Apache Incubator. - http://nifi.incubator.apache.org - - Apache NiFi (incubating) - http://nifi.incubator.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 - true - deploy - @{project.artifactId}-@{project.version} - false - true - default @@ -163,24 +43,9 @@ - - org.apache.maven.plugins - maven-jar-plugin - 2.5 - - + - - 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 @@ -201,20 +66,9 @@ - - org.apache.rat - apache-rat-plugin - - - nb-configuration.xml - nbactions.xml - DEPENDENCIES - - - - + - + org.apache.maven maven-plugin-api @@ -240,27 +94,4 @@ 3.3 - - - - check-licenses - - - - org.apache.rat - apache-rat-plugin - - - - check - - verify - - - - - - - diff --git a/nifi-parent/pom.xml b/nifi-parent/pom.xml new file mode 100644 index 0000000000..a9dbf5f83a --- /dev/null +++ b/nifi-parent/pom.xml @@ -0,0 +1,278 @@ + + + + 4.0.0 + + org.apache + apache + 16 + + + org.apache.nifi + nifi-parent + 1-incubating-SNAPSHOT + pom + The nifi-parent enables each apache nifi project to ensure consistent approaches and DRY + http://nifi.incubator.apache.org + + Apache NiFi(incubating) Project + http://nifi.incubator.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} + + + 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 + 2014 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.2 + + true + true + true + true + + + + org.apache.maven.plugins + maven-war-plugin + 2.5 + + + 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 + + true + -Xmx1G + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.5.2 + + 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-jar-plugin + 2.5 + + + 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 + true + deploy + @{project.artifactId}-@{project.version} + false + true + + + + default + + perform + + + nifi-parent/pom.xml + + + + + + org.codehaus.mojo + rpm-maven-plugin + 2.1.1 + + + org.antlr + antlr3-maven-plugin + 3.5.2 + + + + + + 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 + + + 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.min-version} + + + + + + + + org.apache.rat + apache-rat-plugin + + + nb-configuration.xml + nbactions.xml + DEPENDENCIES + + + + + org.apache.nifi + nifi-nar-maven-plugin + 1.0.0-incubating + true + + + + + + + check-licenses + + + + org.apache.rat + apache-rat-plugin + + + + check + + verify + + + + + + + + diff --git a/nifi/pom.xml b/nifi/pom.xml index e7d8f5ba5e..4a3039805e 100644 --- a/nifi/pom.xml +++ b/nifi/pom.xml @@ -16,46 +16,15 @@ 4.0.0 - org.apache - apache - 16 + org.apache.nifi + nifi-parent + 1-incubating-SNAPSHOT - org.apache.nifi nifi 0.1.0-incubating-SNAPSHOT pom Apache NiFi(incubating) is an easy to use, powerful, and reliable system to process and distribute data. - http://nifi.incubator.apache.org - - Apache NiFi(incubating) Project - http://nifi.incubator.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} - nifi-commons nifi-api @@ -67,22 +36,7 @@ nifi-maven-archetypes nifi-external - - 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 1.7.10 9.2.5.v20141112 4.10.3 @@ -542,7 +496,6 @@ avro 1.7.6 - com.sun.jersey jersey-server @@ -643,7 +596,6 @@ jasypt 1.9.2 - org.apache.nifi nifi-api @@ -856,93 +808,9 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.2 - - true - true - true - true - - - - org.apache.maven.plugins - maven-war-plugin - 2.5 - - - 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 - - true - -Xmx1G - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.5.2 - - - 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 - true - deploy - nifi-@{project.version} - false - true - default @@ -955,95 +823,15 @@ - - org.codehaus.mojo - rpm-maven-plugin - 2.1.1 - - - org.antlr - antlr3-maven-plugin - 3.5.2 - - - 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 - - - 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.min-version} - - - - - - - - org.apache.rat - apache-rat-plugin - - - nb-configuration.xml - nbactions.xml - DEPENDENCIES - - - org.apache.nifi nifi-nar-maven-plugin - 1.0.0-incubating + 1.0.1-incubating-SNAPSHOT true - - - - check-licenses - - - - org.apache.rat - apache-rat-plugin - - - - check - - verify - - - - - - -