Skip to content

Commit

Permalink
Update cli functional test archetype to fix the version of helidon-cl…
Browse files Browse the repository at this point in the history
…i-maven-plugin (#1048)

- Pass build-tools-version as an external property and model
- Set Maven encoding properties
  • Loading branch information
romain-grecourt authored Jul 25, 2024
1 parent 9a1f555 commit 24f4ea6
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2022 Oracle and/or its affiliates.
Copyright (c) 2022, 2024 Oracle and/or its affiliates.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -27,6 +27,8 @@
<description>Http Server</description>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<mainClass>{{package}}.Main</mainClass>
</properties>

Expand Down Expand Up @@ -64,9 +66,9 @@
<plugin>
<groupId>io.helidon.build-tools</groupId>
<artifactId>helidon-cli-maven-plugin</artifactId>
<version>{{build-tools-version}}</version>
<extensions>true</extensions>
</plugin>
</plugins>
</build>
</project>

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2022 Oracle and/or its affiliates.
Copyright (c) 2022, 2024 Oracle and/or its affiliates.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -54,6 +54,7 @@
<value key="app-type">${app-type}</value>
<value key="package">${package}</value>
<value key="artifactId">${artifactId}</value>
<value key="build-tools-version">${build-tools-version}</value>
</model>
</output>
</archetype-script>
9 changes: 7 additions & 2 deletions cli/tests/functional/src/it/projects/archetype-v2/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2022, 2023 Oracle and/or its affiliates.
Copyright (c) 2022, 2024 Oracle and/or its affiliates.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -27,6 +27,11 @@
<description>Generate Archetype Locally</description>
<packaging>helidon-archetype</packaging>

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

<build>
<plugins>
<plugin>
Expand All @@ -38,7 +43,7 @@
<mavenArchetypeCompatible>false</mavenArchetypeCompatible>
<entrypoint>
<variables>
<text path="helidon-version" transient="true">${project.version}</text>
<text path="build-tools-version" transient="true">${project.version}</text>
</variables>
<exec src="flavor.xml"/>
</entrypoint>
Expand Down

0 comments on commit 24f4ea6

Please sign in to comment.