From 2e567f24baf3b89237cca5bf54003edb986ae8b0 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Tue, 19 Jun 2018 10:08:46 -0400
Subject: [PATCH] INTEXT-232: Upgrade SMB sample

JIRA: https://jira.spring.io/browse/INTEXT-232
---
 samples/smb/pom.xml                           | 32 ++++++++++---------
 .../integration/samples/smb/Main.java         | 12 +++++--
 samples/smb/src/main/resources/log4j.xml      | 28 ----------------
 .../smb/src/main/resources/log4j2-test.xml    | 15 +++++++++
 4 files changed, 41 insertions(+), 46 deletions(-)
 delete mode 100644 samples/smb/src/main/resources/log4j.xml
 create mode 100644 samples/smb/src/main/resources/log4j2-test.xml

diff --git a/samples/smb/pom.xml b/samples/smb/pom.xml
index fd1d568..09654ed 100644
--- a/samples/smb/pom.xml
+++ b/samples/smb/pom.xml
@@ -10,16 +10,12 @@
 	<name>smb</name>
 	<url>http://www.springsource.org/spring-integration</url>
 
-	<prerequisites>
-		<maven>2.2.1</maven>
-	</prerequisites>
-
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.version>2.2.1.RELEASE</spring.integration.version>
-		<spring.integration.smb.version>1.0.0.BUILD-SNAPSHOT</spring.integration.smb.version>
-		<log4j.version>1.2.17</log4j.version>
-		<junit.version>4.11</junit.version>
+		<spring.integration.version>5.0.5.RELEASE</spring.integration.version>
+		<spring.integration.smb.version>1.0.0.RELEASE</spring.integration.smb.version>
+		<log4j.version>2.11.0</log4j.version>
+		<junit.version>4.12</junit.version>
 	</properties>
 
 	<repositories>
@@ -34,7 +30,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-eclipse-plugin</artifactId>
-				<version>2.9</version>
+				<version>2.10</version>
 				<configuration>
 					<additionalProjectnatures>
 						<projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
@@ -49,10 +45,10 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.0</version>
+				<version>3.6.1</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.8</source>
+					<target>1.8</target>
 					<compilerArgument>-Xlint:all</compilerArgument>
 					<showWarnings>true</showWarnings>
 					<showDeprecation>true</showDeprecation>
@@ -61,7 +57,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
-				<version>1.2.1</version>
+				<version>1.6.0</version>
 				<configuration>
 					<mainClass>org.springframework.integration.samples.smb.Main</mainClass>
 				</configuration>
@@ -103,8 +99,14 @@
 		<!-- Logging -->
 
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+			<version>${log4j.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-jcl</artifactId>
 			<version>${log4j.version}</version>
 		</dependency>
 
diff --git a/samples/smb/src/main/java/org/springframework/integration/samples/smb/Main.java b/samples/smb/src/main/java/org/springframework/integration/samples/smb/Main.java
index 6963c7b..9cdd3dc 100644
--- a/samples/smb/src/main/java/org/springframework/integration/samples/smb/Main.java
+++ b/samples/smb/src/main/java/org/springframework/integration/samples/smb/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.integration.samples.smb;
 
 import java.util.Scanner;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.springframework.context.support.GenericXmlApplicationContext;
 import org.springframework.integration.smb.session.SmbSessionFactory;
 
@@ -26,12 +29,14 @@ import org.springframework.integration.smb.session.SmbSessionFactory;
  * Starts the Spring Context and will initialize the Spring Integration routes.
  *
  * @author Gunnar Hillert
+ * @author Artem Bilan
+ *
  * @since 1.0
  *
  */
 public final class Main {
 
-	private static final Logger LOGGER = Logger.getLogger(Main.class);
+	private static final Log LOGGER = LogFactory.getLog(Main.class);
 
 	private Main() { }
 
@@ -115,4 +120,5 @@ public final class Main {
 		System.exit(0);
 
 	}
+
 }
diff --git a/samples/smb/src/main/resources/log4j.xml b/samples/smb/src/main/resources/log4j.xml
deleted file mode 100644
index ca8ef90..0000000
--- a/samples/smb/src/main/resources/log4j.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-	<!-- Appenders -->
-	<appender name="console" class="org.apache.log4j.ConsoleAppender">
-		<param name="Target" value="System.out" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%d{HH:mm:ss.SSS} %-5p [%t][%c] %m%n" />
-		</layout>
-	</appender>
-
-	<!-- Loggers -->
-	<logger name="org.springframework.integration">
-		<level value="warn" />
-	</logger>
-
-	<logger name="org.springframework.integration.samples.smb">
-		<level value="info" />
-	</logger>
-
-	<!-- Root Logger -->
-	<root>
-		<priority value="warn" />
-		<appender-ref ref="console" />
-	</root>
-
-</log4j:configuration>
diff --git a/samples/smb/src/main/resources/log4j2-test.xml b/samples/smb/src/main/resources/log4j2-test.xml
new file mode 100644
index 0000000..e5d5eea
--- /dev/null
+++ b/samples/smb/src/main/resources/log4j2-test.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+	<Appenders>
+		<Console name="STDOUT" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d %p [%t] [%c] - %m%n" />
+		</Console>
+	</Appenders>
+	<Loggers>
+		<Logger name="org.springframework.integration" level="warn"/>
+		<logger name="org.springframework.integration.samples.smb" level="info"/>
+		<Root level="warn">
+			<AppenderRef ref="STDOUT" />
+		</Root>
+	</Loggers>
+</Configuration>