Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MNG-7763] Provide UTF-8 as a default value for project.build.sourceEncoding and project.reporting.outputEncoding #1085

Merged
merged 2 commits into from
Apr 17, 2023
Merged

[MNG-7763] Provide UTF-8 as a default value for project.build.sourceEncoding and project.reporting.outputEncoding #1085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aeaf5ef
[MNG-7763] Provide UTF-8 as a default value for project.build.sourceE…
gnodet Apr 13, 2023
2426b68
Document the new UTF-8 default value for encoding
gnodet Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1219,7 +1219,7 @@ public void testReportingPluginConfig() throws Exception {
@Test
public void testPropertiesNoDuplication() throws Exception {
PomTestWrapper pom = buildPom("properties-no-duplication/sub");
assertEquals(1, ((Properties) pom.getValue("properties")).size());
assertEquals(3, ((Properties) pom.getValue("properties")).size());
assertEquals("child", pom.getValue("properties/pomProfile"));
}

Expand Down Expand Up @@ -1342,8 +1342,10 @@ private void testCompleteModel(PomTestWrapper pom) throws Exception {
assertEquals(1, ((List<?>) pom.getValue("modules")).size());
assertEquals("sub", pom.getValue("modules[1]"));

assertEquals(1, ((Map<?, ?>) pom.getValue("properties")).size());
assertEquals(3, ((Map<?, ?>) pom.getValue("properties")).size());
assertEquals("project-property", pom.getValue("properties[1]/itProperty"));
assertEquals("UTF-8", pom.getValue("properties[1]/project.build.sourceEncoding"));
assertEquals("UTF-8", pom.getValue("properties[1]/project.reporting.outputEncoding"));

assertEquals(1, ((List<?>) pom.getValue("dependencyManagement/dependencies")).size());
assertEquals("org.apache.maven.its", pom.getValue("dependencyManagement/dependencies[1]/groupId"));
Expand Down
5 changes: 5 additions & 0 deletions maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ under the License.
<project>
<modelVersion>4.0.0</modelVersion>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

<repositories>
<repository>
<id>central</id>
Expand Down
6 changes: 4 additions & 2 deletions maven-model-builder/src/site/apt/index.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,13 @@ Maven Model Builder

* <<<$\{project.build.sourceEncoding\}>>> for
{{{https://cwiki.apache.org/confluence/display/MAVEN/POM+Element+for+Source+File+Encoding}source files encoding}}
(defaults to platform encoding)
(defaults to <<<UTF-8>>> since Maven 4.0.0, no default value was provided in Maven 3.x, meaning that the platform
encoding was used by plugins)

* <<<$\{project.reporting.outputEncoding\}>>> for
{{{https://cwiki.apache.org/confluence/display/MAVENOLD/Reporting+Encoding+Configuration}reporting output files encoding}}
(defaults to <<<UTF-8>>>)
(defaults to <<<UTF-8>>> since Maven 4.0.0, no default value was provided in Maven 3.x, plugins usually defaulting
to <<<UTF-8>>>)

[]

Expand Down