From 6ccfb69692d160b5977045236cbe09c0a114454c Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 7 Feb 2019 12:08:25 +0100
Subject: [PATCH] Promote version infrastructure to dedicated package

This commit moves `Version` and related support classes to a dedicated
package

Closes gh-811
---
 .../info/DependencyRangesInfoContributor.java |  6 +++---
 .../actuate/stat/ProjectRequestDocument.java  |  2 +-
 .../stat/ProjectRequestDocumentFactory.java   |  2 +-
 .../version}/InvalidVersionException.java     |  4 ++--
 .../{util => generator/version}/Version.java  |  2 +-
 .../version}/VersionParser.java               |  6 +++---
 .../version}/VersionProperty.java             |  9 ++++-----
 .../version}/VersionRange.java                |  2 +-
 .../generator/version/package-info.java       | 20 +++++++++++++++++++
 .../initializr/metadata/BillOfMaterials.java  | 12 +++++------
 .../metadata/DependenciesCapability.java      |  4 ++--
 .../initializr/metadata/Dependency.java       | 10 +++++-----
 .../metadata/DependencyMetadata.java          |  4 ++--
 .../metadata/DependencyMetadataProvider.java  |  4 ++--
 .../metadata/InitializrConfiguration.java     | 10 +++++-----
 .../metadata/InitializrMetadata.java          |  8 ++++----
 .../version}/VersionParserTests.java          |  2 +-
 .../version}/VersionPropertyTests.java        |  2 +-
 .../version}/VersionRangeTests.java           |  2 +-
 .../version}/VersionTests.java                |  2 +-
 .../metadata/BillOfMaterialsTests.java        |  4 ++--
 .../initializr/metadata/DependencyTests.java  |  4 ++--
 .../InitializrConfigurationTests.java         |  2 +-
 .../metadata/InitializrMetadataTests.java     |  2 +-
 .../web/autoconfigure/InitializrModule.java   |  2 +-
 .../web/project/MainController.java           |  4 ++--
 .../ProjectRequestToDescriptionConverter.java |  5 ++---
 .../DefaultDependencyMetadataProvider.java    |  4 ++--
 .../initializr/web/ui/UiController.java       |  4 ++--
 .../DependencyMetadataJsonMapperTests.java    |  2 +-
 ...efaultDependencyMetadataProviderTests.java |  2 +-
 31 files changed, 83 insertions(+), 65 deletions(-)
 rename initializr-generator/src/main/java/io/spring/initializr/{util => generator/version}/InvalidVersionException.java (89%)
 rename initializr-generator/src/main/java/io/spring/initializr/{util => generator/version}/Version.java (99%)
 rename initializr-generator/src/main/java/io/spring/initializr/{util => generator/version}/VersionParser.java (97%)
 rename initializr-generator/src/main/java/io/spring/initializr/{util => generator/version}/VersionProperty.java (94%)
 rename initializr-generator/src/main/java/io/spring/initializr/{util => generator/version}/VersionRange.java (99%)
 create mode 100644 initializr-generator/src/main/java/io/spring/initializr/generator/version/package-info.java
 rename initializr-generator/src/test/java/io/spring/initializr/{util => generator/version}/VersionParserTests.java (98%)
 rename initializr-generator/src/test/java/io/spring/initializr/{util => generator/version}/VersionPropertyTests.java (97%)
 rename initializr-generator/src/test/java/io/spring/initializr/{util => generator/version}/VersionRangeTests.java (99%)
 rename initializr-generator/src/test/java/io/spring/initializr/{util => generator/version}/VersionTests.java (98%)

diff --git a/initializr-actuator/src/main/java/io/spring/initializr/actuate/info/DependencyRangesInfoContributor.java b/initializr-actuator/src/main/java/io/spring/initializr/actuate/info/DependencyRangesInfoContributor.java
index 89d1b8d4..a1fa58c0 100644
--- a/initializr-actuator/src/main/java/io/spring/initializr/actuate/info/DependencyRangesInfoContributor.java
+++ b/initializr-actuator/src/main/java/io/spring/initializr/actuate/info/DependencyRangesInfoContributor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,10 @@ package io.spring.initializr.actuate.info;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import io.spring.initializr.generator.version.Version;
+import io.spring.initializr.generator.version.VersionRange;
 import io.spring.initializr.metadata.Dependency;
 import io.spring.initializr.metadata.InitializrMetadataProvider;
-import io.spring.initializr.util.Version;
-import io.spring.initializr.util.VersionRange;
 
 import org.springframework.boot.actuate.info.Info;
 import org.springframework.boot.actuate.info.InfoContributor;
diff --git a/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocument.java b/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocument.java
index a9a8ec47..3ff65ac7 100644
--- a/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocument.java
+++ b/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocument.java
@@ -21,8 +21,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.StringJoiner;
 
+import io.spring.initializr.generator.version.Version;
 import io.spring.initializr.util.Agent;
-import io.spring.initializr.util.Version;
 
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
diff --git a/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactory.java b/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactory.java
index 41513663..463e10e3 100644
--- a/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactory.java
+++ b/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactory.java
@@ -24,9 +24,9 @@ import io.spring.initializr.actuate.stat.ProjectRequestDocument.ClientInformatio
 import io.spring.initializr.actuate.stat.ProjectRequestDocument.DependencyInformation;
 import io.spring.initializr.actuate.stat.ProjectRequestDocument.ErrorStateInformation;
 import io.spring.initializr.actuate.stat.ProjectRequestDocument.VersionInformation;
+import io.spring.initializr.generator.version.Version;
 import io.spring.initializr.metadata.InitializrMetadata;
 import io.spring.initializr.util.Agent;
-import io.spring.initializr.util.Version;
 import io.spring.initializr.web.project.ProjectFailedEvent;
 import io.spring.initializr.web.project.ProjectRequest;
 import io.spring.initializr.web.project.ProjectRequestEvent;
diff --git a/initializr-generator/src/main/java/io/spring/initializr/util/InvalidVersionException.java b/initializr-generator/src/main/java/io/spring/initializr/generator/version/InvalidVersionException.java
similarity index 89%
rename from initializr-generator/src/main/java/io/spring/initializr/util/InvalidVersionException.java
rename to initializr-generator/src/main/java/io/spring/initializr/generator/version/InvalidVersionException.java
index 1a93d61e..06546c52 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/util/InvalidVersionException.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/generator/version/InvalidVersionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.spring.initializr.util;
+package io.spring.initializr.generator.version;
 
 /**
  * Thrown if a input represents an invalid version.
diff --git a/initializr-generator/src/main/java/io/spring/initializr/util/Version.java b/initializr-generator/src/main/java/io/spring/initializr/generator/version/Version.java
similarity index 99%
rename from initializr-generator/src/main/java/io/spring/initializr/util/Version.java
rename to initializr-generator/src/main/java/io/spring/initializr/generator/version/Version.java
index 2659dd6c..4bc13e45 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/util/Version.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/generator/version/Version.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.spring.initializr.util;
+package io.spring.initializr.generator.version;
 
 import java.io.Serializable;
 import java.util.Arrays;
diff --git a/initializr-generator/src/main/java/io/spring/initializr/util/VersionParser.java b/initializr-generator/src/main/java/io/spring/initializr/generator/version/VersionParser.java
similarity index 97%
rename from initializr-generator/src/main/java/io/spring/initializr/util/VersionParser.java
rename to initializr-generator/src/main/java/io/spring/initializr/generator/version/VersionParser.java
index 96f139a0..913a769b 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/util/VersionParser.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/generator/version/VersionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.spring.initializr.util;
+package io.spring.initializr.generator.version;
 
 import java.util.Collections;
 import java.util.List;
@@ -22,7 +22,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import io.spring.initializr.util.Version.Qualifier;
+import io.spring.initializr.generator.version.Version.Qualifier;
 
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
diff --git a/initializr-generator/src/main/java/io/spring/initializr/util/VersionProperty.java b/initializr-generator/src/main/java/io/spring/initializr/generator/version/VersionProperty.java
similarity index 94%
rename from initializr-generator/src/main/java/io/spring/initializr/util/VersionProperty.java
rename to initializr-generator/src/main/java/io/spring/initializr/generator/version/VersionProperty.java
index 2ac5a5dd..33479bb7 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/util/VersionProperty.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/generator/version/VersionProperty.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package io.spring.initializr.util;
+package io.spring.initializr.generator.version;
 
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 import org.springframework.util.StringUtils;
 
@@ -119,15 +120,13 @@ public final class VersionProperty implements Serializable, Comparable<VersionPr
 		if (o == null || getClass() != o.getClass()) {
 			return false;
 		}
-
 		VersionProperty that = (VersionProperty) o;
-
-		return this.property.equals(that.property);
+		return this.internal == that.internal && this.property.equals(that.property);
 	}
 
 	@Override
 	public int hashCode() {
-		return this.property.hashCode();
+		return Objects.hash(this.property, this.internal);
 	}
 
 	@Override
diff --git a/initializr-generator/src/main/java/io/spring/initializr/util/VersionRange.java b/initializr-generator/src/main/java/io/spring/initializr/generator/version/VersionRange.java
similarity index 99%
rename from initializr-generator/src/main/java/io/spring/initializr/util/VersionRange.java
rename to initializr-generator/src/main/java/io/spring/initializr/generator/version/VersionRange.java
index d1041b67..053599be 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/util/VersionRange.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/generator/version/VersionRange.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.spring.initializr.util;
+package io.spring.initializr.generator.version;
 
 import org.springframework.util.Assert;
 
diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/version/package-info.java b/initializr-generator/src/main/java/io/spring/initializr/generator/version/package-info.java
new file mode 100644
index 00000000..043c7ab2
--- /dev/null
+++ b/initializr-generator/src/main/java/io/spring/initializr/generator/version/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Version support classes.
+ */
+package io.spring.initializr.generator.version;
diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/BillOfMaterials.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/BillOfMaterials.java
index 9534fcfb..40d861b4 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/metadata/BillOfMaterials.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/BillOfMaterials.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,11 +22,11 @@ import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import io.spring.initializr.util.InvalidVersionException;
-import io.spring.initializr.util.Version;
-import io.spring.initializr.util.VersionParser;
-import io.spring.initializr.util.VersionProperty;
-import io.spring.initializr.util.VersionRange;
+import io.spring.initializr.generator.version.InvalidVersionException;
+import io.spring.initializr.generator.version.Version;
+import io.spring.initializr.generator.version.VersionParser;
+import io.spring.initializr.generator.version.VersionProperty;
+import io.spring.initializr.generator.version.VersionRange;
 
 /**
  * Define a Bill Of Materials to be represented in the generated project if a dependency
diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/DependenciesCapability.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/DependenciesCapability.java
index 53980561..d843b20b 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/metadata/DependenciesCapability.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/DependenciesCapability.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.spring.initializr.util.VersionParser;
+import io.spring.initializr.generator.version.VersionParser;
 
 /**
  * A {@link ServiceCapability} listing the available dependencies defined as a
diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/Dependency.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/Dependency.java
index 5b0c5826..e74c4ea3 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/metadata/Dependency.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/Dependency.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,10 +24,10 @@ import java.util.StringTokenizer;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import io.spring.initializr.util.InvalidVersionException;
-import io.spring.initializr.util.Version;
-import io.spring.initializr.util.VersionParser;
-import io.spring.initializr.util.VersionRange;
+import io.spring.initializr.generator.version.InvalidVersionException;
+import io.spring.initializr.generator.version.Version;
+import io.spring.initializr.generator.version.VersionParser;
+import io.spring.initializr.generator.version.VersionRange;
 
 import org.springframework.util.StringUtils;
 
diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/DependencyMetadata.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/DependencyMetadata.java
index 2ffe9acf..6f8b52b0 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/metadata/DependencyMetadata.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/DependencyMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package io.spring.initializr.metadata;
 
 import java.util.Map;
 
-import io.spring.initializr.util.Version;
+import io.spring.initializr.generator.version.Version;
 
 /**
  * Dependency metadata for a given spring boot {@link Version}.
diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/DependencyMetadataProvider.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/DependencyMetadataProvider.java
index 14457052..2340cb1f 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/metadata/DependencyMetadataProvider.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/DependencyMetadataProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package io.spring.initializr.metadata;
 
-import io.spring.initializr.util.Version;
+import io.spring.initializr.generator.version.Version;
 
 /**
  * Provide the {@link DependencyMetadata} for a given spring boot version.
diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrConfiguration.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrConfiguration.java
index 5b200756..358f0bd2 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrConfiguration.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,10 +26,10 @@ import java.util.List;
 import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.spring.initializr.util.InvalidVersionException;
-import io.spring.initializr.util.Version;
-import io.spring.initializr.util.VersionParser;
-import io.spring.initializr.util.VersionRange;
+import io.spring.initializr.generator.version.InvalidVersionException;
+import io.spring.initializr.generator.version.Version;
+import io.spring.initializr.generator.version.VersionParser;
+import io.spring.initializr.generator.version.VersionRange;
 
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import org.springframework.util.StringUtils;
diff --git a/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrMetadata.java b/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrMetadata.java
index fc782ea1..c68bafe0 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrMetadata.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/metadata/InitializrMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,9 +21,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import io.spring.initializr.util.Version;
-import io.spring.initializr.util.VersionParser;
-import io.spring.initializr.util.VersionProperty;
+import io.spring.initializr.generator.version.Version;
+import io.spring.initializr.generator.version.VersionParser;
+import io.spring.initializr.generator.version.VersionProperty;
 
 /**
  * Meta-data used to generate a project.
diff --git a/initializr-generator/src/test/java/io/spring/initializr/util/VersionParserTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/version/VersionParserTests.java
similarity index 98%
rename from initializr-generator/src/test/java/io/spring/initializr/util/VersionParserTests.java
rename to initializr-generator/src/test/java/io/spring/initializr/generator/version/VersionParserTests.java
index c924ead0..ee881ab5 100755
--- a/initializr-generator/src/test/java/io/spring/initializr/util/VersionParserTests.java
+++ b/initializr-generator/src/test/java/io/spring/initializr/generator/version/VersionParserTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.spring.initializr.util;
+package io.spring.initializr.generator.version;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/initializr-generator/src/test/java/io/spring/initializr/util/VersionPropertyTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/version/VersionPropertyTests.java
similarity index 97%
rename from initializr-generator/src/test/java/io/spring/initializr/util/VersionPropertyTests.java
rename to initializr-generator/src/test/java/io/spring/initializr/generator/version/VersionPropertyTests.java
index 4d1b711b..2acbb372 100755
--- a/initializr-generator/src/test/java/io/spring/initializr/util/VersionPropertyTests.java
+++ b/initializr-generator/src/test/java/io/spring/initializr/generator/version/VersionPropertyTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.spring.initializr.util;
+package io.spring.initializr.generator.version;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/initializr-generator/src/test/java/io/spring/initializr/util/VersionRangeTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/version/VersionRangeTests.java
similarity index 99%
rename from initializr-generator/src/test/java/io/spring/initializr/util/VersionRangeTests.java
rename to initializr-generator/src/test/java/io/spring/initializr/generator/version/VersionRangeTests.java
index e28dc9ef..746b1f78 100755
--- a/initializr-generator/src/test/java/io/spring/initializr/util/VersionRangeTests.java
+++ b/initializr-generator/src/test/java/io/spring/initializr/generator/version/VersionRangeTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.spring.initializr.util;
+package io.spring.initializr.generator.version;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/initializr-generator/src/test/java/io/spring/initializr/util/VersionTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/version/VersionTests.java
similarity index 98%
rename from initializr-generator/src/test/java/io/spring/initializr/util/VersionTests.java
rename to initializr-generator/src/test/java/io/spring/initializr/generator/version/VersionTests.java
index 1b1b0e0f..3a526eed 100755
--- a/initializr-generator/src/test/java/io/spring/initializr/util/VersionTests.java
+++ b/initializr-generator/src/test/java/io/spring/initializr/generator/version/VersionTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.spring.initializr.util;
+package io.spring.initializr.generator.version;
 
 import java.util.Collections;
 
diff --git a/initializr-generator/src/test/java/io/spring/initializr/metadata/BillOfMaterialsTests.java b/initializr-generator/src/test/java/io/spring/initializr/metadata/BillOfMaterialsTests.java
index 61eabd42..204cfe83 100755
--- a/initializr-generator/src/test/java/io/spring/initializr/metadata/BillOfMaterialsTests.java
+++ b/initializr-generator/src/test/java/io/spring/initializr/metadata/BillOfMaterialsTests.java
@@ -18,9 +18,9 @@ package io.spring.initializr.metadata;
 
 import java.util.Arrays;
 
+import io.spring.initializr.generator.version.Version;
+import io.spring.initializr.generator.version.VersionParser;
 import io.spring.initializr.metadata.BillOfMaterials.Mapping;
-import io.spring.initializr.util.Version;
-import io.spring.initializr.util.VersionParser;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/initializr-generator/src/test/java/io/spring/initializr/metadata/DependencyTests.java b/initializr-generator/src/test/java/io/spring/initializr/metadata/DependencyTests.java
index ed6b7f31..1accfdbf 100755
--- a/initializr-generator/src/test/java/io/spring/initializr/metadata/DependencyTests.java
+++ b/initializr-generator/src/test/java/io/spring/initializr/metadata/DependencyTests.java
@@ -18,8 +18,8 @@ package io.spring.initializr.metadata;
 
 import java.util.Arrays;
 
-import io.spring.initializr.util.Version;
-import io.spring.initializr.util.VersionParser;
+import io.spring.initializr.generator.version.Version;
+import io.spring.initializr.generator.version.VersionParser;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/initializr-generator/src/test/java/io/spring/initializr/metadata/InitializrConfigurationTests.java b/initializr-generator/src/test/java/io/spring/initializr/metadata/InitializrConfigurationTests.java
index 59f99b2d..a0d4adc3 100755
--- a/initializr-generator/src/test/java/io/spring/initializr/metadata/InitializrConfigurationTests.java
+++ b/initializr-generator/src/test/java/io/spring/initializr/metadata/InitializrConfigurationTests.java
@@ -16,8 +16,8 @@
 
 package io.spring.initializr.metadata;
 
+import io.spring.initializr.generator.version.Version;
 import io.spring.initializr.metadata.InitializrConfiguration.Env.Kotlin;
-import io.spring.initializr.util.Version;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/initializr-generator/src/test/java/io/spring/initializr/metadata/InitializrMetadataTests.java b/initializr-generator/src/test/java/io/spring/initializr/metadata/InitializrMetadataTests.java
index 336f7daa..03337719 100755
--- a/initializr-generator/src/test/java/io/spring/initializr/metadata/InitializrMetadataTests.java
+++ b/initializr-generator/src/test/java/io/spring/initializr/metadata/InitializrMetadataTests.java
@@ -21,10 +21,10 @@ import java.net.URL;
 import java.util.Arrays;
 import java.util.List;
 
+import io.spring.initializr.generator.version.Version;
 import io.spring.initializr.metadata.BillOfMaterials.Mapping;
 import io.spring.initializr.metadata.InitializrConfiguration.Env.Kotlin;
 import io.spring.initializr.metadata.InitializrConfiguration.Env.Maven.ParentPom;
-import io.spring.initializr.util.Version;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrModule.java b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrModule.java
index d749d7a3..3cd993f5 100644
--- a/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrModule.java
+++ b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrModule.java
@@ -22,7 +22,7 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import io.spring.initializr.util.VersionProperty;
+import io.spring.initializr.generator.version.VersionProperty;
 
 /**
  * A {@link SimpleModule} that registers custom serializers.
diff --git a/initializr-web/src/main/java/io/spring/initializr/web/project/MainController.java b/initializr-web/src/main/java/io/spring/initializr/web/project/MainController.java
index 145b7d6e..fcd83938 100644
--- a/initializr-web/src/main/java/io/spring/initializr/web/project/MainController.java
+++ b/initializr-web/src/main/java/io/spring/initializr/web/project/MainController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit;
 import javax.servlet.http.HttpServletRequest;
 
 import com.samskivert.mustache.Mustache;
+import io.spring.initializr.generator.version.Version;
 import io.spring.initializr.metadata.DependencyMetadata;
 import io.spring.initializr.metadata.DependencyMetadataProvider;
 import io.spring.initializr.metadata.InitializrMetadata;
@@ -35,7 +36,6 @@ import io.spring.initializr.metadata.InitializrMetadataProvider;
 import io.spring.initializr.util.Agent;
 import io.spring.initializr.util.Agent.AgentId;
 import io.spring.initializr.util.TemplateRenderer;
-import io.spring.initializr.util.Version;
 import io.spring.initializr.web.mapper.DependencyMetadataV21JsonMapper;
 import io.spring.initializr.web.mapper.InitializrMetadataJsonMapper;
 import io.spring.initializr.web.mapper.InitializrMetadataV21JsonMapper;
diff --git a/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectRequestToDescriptionConverter.java b/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectRequestToDescriptionConverter.java
index 955bff17..4802b6d8 100644
--- a/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectRequestToDescriptionConverter.java
+++ b/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectRequestToDescriptionConverter.java
@@ -26,11 +26,11 @@ import io.spring.initializr.generator.language.Language;
 import io.spring.initializr.generator.packaging.Packaging;
 import io.spring.initializr.generator.project.ProjectDescription;
 import io.spring.initializr.generator.spring.build.MetadataBuildItemMapper;
+import io.spring.initializr.generator.version.Version;
 import io.spring.initializr.metadata.DefaultMetadataElement;
 import io.spring.initializr.metadata.Dependency;
 import io.spring.initializr.metadata.InitializrMetadata;
 import io.spring.initializr.metadata.Type;
-import io.spring.initializr.util.Version;
 import io.spring.initializr.web.InvalidProjectRequestException;
 
 import org.springframework.util.StringUtils;
@@ -60,8 +60,7 @@ public class ProjectRequestToDescriptionConverter {
 		description.setPackageName(getPackageName(request, metadata));
 		description.setPackaging(Packaging.forId(request.getPackaging()));
 		String springBootVersion = getSpringBootVersion(request, metadata);
-		description
-				.setPlatformVersion(MetadataBuildItemMapper.toVersion(springBootVersion));
+		description.setPlatformVersion(Version.parse(springBootVersion));
 		getResolvedDependencies(request, springBootVersion, metadata)
 				.forEach((dependency) -> description.addDependency(dependency.getId(),
 						MetadataBuildItemMapper.toDependency(dependency)));
diff --git a/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultDependencyMetadataProvider.java b/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultDependencyMetadataProvider.java
index 6191d510..d8e75c46 100644
--- a/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultDependencyMetadataProvider.java
+++ b/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultDependencyMetadataProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,13 +19,13 @@ package io.spring.initializr.web.support;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import io.spring.initializr.generator.version.Version;
 import io.spring.initializr.metadata.BillOfMaterials;
 import io.spring.initializr.metadata.Dependency;
 import io.spring.initializr.metadata.DependencyMetadata;
 import io.spring.initializr.metadata.DependencyMetadataProvider;
 import io.spring.initializr.metadata.InitializrMetadata;
 import io.spring.initializr.metadata.Repository;
-import io.spring.initializr.util.Version;
 
 import org.springframework.cache.annotation.Cacheable;
 
diff --git a/initializr-web/src/main/java/io/spring/initializr/web/ui/UiController.java b/initializr-web/src/main/java/io/spring/initializr/web/ui/UiController.java
index 55d183d6..41f811a6 100644
--- a/initializr-web/src/main/java/io/spring/initializr/web/ui/UiController.java
+++ b/initializr-web/src/main/java/io/spring/initializr/web/ui/UiController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,10 +23,10 @@ import java.util.List;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import io.spring.initializr.generator.version.Version;
 import io.spring.initializr.metadata.Dependency;
 import io.spring.initializr.metadata.DependencyGroup;
 import io.spring.initializr.metadata.InitializrMetadataProvider;
-import io.spring.initializr.util.Version;
 
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
diff --git a/initializr-web/src/test/java/io/spring/initializr/web/mapper/DependencyMetadataJsonMapperTests.java b/initializr-web/src/test/java/io/spring/initializr/web/mapper/DependencyMetadataJsonMapperTests.java
index fc4b1b6d..862ecedf 100755
--- a/initializr-web/src/test/java/io/spring/initializr/web/mapper/DependencyMetadataJsonMapperTests.java
+++ b/initializr-web/src/test/java/io/spring/initializr/web/mapper/DependencyMetadataJsonMapperTests.java
@@ -19,11 +19,11 @@ package io.spring.initializr.web.mapper;
 import java.net.URL;
 import java.util.Collections;
 
+import io.spring.initializr.generator.version.Version;
 import io.spring.initializr.metadata.BillOfMaterials;
 import io.spring.initializr.metadata.Dependency;
 import io.spring.initializr.metadata.DependencyMetadata;
 import io.spring.initializr.metadata.Repository;
-import io.spring.initializr.util.Version;
 import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
 
diff --git a/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultDependencyMetadataProviderTests.java b/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultDependencyMetadataProviderTests.java
index e9a31a74..df38d804 100755
--- a/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultDependencyMetadataProviderTests.java
+++ b/initializr-web/src/test/java/io/spring/initializr/web/support/DefaultDependencyMetadataProviderTests.java
@@ -16,13 +16,13 @@
 
 package io.spring.initializr.web.support;
 
+import io.spring.initializr.generator.version.Version;
 import io.spring.initializr.metadata.BillOfMaterials;
 import io.spring.initializr.metadata.Dependency;
 import io.spring.initializr.metadata.DependencyMetadata;
 import io.spring.initializr.metadata.DependencyMetadataProvider;
 import io.spring.initializr.metadata.InitializrMetadata;
 import io.spring.initializr.test.metadata.InitializrMetadataTestBuilder;
-import io.spring.initializr.util.Version;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;