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.

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

Integrate build-tools 2.1.1 #2314

Merged

Conversation

romain-grecourt
Copy link
Contributor

No description provided.

@@ -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.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.

@@ -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.

@tomas-langer tomas-langer added this to the 2.0.2 milestone Sep 2, 2020
@tomas-langer
Copy link
Member

This PR is needed for 2.0.2 release, as otherwise the Helidon maven plugin fails to generate native image (at least on my machine for mp-1 integration test).

@barchetta barchetta merged commit 5f40767 into helidon-io:master Sep 2, 2020
@romain-grecourt romain-grecourt deleted the integrate-build-tools-2.1.1 branch September 2, 2020 20:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants