nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcgil...@apache.org
Subject nifi git commit: NIFI-4652 updating to latest apache version and updating key maven plugins, fixing versions for grpc to avoid extranous build dir, correcting checkstyle issues, resolving build problem with incorrect usage of activeByDefault in maven. K
Date Mon, 04 Dec 2017 14:59:37 GMT
Repository: nifi
Updated Branches:
  refs/heads/master 596a329dc -> 2c68d0e09


NIFI-4652 updating to latest apache version and updating key maven plugins, fixing versions
for grpc to avoid extranous build dir, correcting checkstyle issues, resolving build problem
with incorrect usage of activeByDefault in maven.  Key change is now for the 'dir-only' profile
it is now activated via a system property -Ddir-only instead of profile.  No other activeByDefault
profiles exist except to minifi the javascript but that usage is acceptible as-is. This closes
#2313


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2c68d0e0
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2c68d0e0
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2c68d0e0

Branch: refs/heads/master
Commit: 2c68d0e09822b352be99aaf5227eb14f4c246251
Parents: 596a329
Author: joewitt <joewitt@apache.org>
Authored: Sun Dec 3 17:45:03 2017 -0500
Committer: Matt Gilman <matt.c.gilman@gmail.com>
Committed: Mon Dec 4 09:59:23 2017 -0500

----------------------------------------------------------------------
 nifi-assembly/pom.xml                           | 53 ++++-------
 .../elasticsearch/TestFetchElasticsearch.java   |  2 +-
 .../elasticsearch/TestPutElasticsearch.java     |  2 +-
 .../apache/nifi/processors/TestISPEnrichIP.java |  4 +-
 .../controller/scheduling/ScheduleState.java    |  3 +-
 .../scheduling/StandardProcessScheduler.java    |  2 +-
 .../nifi-grpc-processors/pom.xml                | 18 ++--
 .../nifi/processors/grpc/TestGRPCServer.java    |  4 +-
 .../nifi/processors/grpc/TestInvokeGRPC.java    | 38 +++-----
 ...estEventIdFirstSchemaRecordReaderWriter.java |  2 +-
 pom.xml                                         | 94 +++++---------------
 11 files changed, 72 insertions(+), 150 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/2c68d0e0/nifi-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 115dc53..b1ab989 100755
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -44,6 +44,11 @@ language governing permissions and limitations under the License. -->
                                 <descriptor>src/main/assembly/dependencies.xml</descriptor>
                             </descriptors>
                             <tarLongFileMode>posix</tarLongFileMode>
+                            <formats>
+                                <format>dir</format>
+                                <format>zip</format>
+                                <format>tar.gz</format>
+                            </formats>
                         </configuration>
                     </execution>
                 </executions>
@@ -832,42 +837,11 @@ language governing permissions and limitations under the License. -->
             </dependencies>
         </profile>
         <profile>
-            <id>generateArchives</id>
+            <id>avoid-archive-formats</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <configuration>
-                            <finalName>nifi-${project.version}</finalName>
-                            <attach>false</attach>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>make shared resource</id>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <phase>package</phase>
-                                <configuration>
-                                    <formats>
-                                        <format>dir</format>
-                                        <format>zip</format>
-                                        <format>tar.gz</format>
-                                    </formats>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>dir-only</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>dir-only</name>
+                </property>
             </activation>
             <build>
                 <plugins>
@@ -885,6 +859,15 @@ language governing permissions and limitations under the License. -->
                                 </goals>
                                 <phase>package</phase>
                                 <configuration>
+                                    <archiverConfig>
+                                        <defaultDirectoryMode>0775</defaultDirectoryMode>
+                                        <directoryMode>0775</directoryMode>
+                                        <fileMode>0664</fileMode>
+                                    </archiverConfig>
+                                    <descriptors>
+                                        <descriptor>src/main/assembly/dependencies.xml</descriptor>
+                                    </descriptors>
+                                    <tarLongFileMode>posix</tarLongFileMode>
                                     <formats>
                                         <format>dir</format>
                                     </formats>

http://git-wip-us.apache.org/repos/asf/nifi/blob/2c68d0e0/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestFetchElasticsearch.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestFetchElasticsearch.java
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestFetchElasticsearch.java
index 30c42d0..b36b296 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestFetchElasticsearch.java
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestFetchElasticsearch.java
@@ -101,7 +101,7 @@ public class TestFetchElasticsearch {
 
         runner.assertAllFlowFilesTransferred(FetchElasticsearch.REL_SUCCESS, 1);
         assertFalse(runner.getProvenanceEvents().isEmpty());
-        runner.getProvenanceEvents().forEach(event -> { assertEquals(event.getEventType(),
ProvenanceEventType.FETCH); });
+        runner.getProvenanceEvents().forEach(event -> assertEquals(event.getEventType(),
ProvenanceEventType.FETCH) );
         final MockFlowFile out = runner.getFlowFilesForRelationship(FetchElasticsearch.REL_SUCCESS).get(0);
         assertNotNull(out);
         out.assertAttributeEquals("doc_id", "28039652140");

http://git-wip-us.apache.org/repos/asf/nifi/blob/2c68d0e0/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearch.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearch.java
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearch.java
index 6da6a29..306f513 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearch.java
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearch.java
@@ -101,7 +101,7 @@ public class TestPutElasticsearch {
 
         runner.assertAllFlowFilesTransferred(PutElasticsearch.REL_SUCCESS, 1);
         assertFalse(runner.getProvenanceEvents().isEmpty());
-        runner.getProvenanceEvents().forEach(event -> { assertEquals(event.getEventType(),
ProvenanceEventType.SEND); });
+        runner.getProvenanceEvents().forEach(event -> assertEquals(event.getEventType(),
ProvenanceEventType.SEND));
         final MockFlowFile out = runner.getFlowFilesForRelationship(PutElasticsearch.REL_SUCCESS).get(0);
         assertNotNull(out);
         out.assertAttributeEquals("doc_id", "28039652140");

http://git-wip-us.apache.org/repos/asf/nifi/blob/2c68d0e0/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestISPEnrichIP.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestISPEnrichIP.java
b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestISPEnrichIP.java
index 0b1c06e..b1fa5ee 100644
--- a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestISPEnrichIP.java
+++ b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestISPEnrichIP.java
@@ -284,7 +284,9 @@ public class TestISPEnrichIP {
 
         return new ObjectMapper().reader(IspResponse.class).with(inject).readValue(maxMindIspResponse);
 
-    }    private IspResponse getIspResponseWithoutASNDetail() throws Exception {
+    }
+
+    private IspResponse getIspResponseWithoutASNDetail() throws Exception {
         final String maxMindIspResponse = "{\n" +
             "         \"isp\" : \"Apache NiFi - Test ISP\",\n" +
             "         \"organization\" : \"Apache NiFi - Test Organization\",\n" +

http://git-wip-us.apache.org/repos/asf/nifi/blob/2c68d0e0/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/scheduling/ScheduleState.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/scheduling/ScheduleState.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/scheduling/ScheduleState.java
index de2c35a..207d308 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/scheduling/ScheduleState.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/scheduling/ScheduleState.java
@@ -74,8 +74,7 @@ public class ScheduleState {
      * scheduled to run will receive a <code>true</code> and MUST call the methods
annotated with
      * {@link OnStopped @OnStopped}
      *
-     * @return <code>true</code> if the caller is required to call Processor
methods annotated with
-     *         @OnStopped, <code>false</code> otherwise
+     * @return <code>true</code> if the caller is required to call Processor
methods annotated with @OnStopped
      */
     public boolean mustCallOnStoppedMethods() {
         return mustCallOnStoppedMethods.getAndSet(false);

http://git-wip-us.apache.org/repos/asf/nifi/blob/2c68d0e0/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
index 122e50c..c7f1581 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
@@ -294,7 +294,7 @@ public final class StandardProcessScheduler implements ProcessScheduler
{
      * {@link ProcessorNode#start(ScheduledExecutorService, long, org.apache.nifi.processor.ProcessContext,
Runnable)}
      * method.
      *
-     * @see StandardProcessorNode#start(ScheduledExecutorService, long, org.apache.nifi.processor.ProcessContext,
Runnable).
+     * @see StandardProcessorNode#start(ScheduledExecutorService, long, org.apache.nifi.processor.ProcessContext,
Runnable)
      */
     @Override
     public synchronized CompletableFuture<Void> startProcessor(final ProcessorNode
procNode) {

http://git-wip-us.apache.org/repos/asf/nifi/blob/2c68d0e0/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/pom.xml b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/pom.xml
index fa74818..420b842 100644
--- a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/pom.xml
@@ -45,22 +45,22 @@ language governing permissions and limitations under the License. -->
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty</artifactId>
-            <version>1.4.0</version>
+            <version>1.8.0</version>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-protobuf</artifactId>
-            <version>1.4.0</version>
+            <version>1.8.0</version>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-stub</artifactId>
-            <version>1.4.0</version>
+            <version>1.8.0</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-tcnative-boringssl-static</artifactId>
-            <version>2.0.3.Final</version>
+            <version>2.0.7.Final</version>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
@@ -83,7 +83,7 @@ language governing permissions and limitations under the License. -->
             <extension>
 	        <groupId>kr.motd.maven</groupId>
 	        <artifactId>os-maven-plugin</artifactId>
-	        <version>1.4.1.Final</version>
+	        <version>1.5.0.Final</version>
             </extension>
         </extensions>
 
@@ -98,11 +98,11 @@ language governing permissions and limitations under the License. -->
             <plugin>
                 <groupId>org.xolstice.maven.plugins</groupId>
                 <artifactId>protobuf-maven-plugin</artifactId>
-                <version>0.5.0</version>
+                <version>0.5.1</version>
                 <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:3.2.0:exe:${os.detected.classifier}</protocArtifact>
+                    <protocArtifact>com.google.protobuf:protoc:3.5.0:exe:${os.detected.classifier}</protocArtifact>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.3.0:exe:${os.detected.classifier}</pluginArtifact>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.8.0:exe:${os.detected.classifier}</pluginArtifact>
                     <protoSourceRoot>${basedir}/src/main/resources/proto</protoSourceRoot>
                 </configuration>
                 <executions>
@@ -118,7 +118,7 @@ language governing permissions and limitations under the License. -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.4</version>
+                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <id>test</id>

http://git-wip-us.apache.org/repos/asf/nifi/blob/2c68d0e0/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/TestGRPCServer.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/TestGRPCServer.java
b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/TestGRPCServer.java
index 7aeced8..7e11b4d 100644
--- a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/TestGRPCServer.java
+++ b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/TestGRPCServer.java
@@ -86,7 +86,7 @@ public class TestGRPCServer<T extends BindableService> {
     /**
      * Starts the gRPC server @localhost:port.
      */
-    public void start(final int port) throws Exception {
+    public int start(final int port) throws Exception {
         final NettyServerBuilder nettyServerBuilder = NettyServerBuilder
                 .forPort(port)
                 .directExecutor()
@@ -132,6 +132,7 @@ public class TestGRPCServer<T extends BindableService> {
         }
 
         server = nettyServerBuilder.build().start();
+        final int actualPort = server.getPort();
 
         Runtime.getRuntime().addShutdownHook(new Thread() {
             @Override
@@ -142,6 +143,7 @@ public class TestGRPCServer<T extends BindableService> {
                 System.err.println("*** server shut down");
             }
         });
+        return actualPort;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/nifi/blob/2c68d0e0/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/TestInvokeGRPC.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/TestInvokeGRPC.java
b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/TestInvokeGRPC.java
index f709a19..3b0c41a 100644
--- a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/TestInvokeGRPC.java
+++ b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/TestInvokeGRPC.java
@@ -46,8 +46,7 @@ public class TestInvokeGRPC {
         final TestGRPCServer<DummyFlowFileService> server = new TestGRPCServer<>(DummyFlowFileService.class);
 
         try {
-            final int port = TestGRPCServer.randomPort();
-            server.start(port);
+            final int port = server.start(0);
             final TestRunner runner = TestRunners.newTestRunner(InvokeGRPC.class);
             runner.setProperty(InvokeGRPC.PROP_SERVICE_HOST, TestGRPCServer.HOST);
             runner.setProperty(InvokeGRPC.PROP_SERVICE_PORT, String.valueOf(port));
@@ -86,8 +85,7 @@ public class TestInvokeGRPC {
         final TestGRPCServer<DummyFlowFileService> server = new TestGRPCServer<>(DummyFlowFileService.class);
 
         try {
-            final int port = TestGRPCServer.randomPort();
-            server.start(port);
+            final int port = server.start(0);
 
             final TestRunner runner = TestRunners.newTestRunner(InvokeGRPC.class);
             runner.setProperty(InvokeGRPC.PROP_SERVICE_HOST, TestGRPCServer.HOST);
@@ -126,8 +124,7 @@ public class TestInvokeGRPC {
         final TestGRPCServer<DummyFlowFileService> server = new TestGRPCServer<>(DummyFlowFileService.class);
 
         try {
-            final int port = TestGRPCServer.randomPort();
-            server.start(port);
+            final int port = server.start(0);
 
             final TestRunner runner = TestRunners.newTestRunner(InvokeGRPC.class);
             runner.setProperty(InvokeGRPC.PROP_SERVICE_HOST, TestGRPCServer.HOST);
@@ -168,8 +165,7 @@ public class TestInvokeGRPC {
         final TestGRPCServer<DummyFlowFileService> server = new TestGRPCServer<>(DummyFlowFileService.class);
 
         try {
-            final int port = TestGRPCServer.randomPort();
-            server.start(port);
+            final int port = server.start(0);
             final TestRunner runner = TestRunners.newTestRunner(InvokeGRPC.class);
             runner.setProperty(InvokeGRPC.PROP_SERVICE_HOST, TestGRPCServer.HOST);
             runner.setProperty(InvokeGRPC.PROP_SERVICE_PORT, String.valueOf(port));
@@ -202,8 +198,7 @@ public class TestInvokeGRPC {
         final TestGRPCServer<DummyFlowFileService> server = new TestGRPCServer<>(DummyFlowFileService.class);
 
         try {
-            final int port = TestGRPCServer.randomPort();
-            server.start(port);
+            final int port = server.start(0);
 
             final TestRunner runner = TestRunners.newTestRunner(InvokeGRPC.class);
             runner.setProperty(InvokeGRPC.PROP_SERVICE_HOST, TestGRPCServer.HOST);
@@ -236,9 +231,7 @@ public class TestInvokeGRPC {
         final TestGRPCServer<DummyFlowFileService> server = new TestGRPCServer<>(DummyFlowFileService.class);
 
         try {
-            final int port = TestGRPCServer.randomPort();
-            server.start(port);
-
+            final int port = server.start(0);
             final TestRunner runner = TestRunners.newTestRunner(InvokeGRPC.class);
             runner.setProperty(InvokeGRPC.PROP_SERVICE_HOST, TestGRPCServer.HOST);
             runner.setProperty(InvokeGRPC.PROP_SERVICE_PORT, String.valueOf(port));
@@ -279,8 +272,7 @@ public class TestInvokeGRPC {
         final TestGRPCServer<DummyFlowFileService> server = new TestGRPCServer<>(DummyFlowFileService.class);
 
         try {
-            final int port = TestGRPCServer.randomPort();
-            server.start(port);
+            final int port = server.start(0);
 
             final TestRunner runner = TestRunners.newTestRunner(InvokeGRPC.class);
             runner.setProperty(InvokeGRPC.PROP_SERVICE_HOST, TestGRPCServer.HOST);
@@ -312,8 +304,7 @@ public class TestInvokeGRPC {
         final TestGRPCServer<DummyFlowFileService> server = new TestGRPCServer<>(DummyFlowFileService.class);
 
         try {
-            final int port = TestGRPCServer.randomPort();
-            server.start(port);
+            final int port = server.start(0);
 
             final TestRunner runner = TestRunners.newTestRunner(InvokeGRPC.class);
             runner.setProperty(InvokeGRPC.PROP_SERVICE_HOST, TestGRPCServer.HOST);
@@ -356,8 +347,7 @@ public class TestInvokeGRPC {
         final TestGRPCServer<DummyFlowFileService> server = new TestGRPCServer<>(DummyFlowFileService.class);
 
         try {
-            final int port = TestGRPCServer.randomPort();
-            server.start(port);
+            final int port = server.start(0);
 
             final TestRunner runner = TestRunners.newTestRunner(InvokeGRPC.class);
             runner.setProperty(InvokeGRPC.PROP_SERVICE_HOST, TestGRPCServer.HOST);
@@ -411,13 +401,12 @@ public class TestInvokeGRPC {
         final TestGRPCServer<DummyFlowFileService> server = new TestGRPCServer<>(DummyFlowFileService.class,
sslProperties);
 
         try {
-            final int port = TestGRPCServer.randomPort();
             final TestRunner runner = TestRunners.newTestRunner(InvokeGRPC.class);
             runner.setProperty(InvokeGRPC.PROP_SERVICE_HOST, TestGRPCServer.HOST);
+            useSSLContextService(runner, sslProperties);
+            final int port = server.start(0);
             runner.setProperty(InvokeGRPC.PROP_SERVICE_PORT, String.valueOf(port));
             runner.setProperty(InvokeGRPC.PROP_USE_SECURE, "true");
-            useSSLContextService(runner, sslProperties);
-            server.start(port);
 
             final MockFlowFile mockFlowFile = new MockFlowFile(SUCCESS);
             runner.enqueue(mockFlowFile);
@@ -455,13 +444,12 @@ public class TestInvokeGRPC {
         final TestGRPCServer<DummyFlowFileService> server = new TestGRPCServer<>(DummyFlowFileService.class,
sslProperties);
 
         try {
-            final int port = TestGRPCServer.randomPort();
             final TestRunner runner = TestRunners.newTestRunner(InvokeGRPC.class);
             runner.setProperty(InvokeGRPC.PROP_SERVICE_HOST, TestGRPCServer.HOST);
+            useSSLContextService(runner, getTruststoreProperties());
+            final int port = server.start(0);
             runner.setProperty(InvokeGRPC.PROP_SERVICE_PORT, String.valueOf(port));
             runner.setProperty(InvokeGRPC.PROP_USE_SECURE, "true");
-            useSSLContextService(runner, getTruststoreProperties());
-            server.start(port);
 
             final MockFlowFile mockFlowFile = new MockFlowFile(SUCCESS);
             runner.enqueue(mockFlowFile);

http://git-wip-us.apache.org/repos/asf/nifi/blob/2c68d0e0/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestEventIdFirstSchemaRecordReaderWriter.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestEventIdFirstSchemaRecordReaderWriter.java
b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestEventIdFirstSchemaRecordReaderWriter.java
index 9c89ab3..a6833b4 100644
--- a/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestEventIdFirstSchemaRecordReaderWriter.java
+++ b/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/TestEventIdFirstSchemaRecordReaderWriter.java
@@ -63,7 +63,7 @@ public class TestEventIdFirstSchemaRecordReaderWriter extends AbstractTestRecord
         journalFile = new File("target/storage/" + UUID.randomUUID().toString() + "/testEventIdFirstSchemaRecordReaderWriter");
         tocFile = TocUtil.getTocFile(journalFile);
         idGenerator.set(0L);
-    };
+    }
 
     @Test
     public void testContentClaimUnchanged() throws IOException {

http://git-wip-us.apache.org/repos/asf/nifi/blob/2c68d0e0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dfec432..3f2d736 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>17</version>
+        <version>18</version>
         <relativePath />
     </parent>
     <groupId>org.apache.nifi</groupId>
@@ -1679,7 +1679,6 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.2</version>
                     <configuration>
                         <fork>true</fork>
                         <optimize>true</optimize>
@@ -1695,23 +1694,7 @@
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>2.5</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.9</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.7</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.18</version>
                     <configuration>
                         <systemPropertyVariables>
                             <java.awt.headless>true</java.awt.headless>
@@ -1731,19 +1714,13 @@
                             <!-- Force surefire to use JUnit -->
                             <groupId>org.apache.maven.surefire</groupId>
                             <artifactId>surefire-junit4</artifactId>
-                            <version>2.18</version>
+                            <version>${surefire.version}</version>
                         </dependency>
                     </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>2.18</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.5.2</version>
                     <configuration>
                         <tarLongFileMode>gnu</tarLongFileMode>
                     </configuration>
@@ -1754,29 +1731,13 @@
                     <version>2.3.1</version>
                 </plugin>
                 <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-source-plugin</artifactId>
-                    <version>2.4</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <version>3.4</version>
-                </plugin>
-                <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>exec-maven-plugin</artifactId>
-                    <version>1.3.2</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.5</version>
+                    <version>1.6.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.10.1</version>
                     <configuration>
                         <failOnError>false</failOnError>
                         <quiet>true</quiet>
@@ -1790,7 +1751,6 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5.1</version>
                     <configuration>
                         <useReleaseProfile>true</useReleaseProfile>
                         <releaseProfiles>apache-release</releaseProfiles>
@@ -1815,7 +1775,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>rpm-maven-plugin</artifactId>
-                    <version>2.1.4</version>
+                    <version>2.1.5</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -1830,12 +1790,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>2.15</version>
+                    <version>2.17</version>
                     <dependencies>
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>6.5</version>
+                            <version>8.5</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -1883,7 +1843,7 @@
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.5</version>
+                <version>1.6.8</version>
                 <extensions>true</extensions>
                 <configuration>
                     <stagingProgressTimeoutMinutes>15</stagingProgressTimeoutMinutes>
@@ -1951,13 +1911,11 @@
                                     <property name="processJavadoc" value="true" />
                                 </module>
                                 <module name="NoLineWrap" />
-                                <module name="LeftCurly">
-                                    <property name="maxLineLength" value="160" />
-                                </module>
+                                <module name="LeftCurly" />
                                 <module name="RightCurly" />
                                 <module name="RightCurly">
                                     <property name="option" value="alone" />
-                                    <property name="tokens" value="CLASS_DEF, METHOD_DEF,
CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT" />
+                                    <property name="tokens" value="CLASS_DEF, METHOD_DEF,
CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT" />
                                 </module>
                                 <module name="SeparatorWrap">
                                     <property name="tokens" value="DOT" />
@@ -2013,20 +1971,6 @@
                         <exclude>.github/PULL_REQUEST_TEMPLATE.md</exclude> <!--
PR Template for GitHub that does not have a mechanism of including comments -->
                     </excludes>
                 </configuration>
-                <dependencies>
-                    <!-- workaround for RAT-158 -->
-                    <dependency>
-                        <groupId>org.apache.maven.doxia</groupId>
-                        <artifactId>doxia-core</artifactId>
-                        <version>1.6</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>xerces</groupId>
-                                <artifactId>xercesImpl</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>
@@ -2079,14 +2023,18 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-checkstyle-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>check-style</id>
-                                <goals>
-                                    <goal>check</goal>
-                                </goals>
-                            </execution>
-                        </executions>
+                            <executions>
+                                <execution>
+                                    <id>check-style</id>
+                                    <phase>verify</phase>
+                                    <configuration>
+                                      <encoding>UTF-8</encoding>
+                                    </configuration>
+                                    <goals>
+                                      <goal>check</goal>
+                                    </goals>
+                              </execution>
+                            </executions>
                     </plugin>
                 </plugins>
             </build>


Mime
View raw message