Repository: nifi Updated Branches: refs/heads/master 71cf3fd46 -> 5eaed6fad
NIFI-5260 Adding version elements in archetypes for dependencies that previously were under dependencyManagement Signed-off-by: Pierre Villard <[email protected]> This closes #2764. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/5eaed6fa Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/5eaed6fa Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/5eaed6fa Branch: refs/heads/master Commit: 5eaed6fad5275322bad6964bbd6816982a0c7359 Parents: 71cf3fd Author: Bryan Bende <[email protected]> Authored: Tue Jun 5 14:27:59 2018 -0400 Committer: Pierre Villard <[email protected]> Committed: Wed Jun 6 09:44:19 2018 +0200 ---------------------------------------------------------------------- .../nifi-__artifactBaseName__-processors/pom.xml | 2 ++ .../archetype-resources/nifi-__artifactBaseName__-api-nar/pom.xml | 1 + .../archetype-resources/nifi-__artifactBaseName__/pom.xml | 2 ++ 3 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/5eaed6fa/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/pom.xml b/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/pom.xml index f5414c5..62dabe6 100644 --- a/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/pom.xml +++ b/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/pom.xml @@ -33,10 +33,12 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-utils</artifactId> + <version>${nifiVersion}</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-mock</artifactId> + <version>${nifiVersion}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/nifi/blob/5eaed6fa/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-api-nar/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-api-nar/pom.xml b/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-api-nar/pom.xml index c45d57d..db68efe 100644 --- a/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-api-nar/pom.xml +++ b/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-api-nar/pom.xml @@ -34,6 +34,7 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-standard-services-api-nar</artifactId> + <version>${nifiVersion}</version> <type>nar</type> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/nifi/blob/5eaed6fa/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/pom.xml b/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/pom.xml index e4299df..f7d4f74 100644 --- a/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/pom.xml +++ b/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/pom.xml @@ -39,10 +39,12 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-processor-utils</artifactId> + <version>${nifiVersion}</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-mock</artifactId> + <version>${nifiVersion}</version> <scope>test</scope> </dependency> <dependency>
