From 57ccd1fb5bf0c164577970ec6840d1de2c9f4164 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@vmware.com>
Date: Fri, 9 Apr 2021 14:54:13 -0400
Subject: [PATCH] Start version 2.5

* Upgrade some dependencies; fix compatibilities
---
 build.gradle                                  | 20 ++++++++++---------
 gradle.properties                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 .../S3PersistentAcceptOnceFileListFilter.java | 13 +++++++++++-
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index e5403fe..07b0595 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 	id 'checkstyle'
 	id 'org.ajoberstar.grgit' version '4.1.0'
 	id "io.spring.dependency-management" version '1.0.11.RELEASE'
-	id 'com.jfrog.artifactory' version '4.19.0'
+	id 'com.jfrog.artifactory' version '4.21.0'
 }
 
 description = 'Spring Integration AWS Support'
@@ -16,24 +16,26 @@ group = 'org.springframework.integration'
 
 repositories {
 	mavenCentral()
-//	maven { url 'https://repo.spring.io/libs-staging-local' }
-	if (version.endsWith('BUILD-SNAPSHOT')) {
-		maven { url 'https://repo.spring.io/libs-snapshot' }
+	maven { url 'https://repo.spring.io/milestone' }
+	maven { url 'https://repo.spring.io/release' }
+	if (version.endsWith('SNAPSHOT')) {
+		maven { url 'https://repo.spring.io/snapshot' }
 	}
-	maven { url 'https://repo.spring.io/libs-milestone' }
+
+	//	maven { url 'https://repo.spring.io/libs-staging-local' }
 }
 
 ext {
-	assertjVersion = '3.18.1'
+	assertjVersion = '3.19.0'
 	awaitilityVersion = '4.0.3'
 	dynamodbLockClientVersion = '1.1.0'
-	jacksonVersion = '2.12.1'
+	jacksonVersion = '2.12.2'
 	junitVersion = '5.7.0'
 	servletApiVersion = '4.0.1'
     localstackVersion = '0.2.6'
-	log4jVersion = '2.14.0'
+	log4jVersion = '2.14.1'
 	springCloudAwsVersion = '2.2.5.RELEASE'
-	springIntegrationVersion = '5.4.3'
+	springIntegrationVersion = '5.5.0-SNAPSHOT'
 	kinesisClientVersion = '1.14.0'
 	kinesisProducerVersion = '0.14.3'
 
diff --git a/gradle.properties b/gradle.properties
index d2a3651..ea978f0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-version=2.4.1-SNAPSHOT
+version=2.5.0-SNAPSHOT
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 28ff446..442d913 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/org/springframework/integration/aws/support/filters/S3PersistentAcceptOnceFileListFilter.java b/src/main/java/org/springframework/integration/aws/support/filters/S3PersistentAcceptOnceFileListFilter.java
index 7aedb02..63f1cc4 100644
--- a/src/main/java/org/springframework/integration/aws/support/filters/S3PersistentAcceptOnceFileListFilter.java
+++ b/src/main/java/org/springframework/integration/aws/support/filters/S3PersistentAcceptOnceFileListFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2021 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.
@@ -43,4 +43,15 @@ public class S3PersistentAcceptOnceFileListFilter extends AbstractPersistentAcce
 		return (file != null) ? file.getKey() : null;
 	}
 
+	/**
+	 * Always return false since no directory notion in S3.
+	 * @param file the {@link S3ObjectSummary}
+	 * @return always false: S3 does not have a notion of directory
+	 * @since 2.5
+	 */
+	@Override
+	protected boolean isDirectory(S3ObjectSummary file) {
+		return false;
+	}
+
 }