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

Integrate build-tools 2.1.1 #2314

Merged
merged 1 commit into from
Sep 2, 2020
Merged

Integrate build-tools 2.1.1 #2314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion applications/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<version.plugin.dependency>3.1.2</version.plugin.dependency>
<version.plugin.exec>1.6.0</version.plugin.exec>
<version.plugin.failsafe>2.19.1</version.plugin.failsafe>
<version.plugin.helidon>2.1.0</version.plugin.helidon>
<version.plugin.helidon>2.1.1</version.plugin.helidon>
<version.plugin.helidon-cli>2.1.0</version.plugin.helidon-cli>
<version.plugin.jar>3.0.2</version.plugin.jar>
<version.plugin.os>1.5.0.Final</version.plugin.os>
Expand Down
5 changes: 3 additions & 2 deletions archetypes/catalog/cli-metadata.properties.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
build-tools.version={{buildtoolsVersion}}
build-tools.version=2.0.2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to be the wrong version here, shouldn't this be the placeholder?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Romain said this was intentional as it was "the version of the helidon-maven-plugin that contains the goal “dev” before we split it into helidon-cli-maven-plugin". And that this is used only for testing. We might want to follow-up on this, but I don't think it should block the PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This property is correct. It corresponds to the older version of helidon-maven-plugin that contained the goal dev, it is used for backward compatibility. Also note that this file is only used for testing.

cli.latest.plugin.version={{cliPluginVersion}}
cli.version={{cliVersion}}
{{#cliUpdateMessages}}
cli.{{version}}.message={{message}}
cli.{{version}}.message={{message}}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the whitespace intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is a mustache loop ; thus the indentation.

{{/cliUpdateMessages}}
2 changes: 1 addition & 1 deletion archetypes/catalog/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@

<properties>
<!-- support command-line overrides -->
<cli.build.tools.version>${version.plugin.helidon-build-tools}</cli.build.tools.version>
<cli.build.tools.version>${version.helidon-cli}</cli.build.tools.version>
</properties>
<build>
<plugins>
Expand Down
4 changes: 3 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<version.plugin.exec>1.6.0</version.plugin.exec>
<version.plugin.failsafe>2.19.1</version.plugin.failsafe>
<version.plugin.glassfish-copyright>2.3</version.plugin.glassfish-copyright>
<version.plugin.helidon-build-tools>2.1.0</version.plugin.helidon-build-tools>
<version.plugin.helidon-build-tools>2.1.1</version.plugin.helidon-build-tools>
<version.plugin.hibernate-enhance>${version.lib.hibernate}</version.plugin.hibernate-enhance>
<version.plugin.jacoco>0.8.5</version.plugin.jacoco>
<version.plugin.jandex>1.0.6</version.plugin.jandex>
Expand All @@ -120,6 +120,8 @@
<version.plugin.wiremock>2.14.0</version.plugin.wiremock>
<version.plugin.echo>0.4.0</version.plugin.echo>

<version.helidon-cli>2.1.0</version.helidon-cli>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the cli released separately? If not, this should be the same version as build-tools

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No change was made to the CLI plugin, so he left this version the same.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The CLI wasn't released as part of 2.1.1 because no changes were made to the CLI ; thus the difference in versions.


<javadoc.link.jackson-annotations>https://fasterxml.github.io/jackson-annotations/javadoc/2.9/</javadoc.link.jackson-annotations>
<javadoc.link.jackson-core>https://fasterxml.github.io/jackson-core/javadoc/2.9/</javadoc.link.jackson-core>
<javadoc.link.jackson-databind>https://fasterxml.github.io/jackson-databind/javadoc/2.9/</javadoc.link.jackson-databind>
Expand Down