[lucene-solr] 09/34: Resolve conflicts

[us...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

uschindler pushed a commit to branch jira/lucene-2562-luke-swing-3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 9e162657363afdd9c0b49cbf5da9d40bb57867e8
Merge: aa2aa47 85be0a4
Author: Tomoko Uchida <to...@gmail.com>
AuthorDate: Fri Apr 5 20:16:57 2019 +0900

    Resolve conflicts

 lucene/licenses/log4j-1.2-api-2.11.2.jar.sha1      |  1 -
 lucene/luke/ivy.xml                                |  2 +-
 .../dialog/menubar/CheckIndexDialogFactory.java    |  4 +--
 .../dialog/menubar/OptimizeIndexDialogFactory.java |  2 +-
 .../luke/app/desktop/util/TextAreaPrintStream.java | 31 ++++++----------------
 5 files changed, 12 insertions(+), 28 deletions(-)

diff --cc lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/TextAreaPrintStream.java
index 4ce7dfd,790c1be..5421d87
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/TextAreaPrintStream.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/TextAreaPrintStream.java
@@@ -19,13 -19,11 +19,11 @@@ package org.apache.lucene.luke.app.desk
  
  import javax.swing.JTextArea;
  import java.io.ByteArrayOutputStream;
- import java.io.IOException;
  import java.io.PrintStream;
  import java.io.UnsupportedEncodingException;
- import java.nio.charset.Charset;
  import java.nio.charset.StandardCharsets;
  
 -import org.slf4j.Logger;
 +import org.apache.logging.log4j.Logger;
  
  /** PrintStream for text areas */
  public final class TextAreaPrintStream extends PrintStream {