Browse Source

Use UTF-8 for Java sources and XML

pull/7264/head
Lars Grefer 6 years ago committed by Rob Winch
parent
commit
cb4f3d2f44
  1. 2
      .editorconfig
  2. 2
      CONTRIBUTING.md
  3. 2
      build.gradle
  4. 2
      config/src/test/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurerTests.java
  5. 2
      config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java
  6. 2
      core/src/site/site.xml
  7. 2
      ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java
  8. 2
      ldap/src/integration-test/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearchTests.java
  9. 2
      ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerTests.java
  10. 2
      samples/xml/contacts/src/main/webapp/WEB-INF/spring.tld

2
.editorconfig

@ -12,7 +12,7 @@ max_line_length = 120
[*.{java,xml}] [*.{java,xml}]
indent_style = tab indent_style = tab
indent_size = 4 indent_size = 4
charset = latin1 charset = utf-8
continuation_indent_size = 8 continuation_indent_size = 8
ij_smart_tabs = false ij_smart_tabs = false

2
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. 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. 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. 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 Whitespace management tips

2
build.gradle

@ -32,6 +32,6 @@ subprojects {
} }
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
options.encoding = "latin1" options.encoding = "UTF-8"
} }
} }

2
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 Rob Winch
* @author Tim Ysewyn * @author Tim Ysewyn
* @author Joe Grandja * @author Joe Grandja
* @author Eddú Meléndez * @author Eddú Meléndez
* @author Vedran Pavic * @author Vedran Pavic
* @author Eleftheria Stein * @author Eleftheria Stein
*/ */

2
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} * Tests for {@link RememberMeConfigurer}
* *
* @author Rob Winch * @author Rob Winch
* @author Eddú Meléndez * @author Eddú Meléndez
* @author Eleftheria Stein * @author Eleftheria Stein
*/ */
public class RememberMeConfigurerTests { public class RememberMeConfigurerTests {

2
core/src/site/site.xml

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="UTF-8"?>
<project name="Spring Security Core"> <project name="Spring Security Core">

2
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 Luke Taylor
* @author Eddú Meléndez * @author Eddú Meléndez
*/ */
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@ContextConfiguration(classes = ApacheDsContainerConfig.class) @ContextConfiguration(classes = ApacheDsContainerConfig.class)

2
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. * Tests for FilterBasedLdapUserSearch.
* *
* @author Luke Taylor * @author Luke Taylor
* @author Eddú Meléndez * @author Eddú Meléndez
*/ */
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@ContextConfiguration(classes = ApacheDsContainerConfig.class) @ContextConfiguration(classes = ApacheDsContainerConfig.class)

2
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 Luke Taylor
* @author Eddú Meléndez * @author Eddú Meléndez
*/ */
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@ContextConfiguration(classes = ApacheDsContainerConfig.class) @ContextConfiguration(classes = ApacheDsContainerConfig.class)

2
samples/xml/contacts/src/main/webapp/WEB-INF/spring.tld

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "https://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"> <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "https://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
<taglib> <taglib>

Loading…
Cancel
Save