search

spring-attic / spring-cloud-aws

All development has moved to https://github.com/awspring/spring-cloud-aws Integration for Amazon Web Services APIs with Spring
https://awspring.io/
Apache License 2.0
590 stars 376 forks source link

Run the Spring Java Format Plugin. #690

Closed DarrenForsythe closed 3 years ago

DarrenForsythe commented 3 years ago

Local and CI builds are failing master due to unformatted files, run the Spring Java Plugin to enable green builds in CI and locally.

Fixes gh-689

maciejwalkowiak commented 3 years ago

Thanks @DarrenForsythe for taking care of this. The only problem I see is that once we merge it into master, taking any changes that we will do in 2.3.x (which is our most active branch) into master will end with conflicts.

If we would upgrade spring-javaformat plugin in 2.3.x, run the plugin there and then merge this change into master, we would avoid quite a bit of hassle with merging in the future.

DarrenForsythe commented 3 years ago

Thanks @DarrenForsythe for taking care of this. The only problem I see is that once we merge it into master, taking any changes that we will do in 2.3.x (which is our most active branch) into master will end with conflicts.

If we would upgrade spring-javaformat plugin in 2.3.x, run the plugin there and then merge this change into master, we would avoid quite a bit of hassle with merging in the future.

The 2.3.x branch is passing on the formatting, only master has failures associated with formatting. Could have been a merge to master that triggered this, there's only a few files that end in conflict.

If I attempt to merge 2.3.x into master it results in the following conflicts,

both modified: spring-cloud-aws-autoconfigure/src/main/java/org/springframework/cloud/aws/autoconfigure/mail/SimpleEmailAutoConfiguration.java both modified: spring-cloud-aws-autoconfigure/src/main/java/org/springframework/cloud/aws/autoconfigure/messaging/SnsAutoConfiguration.java both modified: spring-cloud-aws-autoconfigure/src/main/java/org/springframework/cloud/aws/autoconfigure/messaging/SqsAutoConfiguration.java both modified: spring-cloud-aws-autoconfigure/src/main/java/org/springframework/cloud/aws/autoconfigure/metrics/CloudWatchExportAutoConfiguration.java both modified: spring-cloud-aws-autoconfigure/src/test/java/org/springframework/cloud/aws/autoconfigure/mail/SimpleEmailAutoConfigurationTest.java both modified: spring-cloud-aws-autoconfigure/src/test/java/org/springframework/cloud/aws/autoconfigure/metrics/CloudWatchExportAutoConfigurationTest.java

maciejwalkowiak commented 3 years ago

Thanks @DarrenForsythe!