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 <[email protected]> Authored: Tue Dec 23 22:53:33 2014 +0100 Committer: Karl-Heinz Marbaise <[email protected]> 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>
