diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceDiscoveryTest.java b/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceDiscoveryTest.java index 91f81afc3e..e3703e2316 100644 --- a/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceDiscoveryTest.java +++ b/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceDiscoveryTest.java @@ -80,6 +80,7 @@ public class ClusterServiceDiscoveryTest { } } + @Ignore("Test needs to be fixed. Requires an active network connection") @Test public void testGetAddressOnStartup() { assertNull(discovery.getService()); @@ -111,6 +112,7 @@ public class ClusterServiceDiscoveryTest { } + @Ignore("Test needs to be fixed. Requires an active network connection") @Test public void testBadBroadcastMessage() throws Exception { diff --git a/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java b/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java index af0059096f..4233d88d70 100644 --- a/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java +++ b/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java @@ -16,7 +16,6 @@ */ package org.apache.nifi.cluster.protocol.impl; -import org.apache.nifi.cluster.protocol.impl.MulticastProtocolListener; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.net.DatagramPacket; @@ -81,6 +80,7 @@ public class MulticastProtocolListenerTest { } } + @Ignore("Test needs to be reworked. Fails if on a system without actiev network connection") @Test public void testBadRequest() throws Exception { DelayedProtocolHandler handler = new DelayedProtocolHandler(0); diff --git a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java b/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java index acd21e88db..6c79b9073d 100644 --- a/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java +++ b/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java @@ -80,6 +80,7 @@ public class MulticastProtocolListenerTest { } } + @Ignore("This test must be reworked. Requires an active network connection") @Test public void testBadRequest() throws Exception { DelayedProtocolHandler handler = new DelayedProtocolHandler(0); diff --git a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/TestServerAndClient.java b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/TestServerAndClient.java index b5f3fd6f41..34e8267d1a 100644 --- a/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/TestServerAndClient.java +++ b/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/TestServerAndClient.java @@ -63,6 +63,7 @@ public class TestServerAndClient { LOGGER = LoggerFactory.getLogger(TestServerAndClient.class); } + @Ignore("Test fails when in a maven parallel build due to address/port already taken - need to vary these so tests can run in parallel") @Test public void testNonPersistentSetServerAndClient() throws InitializationException, IOException { LOGGER.info("Testing " + Thread.currentThread().getStackTrace()[1].getMethodName()); @@ -95,6 +96,7 @@ public class TestServerAndClient { server.shutdownServer(); } + @Ignore("Test fails when in a maven parallel build due to address/port already taken - need to vary these so tests can run in parallel") @Test public void testPersistentSetServerAndClient() throws InitializationException, IOException { LOGGER.info("Testing " + Thread.currentThread().getStackTrace()[1].getMethodName()); @@ -148,6 +150,7 @@ public class TestServerAndClient { newServer.shutdownServer(); } + @Ignore("Test fails when in a maven parallel build due to address/port already taken - need to vary these so tests can run in parallel") @Test public void testPersistentSetServerAndClientWithLFUEvictions() throws InitializationException, IOException { LOGGER.info("Testing " + Thread.currentThread().getStackTrace()[1].getMethodName()); @@ -210,6 +213,7 @@ public class TestServerAndClient { newServer.shutdownServer(); } + @Ignore("Test fails when in a maven parallel build due to address/port already taken - need to vary these so tests can run in parallel") @Test public void testPersistentSetServerAndClientWithFIFOEvictions() throws InitializationException, IOException { LOGGER.info("Testing " + Thread.currentThread().getStackTrace()[1].getMethodName()); @@ -278,6 +282,7 @@ public class TestServerAndClient { newServer.shutdownServer(); } + @Ignore("Test fails when in a maven parallel build due to address/port already taken - need to vary these so tests can run in parallel") @Test public void testNonPersistentMapServerAndClient() throws InitializationException, IOException, InterruptedException { LOGGER.info("Testing " + Thread.currentThread().getStackTrace()[1].getMethodName()); diff --git a/nar-maven-plugin/pom.xml b/nar-maven-plugin/pom.xml index 7b7aabf41d..26b6a1144f 100644 --- a/nar-maven-plugin/pom.xml +++ b/nar-maven-plugin/pom.xml @@ -17,17 +17,153 @@ 4.0.0 - org.apache.nifi - nifi-parent - 0.0.1-SNAPSHOT + org.apache + apache + 16 - org.apache.nifi nar-maven-plugin 0.0.1-SNAPSHOT maven-plugin Apache NiFi NAR Plugin + Apache NiFi is a dataflow system based on the concepts of flow-based programming. It is currently a part of the Apache Incubator. + http://nifi.incubator.apache.org/maven-site/ + + Apache NiFi (incubating) Project + http://nifi.incubating.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 + + + JIRA + https://issues.apache.org/jira/browse/NIFI + + + UTF-8 + UTF-8 + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.2 + + 1.7 + 1.7 + true + true + UTF-8 + true + true + + + + maven-jar-plugin + 2.5 + + + maven-war-plugin + 2.5 + + + org.apache.maven.plugins + maven-plugin-plugin + 3.3 + + + 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 + + -Xmx1G + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.5.2 + + false + gnu + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.1 + + + 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 + + + + org.apache.maven.plugins @@ -51,8 +187,33 @@ - - + + + + org.apache.maven + maven-plugin-api + 2.0.11 + + + org.apache.maven.plugins + maven-dependency-plugin + 2.9 + maven-plugin + + + org.apache.maven.plugins + maven-jar-plugin + 2.5 + + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.3 + + + + + org.apache.maven maven-plugin-api diff --git a/pom.xml b/pom.xml index 8747bc4206..3dc1bddc17 100644 --- a/pom.xml +++ b/pom.xml @@ -848,11 +848,6 @@ - - org.apache.nifi - nar-maven-plugin - ${project.version} - org.apache.maven.plugins maven-compiler-plugin @@ -958,7 +953,7 @@ org.apache.nifi nar-maven-plugin - ${project.version} + 0.0.1-SNAPSHOT true