From cb4f3d2f442b674d58ebc605f8dbdffd01f4aeb8 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Tue, 13 Aug 2019 22:20:21 +0200 Subject: [PATCH] Use UTF-8 for Java sources and XML --- .editorconfig | 2 +- CONTRIBUTING.md | 2 +- build.gradle | 2 +- .../annotation/web/configurers/HeadersConfigurerTests.java | 2 +- .../annotation/web/configurers/RememberMeConfigurerTests.java | 2 +- core/src/site/site.xml | 2 +- .../security/ldap/SpringSecurityLdapTemplateITests.java | 2 +- .../security/ldap/search/FilterBasedLdapUserSearchTests.java | 2 +- .../security/ldap/userdetails/LdapUserDetailsManagerTests.java | 2 +- samples/xml/contacts/src/main/webapp/WEB-INF/spring.tld | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.editorconfig b/.editorconfig index 7a87ff6810..51060b1cd4 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,7 +12,7 @@ max_line_length = 120 [*.{java,xml}] indent_style = tab indent_size = 4 -charset = latin1 +charset = utf-8 continuation_indent_size = 8 ij_smart_tabs = false diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bd01813844..7336e501bd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -72,7 +72,7 @@ Please carefully follow the whitespace and formatting conventions already presen 1. Aim to wrap code at 120 characters, but favor readability over wrapping 1. Preserve existing formatting; i.e. do not reformat code for its own sake 1. Search the codebase using git grep and other tools to discover common naming conventions, etc. -1. Latin-1 (ISO-8859-1) encoding for Java sources; use native2ascii to convert if necessary +1. UTF-8 encoding for Java sources Whitespace management tips diff --git a/build.gradle b/build.gradle index 0ad030a2da..a1dcbb9e12 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,6 @@ subprojects { } tasks.withType(JavaCompile) { - options.encoding = "latin1" + options.encoding = "UTF-8" } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurerTests.java index 0ca822a6fd..390925e8d5 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurerTests.java @@ -46,7 +46,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. * @author Rob Winch * @author Tim Ysewyn * @author Joe Grandja - * @author Eddú Meléndez + * @author Eddú Meléndez * @author Vedran Pavic * @author Eleftheria Stein */ diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java index 1e3ee6018d..0722da31b2 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java @@ -64,7 +64,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. * Tests for {@link RememberMeConfigurer} * * @author Rob Winch - * @author Eddú Meléndez + * @author Eddú Meléndez * @author Eleftheria Stein */ public class RememberMeConfigurerTests { diff --git a/core/src/site/site.xml b/core/src/site/site.xml index 676b2d2ac7..3be5b3a7e4 100644 --- a/core/src/site/site.xml +++ b/core/src/site/site.xml @@ -1,4 +1,4 @@ - + diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java index 9cb79703c1..d5feae767d 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java @@ -40,7 +40,7 @@ import org.springframework.test.context.junit4.SpringRunner; /** * @author Luke Taylor - * @author Eddú Meléndez + * @author Eddú Meléndez */ @RunWith(SpringRunner.class) @ContextConfiguration(classes = ApacheDsContainerConfig.class) diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearchTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearchTests.java index dbb344b965..6b9f5e36ba 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearchTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearchTests.java @@ -36,7 +36,7 @@ import org.springframework.test.context.junit4.SpringRunner; * Tests for FilterBasedLdapUserSearch. * * @author Luke Taylor - * @author Eddú Meléndez + * @author Eddú Meléndez */ @RunWith(SpringRunner.class) @ContextConfiguration(classes = ApacheDsContainerConfig.class) diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerTests.java index 1b17d2399c..1dd6e7c317 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerTests.java @@ -43,7 +43,7 @@ import org.springframework.test.context.junit4.SpringRunner; /** * @author Luke Taylor - * @author Eddú Meléndez + * @author Eddú Meléndez */ @RunWith(SpringRunner.class) @ContextConfiguration(classes = ApacheDsContainerConfig.class) diff --git a/samples/xml/contacts/src/main/webapp/WEB-INF/spring.tld b/samples/xml/contacts/src/main/webapp/WEB-INF/spring.tld index 9580c330a8..895f80affc 100644 --- a/samples/xml/contacts/src/main/webapp/WEB-INF/spring.tld +++ b/samples/xml/contacts/src/main/webapp/WEB-INF/spring.tld @@ -1,4 +1,4 @@ - +