From a9a7b26dbf5ea57e7c95015b01f2c15d737aae6a Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Wed, 31 Aug 2016 09:38:36 -0400
Subject: [PATCH] Start version `1.1.0`

* Upgrade to SI-4.3.1
* Upgrade to SC-AWS-1.1.1
* Fix compatibility
---
 build.gradle                                       |  4 ++--
 gradle.properties                                  |  2 +-
 .../config/xml/S3InboundChannelAdapterParser.java  | 14 ++++++++------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 938f49d..94d3324 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,8 +55,8 @@ ext {
 	assertjVersion = '3.4.1'
 	servletApiVersion = '3.1.0'
 	slf4jVersion = '1.7.21'
-	springCloudAwsVersion = '1.1.0.RELEASE'
-	springIntegrationVersion = '4.2.9.RELEASE'
+	springCloudAwsVersion = '1.1.1.RELEASE'
+	springIntegrationVersion = '4.3.1.RELEASE'
 
 	idPrefix = 'aws'
 
diff --git a/gradle.properties b/gradle.properties
index 9733f28..6381f06 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
-version=1.0.1.BUILD-SNAPSHOT
+version=1.1.0.BUILD-SNAPSHOT
 org.gradle.daemon=true
diff --git a/src/main/java/org/springframework/integration/aws/config/xml/S3InboundChannelAdapterParser.java b/src/main/java/org/springframework/integration/aws/config/xml/S3InboundChannelAdapterParser.java
index 6c48348..a8fd24f 100644
--- a/src/main/java/org/springframework/integration/aws/config/xml/S3InboundChannelAdapterParser.java
+++ b/src/main/java/org/springframework/integration/aws/config/xml/S3InboundChannelAdapterParser.java
@@ -21,6 +21,8 @@ import org.springframework.integration.aws.inbound.S3InboundFileSynchronizingMes
 import org.springframework.integration.aws.support.filters.S3RegexPatternFileListFilter;
 import org.springframework.integration.aws.support.filters.S3SimplePatternFileListFilter;
 import org.springframework.integration.file.config.AbstractRemoteFileInboundChannelAdapterParser;
+import org.springframework.integration.file.filters.FileListFilter;
+import org.springframework.integration.file.remote.synchronizer.InboundFileSynchronizer;
 
 /**
  * Parser for the AWS 's3-inbound-channel-adapter' element.
@@ -35,18 +37,18 @@ public class S3InboundChannelAdapterParser extends AbstractRemoteFileInboundChan
 	}
 
 	@Override
-	protected String getInboundFileSynchronizerClassname() {
-		return S3InboundFileSynchronizer.class.getName();
+	protected Class<? extends FileListFilter<?>> getSimplePatternFileListFilterClass() {
+		return S3SimplePatternFileListFilter.class;
 	}
 
 	@Override
-	protected String getSimplePatternFileListFilterClassname() {
-		return S3SimplePatternFileListFilter.class.getName();
+	protected Class<? extends FileListFilter<?>> getRegexPatternFileListFilterClass() {
+		return S3RegexPatternFileListFilter.class;
 	}
 
 	@Override
-	protected String getRegexPatternFileListFilterClassname() {
-		return S3RegexPatternFileListFilter.class.getName();
+	protected Class<? extends InboundFileSynchronizer> getInboundFileSynchronizerClass() {
+		return S3InboundFileSynchronizer.class;
 	}
 
 }