This is an automated email from the ASF dual-hosted git repository. bvahdat pushed a commit to branch maven-prerequisites in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3d64f6c32d175830b6beaa286346ae82743c8773 Author: Babak Vahdat <bvah...@apache.org> AuthorDate: Sun Sep 13 22:28:08 2020 +0200 make use of maven-enforcer-plugin instead of prerequisites fix the comment formatting which breaks the build --- .../camel/component/aws2/s3/AWS2S3Consumer.java | 6 ++---- pom.xml | 23 ++++++++++++++++++---- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java index a54e69c..2bd8d6d 100644 --- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java +++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Consumer.java @@ -190,10 +190,8 @@ public class AWS2S3Consumer extends ScheduledBatchPollingConsumer { Exchange exchange = getEndpoint().createExchange(s3Object, s3ObjectSummary.key()); answer.add(exchange); } else { - /** - * If includeFolders != true and the object is not included, it is safe to close the object here. - * If includeFolders == true, the exchage will close the object. - */ + // If includeFolders != true and the object is not included, it is safe to close the object here. + // If includeFolders == true, the exchange will close the object. IOHelper.close(s3Object); } } diff --git a/pom.xml b/pom.xml index bbddb7c..47e0e17 100644 --- a/pom.xml +++ b/pom.xml @@ -67,10 +67,6 @@ </mailingList> </mailingLists> - <prerequisites> - <maven>3.5.0</maven> - </prerequisites> - <modules> <module>parent</module> <module>camel-dependencies</module> @@ -201,6 +197,25 @@ <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>enforce-maven</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireMavenVersion> + <version>3.5.0</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>flatten-maven-plugin</artifactId> <configuration>