mirror of https://github.com/apache/nifi.git
NIFI-198 formatting adjustment, removed comments provided as guides to understand previous patch
This commit is contained in:
parent
32bc17db85
commit
9b0a9a6415
|
@ -68,6 +68,9 @@
|
||||||
<url>https://issues.apache.org/jira/browse/NIFI</url>
|
<url>https://issues.apache.org/jira/browse/NIFI</url>
|
||||||
</issueManagement>
|
</issueManagement>
|
||||||
<properties>
|
<properties>
|
||||||
|
<maven.compiler.source>1.7</maven.compiler.source>
|
||||||
|
<maven.compiler.target>1.7</maven.compiler.target>
|
||||||
|
<maven.version>3.0.5</maven.version>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
</properties>
|
</properties>
|
||||||
|
@ -79,11 +82,8 @@
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.2</version>
|
<version>3.2</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>1.7</source>
|
|
||||||
<target>1.7</target>
|
|
||||||
<fork>true</fork>
|
<fork>true</fork>
|
||||||
<optimize>true</optimize>
|
<optimize>true</optimize>
|
||||||
<encoding>UTF-8</encoding>
|
|
||||||
<showDeprecation>true</showDeprecation>
|
<showDeprecation>true</showDeprecation>
|
||||||
<showWarnings>true</showWarnings>
|
<showWarnings>true</showWarnings>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
@ -186,6 +186,32 @@
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<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>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
|
|
55
pom.xml
55
pom.xml
|
@ -85,16 +85,9 @@
|
||||||
<url>https://issues.apache.org/jira/browse/NIFI</url>
|
<url>https://issues.apache.org/jira/browse/NIFI</url>
|
||||||
</issueManagement>
|
</issueManagement>
|
||||||
<properties>
|
<properties>
|
||||||
<!--
|
|
||||||
! Configure the maven-compiler-plugin to use 1.7 for source/target.
|
|
||||||
-->
|
|
||||||
<maven.compiler.source>1.7</maven.compiler.source>
|
<maven.compiler.source>1.7</maven.compiler.source>
|
||||||
<maven.compiler.target>1.7</maven.compiler.target>
|
<maven.compiler.target>1.7</maven.compiler.target>
|
||||||
<!--
|
|
||||||
! Maven minimum version 3.0.5
|
|
||||||
-->
|
|
||||||
<maven.version>3.0.5</maven.version>
|
<maven.version>3.0.5</maven.version>
|
||||||
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
<org.slf4j.version>1.7.8</org.slf4j.version>
|
<org.slf4j.version>1.7.8</org.slf4j.version>
|
||||||
|
@ -917,30 +910,30 @@
|
||||||
</pluginManagement>
|
</pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-enforcer-plugin</artifactId>
|
<artifactId>maven-enforcer-plugin</artifactId>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>enforce-maven</id>
|
<id>enforce-maven</id>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>enforce</goal>
|
<goal>enforce</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<rules>
|
<rules>
|
||||||
<requireSameVersions>
|
<requireSameVersions>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>org.apache.maven.plugins:maven-surefire-plugin</plugin>
|
<plugin>org.apache.maven.plugins:maven-surefire-plugin</plugin>
|
||||||
<plugin>org.apache.maven.plugins:maven-failsafe-plugin</plugin>
|
<plugin>org.apache.maven.plugins:maven-failsafe-plugin</plugin>
|
||||||
<plugin>org.apache.maven.plugins:maven-surefire-report-plugin</plugin>
|
<plugin>org.apache.maven.plugins:maven-surefire-report-plugin</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</requireSameVersions>
|
</requireSameVersions>
|
||||||
<requireMavenVersion>
|
<requireMavenVersion>
|
||||||
<version>${maven.version}</version>
|
<version>${maven.version}</version>
|
||||||
</requireMavenVersion>
|
</requireMavenVersion>
|
||||||
</rules>
|
</rules>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.nifi</groupId>
|
<groupId>org.apache.nifi</groupId>
|
||||||
|
|
Loading…
Reference in New Issue