nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcgil...@apache.org
Subject [1/2] nifi git commit: NIFI-2375 updated to latest Tika across codebase. Fixed tests and updated L&N for Tika parsers. Turned unstable grpc test to IT test. Updated deps due to Tika testing findings. This closes #2320
Date Wed, 06 Dec 2017 16:54:02 GMT
Repository: nifi
Updated Branches:
  refs/heads/master cdc1facf3 -> 7e61c6333


http://git-wip-us.apache.org/repos/asf/nifi/blob/7e61c633/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
index 8ec7a02..3e33948 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
@@ -323,7 +323,6 @@ public class TestGetHTTP {
         // set up web service
         ServletHandler handler = new ServletHandler();
         handler.addServletWithMapping(HttpErrorServlet.class, "/*");
-        HttpErrorServlet servlet = (HttpErrorServlet) handler.getServlets()[0].getServlet();
 
         // create the service
         TestServer server = new TestServer();
@@ -331,6 +330,7 @@ public class TestGetHTTP {
 
         try {
             server.startServer();
+            HttpErrorServlet servlet = (HttpErrorServlet) handler.getServlets()[0].getServlet();
             String destination = server.getUrl();
 
             this.controller = TestRunners.newTestRunner(GetHTTP.class);

http://git-wip-us.apache.org/repos/asf/nifi/blob/7e61c633/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPostHTTP.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPostHTTP.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPostHTTP.java
index cfda2ef..9a46741 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPostHTTP.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPostHTTP.java
@@ -46,13 +46,13 @@ public class TestPostHTTP {
         // set up web service
         ServletHandler handler = new ServletHandler();
         handler.addServletWithMapping(CaptureServlet.class, "/*");
-        servlet = (CaptureServlet) handler.getServlets()[0].getServlet();
 
         // create the service
         server = new TestServer(sslProperties);
         server.addHandler(handler);
         server.startServer();
 
+        servlet = (CaptureServlet) handler.getServlets()[0].getServlet();
         runner = TestRunners.newTestRunner(PostHTTP.class);
     }
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/7e61c633/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 146a3a2..11caa40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -221,12 +221,12 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-compress</artifactId>
-                <version>1.13</version>
+                <version>1.15</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.5</version>
+                <version>3.7</version>
             </dependency>
             <dependency>
                 <groupId>org.antlr</groupId>
@@ -271,17 +271,17 @@
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
-                <version>1.10</version>
+                <version>1.11</version>
             </dependency>
             <dependency>
                 <groupId>commons-net</groupId>
                 <artifactId>commons-net</artifactId>
-                <version>3.3</version>
+                <version>3.6</version>
             </dependency>
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.5</version>
+                <version>2.6</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
@@ -326,7 +326,7 @@
             <dependency>
                 <groupId>org.tukaani</groupId>
                 <artifactId>xz</artifactId>
-                <version>1.5</version>
+                <version>1.6</version>
             </dependency>
             <dependency>
                 <groupId>net.sf.saxon</groupId>
@@ -571,12 +571,12 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-collections4</artifactId>
-                <version>4.0</version>
+                <version>4.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-pool2</artifactId>
-                <version>2.4.1</version>
+                <version>2.4.3</version>
             </dependency>
             <dependency>
                 <groupId>com.jcraft</groupId>
@@ -606,12 +606,12 @@
             <dependency>
                 <groupId>org.apache.activemq</groupId>
                 <artifactId>activemq-client</artifactId>
-                <version>5.12.1</version>
+                <version>5.12.3</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.activemq</groupId>
                 <artifactId>activemq-broker</artifactId>
-                <version>5.12.1</version>
+                <version>5.12.3</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -1639,7 +1639,7 @@
             <dependency>
                 <groupId>org.codehaus.groovy</groupId>
                 <artifactId>groovy-all</artifactId>
-                <version>2.4.5</version>
+                <version>2.4.13</version>
                 <scope>test</scope>
             </dependency>
             <dependency>


Mime
View raw message