From 525cef2b90729a4f4e081ffed3c288fb9919918d Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Fri, 2 Nov 2018 10:22:21 -0400
Subject: [PATCH] samples/zip: Upgrade versions and fix

---
 samples/zip/input-zip/test.zip                    | Bin 0 -> 306 bytes
 samples/zip/pom.xml                               |   8 ++++----
 .../integration/samples/zip/Main.java             |   6 +++++-
 .../integration/spring-integration-context.xml    |   4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 samples/zip/input-zip/test.zip

diff --git a/samples/zip/input-zip/test.zip b/samples/zip/input-zip/test.zip
new file mode 100644
index 0000000000000000000000000000000000000000..ee08a3f217cd5dd15797379523bfcf0a25e9b4fc
GIT binary patch
literal 306
zcmWIWW@h1H00Fh2BwsKCO0YA?Fr?+@>y=cLgobc3FsH}di3Z`)3T_5QmamKq3@jo*
zr2%jQG_V+ulvo5eARDL|gfR?YWRhdX<pv43la@4sm~a=dLR^H$FiiI#8|DZ!4DLFh
VVOU+p$_BEN2?%Ea=_U||0RRBuE@}V(

literal 0
HcmV?d00001

diff --git a/samples/zip/pom.xml b/samples/zip/pom.xml
index b396dec..881a4b2 100644
--- a/samples/zip/pom.xml
+++ b/samples/zip/pom.xml
@@ -16,7 +16,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.integration.zip.version>1.0.0.BUILD-SNAPSHOT</spring.integration.zip.version>
+		<spring.integration.zip.version>1.0.1.RELEASE</spring.integration.zip.version>
 		<log4j.version>1.2.17</log4j.version>
 		<junit.version>4.11</junit.version>
 	</properties>
@@ -88,9 +88,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-			<version>4.2.0.RC1</version>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-core</artifactId>
+			<version>4.3.17.RELEASE</version>
 		</dependency>
 
 		<!-- Logging -->
diff --git a/samples/zip/src/main/java/org/springframework/integration/samples/zip/Main.java b/samples/zip/src/main/java/org/springframework/integration/samples/zip/Main.java
index cbd3e69..e247c77 100644
--- a/samples/zip/src/main/java/org/springframework/integration/samples/zip/Main.java
+++ b/samples/zip/src/main/java/org/springframework/integration/samples/zip/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-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.
@@ -18,6 +18,7 @@ package org.springframework.integration.samples.zip;
 import java.util.Scanner;
 
 import org.apache.log4j.Logger;
+
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
@@ -26,6 +27,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
  * Starts the Spring Context and will initialize the Spring Integration routes.
  *
  * @author Gunnar Hillert
+ * @author Gary Russell
  * @since 1.0
  *
  */
@@ -78,7 +80,9 @@ public final class Main {
 			LOGGER.info("Exiting application...bye.");
 		}
 
+		scanner.close();
 		System.exit(0);
 
 	}
+
 }
diff --git a/samples/zip/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/samples/zip/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
index 5617c03..5832ab7 100644
--- a/samples/zip/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
+++ b/samples/zip/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
@@ -23,8 +23,8 @@
 
 	<int:chain id="unzipFiles" input-channel="zipFilesIn" output-channel="decompressedFilesOut">
 		<int-zip:unzip-transformer result-type="BYTE_ARRAY"/>
-		<int:splitter method="splitUnzippedMap">
-			<bean class="org.springframework.integration.zip.transformer.splitter.UnZipResultSplitter"/>
+		<int:splitter>
+			<bean class="org.springframework.integration.zip.splitter.UnZipResultSplitter"/>
 		</int:splitter>
 	</int:chain>