You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ym...@apache.org on 2017/04/18 11:46:23 UTC
nifi git commit: NIFI-3694 updated latest logback, jetty,
moved servlet-api and jetty-schemas to lib root as needed now
Repository: nifi
Updated Branches:
refs/heads/master edb9c644d -> d08233b9f
NIFI-3694 updated latest logback,jetty,moved servlet-api and jetty-schemas to lib root as needed now
Signed-off-by: Yolanda M. Davis <ym...@apache.org>
This closes #1678
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/d08233b9
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/d08233b9
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/d08233b9
Branch: refs/heads/master
Commit: d08233b9fe35b8e0182f5357b833a302993d1d6e
Parents: edb9c64
Author: joewitt <jo...@apache.org>
Authored: Mon Apr 17 15:29:44 2017 -0400
Committer: Yolanda M. Davis <ym...@apache.org>
Committed: Tue Apr 18 07:41:21 2017 -0400
----------------------------------------------------------------------
nifi-assembly/NOTICE | 4 +-
nifi-assembly/pom.xml | 12 ++++
.../src/main/resources/META-INF/NOTICE | 4 +-
.../src/main/resources/conf/logback.xml | 10 +--
nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 5 --
.../processors/standard/TestGetJMSQueue.java | 73 --------------------
.../standard/util/TestInvokeHttpCommon.java | 12 ----
pom.xml | 20 ++++--
8 files changed, 34 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/d08233b9/nifi-assembly/NOTICE
----------------------------------------------------------------------
diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index 8a52b6b..6cb8269 100644
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@@ -1282,8 +1282,8 @@ The following binary components are provided under the Eclipse Public License 1.
(EPL 1.0) AspectJ Weaver (org.aspectj:aspectjweaver:jar:1.8.5 - http://www.eclipse.org/aspectj/)
(EPL 1.0) AspectJ Runtime (org.aspectj:aspectjrt:jar:1.8.0 - http://www.eclipse.org/aspectj/)
(EPL 1.0)(MPL 2.0) H2 Database (com.h2database:h2:jar:1.3.176 - http://www.h2database.com/html/license.html)
- (EPL 1.0)(LGPL 2.1) Logback Classic (ch.qos.logback:logback-classic:jar:1.1.3 - http://logback.qos.ch/)
- (EPL 1.0)(LGPL 2.1) Logback Core (ch.qos.logback:logback-core:jar:1.1.3 - http://logback.qos.ch/)
+ (EPL 1.0)(LGPL 2.1) Logback Classic (ch.qos.logback:logback-classic:jar:1.2.3 - http://logback.qos.ch/)
+ (EPL 1.0)(LGPL 2.1) Logback Core (ch.qos.logback:logback-core:jar:1.2.3 - http://logback.qos.ch/)
(EPLv1.0)(GPL 2)(LGPL 2.1) JRuby (org.jruby:jruby-complete:9.0.4.0 - http://jruby.org).
(EPL 1.0) Eclipse Paho MQTT Client (org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.0.2 - https://github.com/eclipse/paho.mqtt.java)
(EPL 1.0) Eclipse Link (org.eclipse.persistence:eclipselink:2.5.2 - http://www.eclipse.org/eclipselink/)
http://git-wip-us.apache.org/repos/asf/nifi/blob/d08233b9/nifi-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 4a2babb..c43b13d 100755
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -74,6 +74,16 @@
</plugins>
</build>
<dependencies>
+ <dependency> <!-- handling this explicitly Must be in root lib -->
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency> <!-- handling this explicitly Must be in root lib -->
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-schemas</artifactId>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
@@ -632,6 +642,8 @@
<exclude>org.apache.commons:commons-lang3</exclude>
<!-- must be in lib <exclude>org.slf4j:jul-to-slf4j</exclude> -->
<!-- must be in lib <exclude>ch.qos.logback:logback-classic</exclude> -->
+ <!-- must be in lib <exclude>javax.servlet:javax.servlet-api</exclude> -->
+ <!-- must be in lin <exclude>org.eclipse.jetty.toolchain:jetty-schemas<exclude> -->
<exclude>javax.mail:mail</exclude>
<!-- must be in lib <exclude>org.apache.nifi:nifi-api</exclude> -->
<exclude>org.apache.nifi:nifi-bootstrap</exclude>
http://git-wip-us.apache.org/repos/asf/nifi/blob/d08233b9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE
index 6e52655..b3b64b7 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE
@@ -165,8 +165,8 @@ The following binary components are provided under the Eclipse Public License 1.
(EPL 1.0) AspectJ Weaver (org.aspectj:aspectjweaver:jar:1.8.5 - http://www.aspectj.org)
(EPL 1.0)(MPL 2.0) H2 Database (com.h2database:h2:jar:1.3.176 - http://www.h2database.com/html/license.html)
- (EPL 1.0)(LGPL 2.1) Logback Classic (ch.qos.logback:logback-classic:jar:1.1.3 - http://logback.qos.ch/)
- (EPL 1.0)(LGPL 2.1) Logback Core (ch.qos.logback:logback-core:jar:1.1.3 - http://logback.qos.ch/)
+ (EPL 1.0)(LGPL 2.1) Logback Classic (ch.qos.logback:logback-classic:jar:1.2.3 - http://logback.qos.ch/)
+ (EPL 1.0)(LGPL 2.1) Logback Core (ch.qos.logback:logback-core:jar:1.2.3 - http://logback.qos.ch/)
******************
SIL OFL 1.1
http://git-wip-us.apache.org/repos/asf/nifi/blob/d08233b9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
index 1a52cc6..25d6624 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml
@@ -21,7 +21,7 @@
<appender name="APP_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${org.apache.nifi.bootstrap.config.log.dir}/nifi-app.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--
For daily rollover, use 'app_%d.log'.
For hourly rollover, use 'app_%d{yyyy-MM-dd_HH}.log'.
@@ -29,15 +29,15 @@
To ZIP rolled files, replace '.log' with '.log.zip'.
-->
<fileNamePattern>${org.apache.nifi.bootstrap.config.log.dir}/nifi-app_%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>100MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
+ <maxFileSize>100MB</maxFileSize>
<!-- keep 30 log files worth of history -->
<maxHistory>30</maxHistory>
+ <!-- keep 10GB total of log files -->
+ <totalSizeCap>10GB</totalSizeCap>
</rollingPolicy>
+ <immediateFlush>true</immediateFlush>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%date %level [%thread] %logger{40} %msg%n</pattern>
- <immediateFlush>true</immediateFlush>
</encoder>
</appender>
http://git-wip-us.apache.org/repos/asf/nifi/blob/d08233b9/nifi-nar-bundles/nifi-jetty-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-jetty-bundle/pom.xml b/nifi-nar-bundles/nifi-jetty-bundle/pom.xml
index 8551068..b9f88e3 100644
--- a/nifi-nar-bundles/nifi-jetty-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-jetty-bundle/pom.xml
@@ -62,10 +62,5 @@
<artifactId>apache-jstl</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/nifi/blob/d08233b9/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetJMSQueue.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetJMSQueue.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetJMSQueue.java
index 94d8c9c..0874129 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetJMSQueue.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetJMSQueue.java
@@ -25,8 +25,6 @@ import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.apache.nifi.web.Revision;
import org.junit.Test;
-import org.slf4j.LoggerFactory;
-import org.slf4j.impl.SimpleLogger;
import javax.jms.BytesMessage;
import javax.jms.MapMessage;
@@ -35,84 +33,13 @@ import javax.jms.MessageProducer;
import javax.jms.ObjectMessage;
import javax.jms.Session;
import javax.jms.StreamMessage;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.lang.reflect.Field;
import java.util.List;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class TestGetJMSQueue {
@Test
- public void testSchemelessURI() throws Exception {
- String expectedErrMsg = "Failed to connect to JMS Server due to javax.jms.JMSException: "
- + "Could not create Transport. Reason: java.io.IOException: Transport not scheme specified: [localhost]";
-
- ByteArrayOutputStream bos = this.prepLogOutputStream();
- GetJMSQueue getJmsQueue = new GetJMSQueue();
-
- TestRunner runner = TestRunners.newTestRunner(getJmsQueue);
- runner.setProperty(JmsProperties.JMS_PROVIDER, JmsProperties.ACTIVEMQ_PROVIDER);
- runner.setProperty(JmsProperties.URL, "localhost");
- runner.setProperty(JmsProperties.DESTINATION_NAME, "queue.testing");
- runner.setProperty(JmsProperties.ACKNOWLEDGEMENT_MODE, JmsProperties.ACK_MODE_AUTO);
-
- runner.run();
- assertEquals(0, runner.getFlowFilesForRelationship("success").size());
- assertTrue(bos.toString("ASCII").contains(expectedErrMsg));
- }
-
- @Test
- public void testPortlessURI() throws Exception {
- String expectedErrMsg = "Failed to connect to JMS Server due to javax.jms.JMSException: "
- + "Could not connect to broker URL: tcp://localhost. Reason: java.lang.IllegalArgumentException: port out of range:-1";
-
- ByteArrayOutputStream bos = this.prepLogOutputStream();
- GetJMSQueue getJmsQueue = new GetJMSQueue();
-
- TestRunner runner = TestRunners.newTestRunner(getJmsQueue);
- runner.setProperty(JmsProperties.JMS_PROVIDER, JmsProperties.ACTIVEMQ_PROVIDER);
- runner.setProperty(JmsProperties.URL, "tcp://localhost");
- runner.setProperty(JmsProperties.DESTINATION_NAME, "queue.testing");
- runner.setProperty(JmsProperties.ACKNOWLEDGEMENT_MODE, JmsProperties.ACK_MODE_AUTO);
-
- runner.run();
- assertEquals(0, runner.getFlowFilesForRelationship("success").size());
- assertTrue(bos.toString("ASCII").contains(expectedErrMsg));
- }
-
- @Test
- public void testCompositeSchemelessPortlessURI() throws Exception {
- String expectedErrMsg1 = "Failed to connect to [tcp://localhost] after: 2 attempt(s)";
- String expectedErrMsg2 = "Failed to connect to JMS Server due to javax.jms.JMSException: port out of range:-1";
-
- ByteArrayOutputStream bos = this.prepLogOutputStream();
- GetJMSQueue getJmsQueue = new GetJMSQueue();
- TestRunner runner = TestRunners.newTestRunner(getJmsQueue);
- runner.setProperty(JmsProperties.JMS_PROVIDER, JmsProperties.ACTIVEMQ_PROVIDER);
- runner.setProperty(JmsProperties.URL,
- "failover:(tcp://localhost,remotehost)?initialReconnectDelay=1&startupMaxReconnectAttempts=2");
- runner.setProperty(JmsProperties.DESTINATION_NAME, "queue.testing");
- runner.setProperty(JmsProperties.ACKNOWLEDGEMENT_MODE, JmsProperties.ACK_MODE_AUTO);
-
- runner.run();
- assertEquals(0, runner.getFlowFilesForRelationship("success").size());
- assertTrue(bos.toString("ASCII").contains(expectedErrMsg1));
- assertTrue(bos.toString("ASCII").contains(expectedErrMsg2));
- }
-
- private ByteArrayOutputStream prepLogOutputStream() throws Exception {
- LoggerFactory.getLogger(GetJMSQueue.class);
- Field field = SimpleLogger.class.getDeclaredField("TARGET_STREAM");
- field.setAccessible(true);
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- field.set(null, new PrintStream(bos));
- return bos;
- }
-
- @Test
public void testSendTextToQueue() throws Exception {
PutJMS putJms = new PutJMS();
TestRunner putRunner = TestRunners.newTestRunner(putJms);
http://git-wip-us.apache.org/repos/asf/nifi/blob/d08233b9/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
index a35dfd9..6b233d9 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/util/TestInvokeHttpCommon.java
@@ -700,18 +700,6 @@ public abstract class TestInvokeHttpCommon {
final String actual = new String(bundle.toByteArray(), StandardCharsets.UTF_8);
final String expected = "Hello";
Assert.assertEquals(expected, actual);
-
- final String response = bundle.getAttribute(InvokeHTTP.RESPONSE_BODY);
- assertEquals("<html>\n" +
- "<head>\n" +
- "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\"/>\n" +
- "<title>Error 401 Unauthorized</title>\n" +
- "</head>\n" +
- "<body><h2>HTTP ERROR 401</h2>\n" +
- "<p>Problem accessing /status/200. Reason:\n" +
- "<pre> Unauthorized</pre></p><hr><a href=\"http://eclipse.org/jetty\">Powered by Jetty:// 9.4.2.v20170220</a><hr/>\n\n" +
- "</body>\n" +
- "</html>\n", response);
}
@Test
http://git-wip-us.apache.org/repos/asf/nifi/blob/d08233b9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0173b04..660977d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,8 +91,8 @@ language governing permissions and limitations under the License. -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<inceptionYear>2014</inceptionYear>
- <org.slf4j.version>1.7.12</org.slf4j.version>
- <jetty.version>9.4.2.v20170220</jetty.version>
+ <org.slf4j.version>1.7.25</org.slf4j.version>
+ <jetty.version>9.4.3.v20170317</jetty.version>
<lucene.version>4.10.4</lucene.version>
<spring.version>4.2.4.RELEASE</spring.version>
<spring.security.version>4.0.3.RELEASE</spring.security.version>
@@ -150,12 +150,12 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.1.3</version>
+ <version>1.2.3</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.1.3</version>
+ <version>1.2.3</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -218,12 +218,12 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.11</version>
+ <version>1.13</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.4</version>
+ <version>3.5</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
@@ -750,12 +750,18 @@ language governing permissions and limitations under the License. -->
<version>${jetty.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
+ <dependency> <!-- handling this explicitly Must be in root lib -->
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
+ <dependency> <!-- handling this explicitly Must be in root lib -->
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-schemas</artifactId>
+ <version>3.1</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>