Skip to content

Commit ec356cb

Browse files
committed
[ARCHETYPE-638] - fix: maven-archetype pom.xml should add request encoding
This commit remove below warning: [WARNING] Using platform encoding (GBK actually) to copy filtered resources, i.e. build is platform dependent!
1 parent 86826f0 commit ec356cb

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ public void createArchetype( ArchetypeCreationRequest request, ArchetypeCreation
138138
try
139139
{
140140
File archetypePomFile = createArchetypeProjectPom( project, request.getProjectBuildingRequest(),
141-
configurationProperties, outputDirectory );
141+
configurationProperties, outputDirectory,
142+
defaultEncoding );
142143

143144
File archetypeResourcesDirectory = new File( outputDirectory, getTemplateOutputDirectory() );
144145

@@ -391,10 +392,15 @@ else if ( !properties.containsKey( Constants.PACKAGE ) )
391392
* Create the archetype project pom.xml file, that will be used to build the archetype.
392393
*/
393394
private File createArchetypeProjectPom( MavenProject project, ProjectBuildingRequest buildingRequest,
394-
Properties configurationProperties, File projectDir )
395+
Properties configurationProperties, File projectDir,
396+
String defaultEncoding )
395397
throws TemplateCreationException, IOException
396398
{
397399
Model model = new Model();
400+
if ( StringUtils.isNotBlank( defaultEncoding ) )
401+
{
402+
model.getProperties().put( "project.build.sourceEncoding", defaultEncoding );
403+
}
398404
model.setModelVersion( "4.0.0" );
399405
// these values should be retrieved from the request with sensible defaults
400406
model.setGroupId( configurationProperties.getProperty( Constants.ARCHETYPE_GROUP_ID, project.getGroupId() ) );

0 commit comments

Comments
 (0)