From 742db270d877ded923d1ee6c8f7a083e31becb2f Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 6 Dec 2018 14:08:45 +0100
Subject: [PATCH] Stop registering java.version as a VersionProperty

---
 .../io/spring/initializr/generator/ProjectRequest.java     | 7 ++-----
 .../initializr/generator/ProjectRequestResolverTests.java  | 6 +-----
 .../test/resources/project/maven/bom-property-pom.xml.gen  | 2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectRequest.java b/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectRequest.java
index 0764e306..aba732c5 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectRequest.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectRequest.java
@@ -30,7 +30,6 @@ import io.spring.initializr.metadata.InitializrMetadata;
 import io.spring.initializr.metadata.Repository;
 import io.spring.initializr.metadata.Type;
 import io.spring.initializr.util.Version;
-import io.spring.initializr.util.VersionProperty;
 
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.util.StringUtils;
@@ -239,11 +238,9 @@ public class ProjectRequest extends BasicProjectRequest {
 			}
 		}
 		else {
-			this.buildProperties.getVersions().put(VersionProperty.of("java.version"),
-					this::getJavaVersion);
+			this.buildProperties.getMaven().put("java.version", this::getJavaVersion);
 			if ("kotlin".equals(getLanguage())) {
-				this.buildProperties.getVersions()
-						.put(VersionProperty.of("kotlin.version"), kotlinVersion);
+				this.buildProperties.getMaven().put("kotlin.version", kotlinVersion);
 			}
 		}
 	}
diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectRequestResolverTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectRequestResolverTests.java
index 601e795b..5a7db4e1 100755
--- a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectRequestResolverTests.java
+++ b/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectRequestResolverTests.java
@@ -24,7 +24,6 @@ import java.util.Map;
 
 import io.spring.initializr.metadata.InitializrMetadata;
 import io.spring.initializr.test.metadata.InitializrMetadataTestBuilder;
-import io.spring.initializr.util.VersionProperty;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -39,9 +38,6 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 public class ProjectRequestResolverTests {
 
-	private static final VersionProperty VERSION_PROPERTY = VersionProperty
-			.of("java.version");
-
 	private InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults()
 			.addDependencyGroup("test", "web", "security", "data-jpa").build();
 
@@ -60,7 +56,7 @@ public class ProjectRequestResolverTests {
 		ProjectRequest request = resolve(createMavenProjectRequest(),
 				this.postProcessors);
 		assertThat(request.getJavaVersion()).isEqualTo("1.2");
-		assertThat(request.getBuildProperties().getVersions().get(VERSION_PROPERTY).get())
+		assertThat(request.getBuildProperties().getMaven().get("java.version").get())
 				.isEqualTo("1.2");
 	}
 
diff --git a/initializr-generator/src/test/resources/project/maven/bom-property-pom.xml.gen b/initializr-generator/src/test/resources/project/maven/bom-property-pom.xml.gen
index 517be390..43e6c2a2 100644
--- a/initializr-generator/src/test/resources/project/maven/bom-property-pom.xml.gen
+++ b/initializr-generator/src/test/resources/project/maven/bom-property-pom.xml.gen
@@ -16,8 +16,8 @@
 	<description>Demo project for Spring Boot</description>
 
 	<properties>
-		<foo.version>1.3.3</foo.version>
 		<java.version>1.8</java.version>
+		<foo.version>1.3.3</foo.version>
 	</properties>
 
 	<dependencies>