NIFI-169 updating a few tests and build
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/614349bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/614349bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/614349bd Branch: refs/heads/nifi-27 Commit: 614349bdfdb4b73509d6c9384b9094aefc41d7a8 Parents: 675ea66 Author: joewitt <[email protected]> Authored: Mon Dec 15 10:43:07 2014 -0500 Committer: joewitt <[email protected]> Committed: Mon Dec 15 10:43:07 2014 -0500 ---------------------------------------------------------------------- .../impl/ClusterServiceDiscoveryTest.java | 2 + .../impl/MulticastProtocolListenerTest.java | 2 +- .../impl/MulticastProtocolListenerTest.java | 1 + .../cache/server/TestServerAndClient.java | 5 + nar-maven-plugin/pom.xml | 173 ++++++++++++++++++- pom.xml | 7 +- 6 files changed, 177 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/614349bd/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/ClusterServiceDiscoveryTest.java ---------------------------------------------------------------------- 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 91f81af..e3703e2 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 { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/614349bd/nar-bundles/framework-bundle/framework/cluster-protocol/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java ---------------------------------------------------------------------- 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 af00590..4233d88 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); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/614349bd/nar-bundles/framework-bundle/framework/cluster/src/test/java/org/apache/nifi/cluster/protocol/impl/MulticastProtocolListenerTest.java ---------------------------------------------------------------------- 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 acd21e8..6c79b90 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); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/614349bd/nar-bundles/standard-services/distributed-cache-services-bundle/distributed-cache-server/src/test/java/org/apache/nifi/distributed/cache/server/TestServerAndClient.java ---------------------------------------------------------------------- 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 b5f3fd6..34e8267 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()); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/614349bd/nar-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/nar-maven-plugin/pom.xml b/nar-maven-plugin/pom.xml index 7b7aabf..26b6a11 100644 --- a/nar-maven-plugin/pom.xml +++ b/nar-maven-plugin/pom.xml @@ -17,17 +17,153 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-parent</artifactId> - <version>0.0.1-SNAPSHOT</version> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>16</version> </parent> - <groupId>org.apache.nifi</groupId> <artifactId>nar-maven-plugin</artifactId> <version>0.0.1-SNAPSHOT</version> <packaging>maven-plugin</packaging> <name>Apache NiFi NAR Plugin</name> + <description>Apache NiFi is a dataflow system based on the concepts of flow-based programming. It is currently a part of the Apache Incubator.</description> + <url>http://nifi.incubator.apache.org/maven-site/</url> + <organization> + <name>Apache NiFi (incubating) Project</name> + <url>http://nifi.incubating.apache.org/</url> + </organization> + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0</url> + </license> + </licenses> + <mailingLists> + <mailingList> + <name>Dev</name> + <subscribe>[email protected]</subscribe> + <unsubscribe>[email protected]</unsubscribe> + <post>[email protected]</post> + <archive>http://mail-archives.apache.org/mod_mbox/incubator-nifi-dev</archive> + </mailingList> + <mailingList> + <name>Commits</name> + <subscribe>[email protected]</subscribe> + <unsubscribe>[email protected]</unsubscribe> + <post>[email protected]</post> + <archive>http://mail-archives.apache.org/mod_mbox/incubator-nifi-commits</archive> + </mailingList> + </mailingLists> + <prerequisites> + <maven>${maven.min-version}</maven> + </prerequisites> + <scm> + <connection>scm:git:git://git.apache.org/incubator-nifi.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-nifi.git</developerConnection> + <url>https://git-wip-us.apache.org/repos/asf?p=incubator-nifi.git</url> + </scm> + <issueManagement> + <system>JIRA</system> + <url>https://issues.apache.org/jira/browse/NIFI</url> + </issueManagement> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + </properties> <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <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> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>2.5</version> + </plugin> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <version>2.5</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugin-plugin</artifactId> + <version>3.3</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> + <argLine>-Xmx1G</argLine> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.5.2</version> + <configuration> + <attach>false</attach> + <tarLongFileMode>gnu</tarLongFileMode> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.5.1</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jaxb2-maven-plugin</artifactId> + <version>1.6</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-javadoc-plugin</artifactId> + <version>2.10.1</version> + <configuration> + <failOnError>false</failOnError> + <quiet>true</quiet> + <show>private</show> + </configuration> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -51,8 +187,33 @@ </plugin> </plugins> </build> - <dependencies> - <dependency> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>2.0.11</version> + </dependency> + <dependency> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.9</version> + <type>maven-plugin</type> + </dependency> + <dependency> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.5</version> + </dependency> + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>3.3</version> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/614349bd/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8747bc4..3dc1bdd 100644 --- a/pom.xml +++ b/pom.xml @@ -849,11 +849,6 @@ <pluginManagement> <plugins> <plugin> - <groupId>org.apache.nifi</groupId> - <artifactId>nar-maven-plugin</artifactId> - <version>${project.version}</version> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>3.2</version> @@ -958,7 +953,7 @@ <plugin> <groupId>org.apache.nifi</groupId> <artifactId>nar-maven-plugin</artifactId> - <version>${project.version}</version> + <version>0.0.1-SNAPSHOT</version> <extensions>true</extensions> </plugin> </plugins>
