From e09daf30f4338d7c3a75277cf9dd389cc704ed62 Mon Sep 17 00:00:00 2001 From: Mark Raynsford Date: Sat, 23 Nov 2024 14:43:46 +0000 Subject: [PATCH] Fix an accidental rename. --- .../io7m/montarre/documentation/mpg-package.xml | 6 +++--- .../io7m/montarre/maven_plugin/MPackageMojo.java | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/com.io7m.montarre.documentation/src/main/resources/com/io7m/montarre/documentation/mpg-package.xml b/com.io7m.montarre.documentation/src/main/resources/com/io7m/montarre/documentation/mpg-package.xml index 39a5207..63797b4 100644 --- a/com.io7m.montarre.documentation/src/main/resources/com/io7m/montarre/documentation/mpg-package.xml +++ b/com.io7m.montarre.documentation/src/main/resources/com/io7m/montarre/documentation/mpg-package.xml @@ -299,16 +299,16 @@ - + - The packageVersion element specifies version information. It must have a + The version element specifies version information. It must have a number child element whose text content is the full semantic version of the application, and a date child element that indicates when the version number was set. - If no packageVersion element is specified, the + If no version element is specified, the number child element is set to the value of the Maven POM's version diff --git a/com.io7m.montarre.maven_plugin/src/main/java/com/io7m/montarre/maven_plugin/MPackageMojo.java b/com.io7m.montarre.maven_plugin/src/main/java/com/io7m/montarre/maven_plugin/MPackageMojo.java index 06b9114..153cdc4 100644 --- a/com.io7m.montarre.maven_plugin/src/main/java/com/io7m/montarre/maven_plugin/MPackageMojo.java +++ b/com.io7m.montarre.maven_plugin/src/main/java/com/io7m/montarre/maven_plugin/MPackageMojo.java @@ -156,7 +156,7 @@ public final class MPackageMojo extends AbstractMojo */ @Parameter(required = false) - private Version packageVersion; + private Version version; /** * The main module. @@ -633,17 +633,17 @@ private void setVersion( final MMetadata.Builder metaBuilder) throws VersionException { - if (this.packageVersion == null) { + if (this.version == null) { LOG.warn("No package version was set: Defaulting date to 2024-01-01."); - this.packageVersion = new Version(); - this.packageVersion.setDate("2024-01-01"); - this.packageVersion.setNumber(this.project.getVersion()); + this.version = new Version(); + this.version.setDate("2024-01-01"); + this.version.setNumber(this.project.getVersion()); } metaBuilder.setVersion( new MVersion( - VersionParser.parse(this.packageVersion.getNumber()), - LocalDate.parse(this.packageVersion.getDate()) + VersionParser.parse(this.version.getNumber()), + LocalDate.parse(this.version.getDate()) ) ); }