From 6c7d9dd592a4fc7ac07bc30c4d8e6937888103ec Mon Sep 17 00:00:00 2001 From: Mark McDonald Date: Sat, 6 Jun 2015 22:04:42 -0400 Subject: [PATCH] Default java version to 8 Closes gh-118 --- initializr-service/application.yml | 4 ++-- initializr/src/main/resources/templates/curl-examples.txt | 4 ++-- initializr/src/main/resources/templates/httpie-examples.txt | 4 ++-- .../generator/ProjectGenerationMetricsListenerTests.groovy | 6 +++--- .../initializr/test/InitializrMetadataTestBuilder.groovy | 2 +- initializr/src/test/resources/application-test-default.yml | 4 ++-- .../src/test/resources/metadata/config/test-default.json | 4 ++-- .../src/test/resources/metadata/test-default-2.0.0.json | 2 +- .../src/test/resources/metadata/test-default-2.1.0.json | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/initializr-service/application.yml b/initializr-service/application.yml index 8dca147e..d1f140f1 100644 --- a/initializr-service/application.yml +++ b/initializr-service/application.yml @@ -347,9 +347,9 @@ initializr: - id: 1.6 default: false - id: 1.7 - default: true - - id: 1.8 default: false + - id: 1.8 + default: true languages: - name: Groovy id: groovy diff --git a/initializr/src/main/resources/templates/curl-examples.txt b/initializr/src/main/resources/templates/curl-examples.txt index 80b604cb..02dbdff2 100644 --- a/initializr/src/main/resources/templates/curl-examples.txt +++ b/initializr/src/main/resources/templates/curl-examples.txt @@ -1,9 +1,9 @@ To create a default demo.zip: \$ curl ${serviceUrl}/starter.zip -o demo.zip -To create a web project using Java 8: +To create a web project using Java 7: \$ curl ${serviceUrl}/starter.zip -d dependencies=web \\ - -d javaVersion=1.8 -o demo.zip + -d javaVersion=1.7 -o demo.zip To create a web/data-jpa gradle project unpacked: \$ curl ${serviceUrl}/starter.tgz -d dependencies=web,data-jpa \\ diff --git a/initializr/src/main/resources/templates/httpie-examples.txt b/initializr/src/main/resources/templates/httpie-examples.txt index 4cc475b0..bab6043d 100644 --- a/initializr/src/main/resources/templates/httpie-examples.txt +++ b/initializr/src/main/resources/templates/httpie-examples.txt @@ -1,9 +1,9 @@ To create a default project: \$ http ${serviceUrl}/starter.zip -d -To create a web project using Java 8: +To create a web project using Java 7: \$ http ${serviceUrl}/starter.zip dependencies==web \\ - javaVersion==1.8 -d + javaVersion==1.7 -d To create a web/data-jpa gradle project unpacked: \$ http ${serviceUrl}/starter.tgz dependencies==web,data-jpa \\ diff --git a/initializr/src/test/groovy/io/spring/initializr/generator/ProjectGenerationMetricsListenerTests.groovy b/initializr/src/test/groovy/io/spring/initializr/generator/ProjectGenerationMetricsListenerTests.groovy index 54975515..9b54c950 100644 --- a/initializr/src/test/groovy/io/spring/initializr/generator/ProjectGenerationMetricsListenerTests.groovy +++ b/initializr/src/test/groovy/io/spring/initializr/generator/ProjectGenerationMetricsListenerTests.groovy @@ -134,16 +134,16 @@ class ProjectGenerationMetricsListenerTests { def request = initialize() request.resolve(metadata) listener.onGeneratedProject(request) - metricsAssert.hasValue(1, 'initializr.java_version.1_7') + metricsAssert.hasValue(1, 'initializr.java_version.1_8') } @Test void explicitJavaVersion() { def request = initialize() - request.javaVersion = '1.8' + request.javaVersion = '1.7' request.resolve(metadata) listener.onGeneratedProject(request) - metricsAssert.hasValue(1, 'initializr.java_version.1_8') + metricsAssert.hasValue(1, 'initializr.java_version.1_7') } @Test diff --git a/initializr/src/test/groovy/io/spring/initializr/test/InitializrMetadataTestBuilder.groovy b/initializr/src/test/groovy/io/spring/initializr/test/InitializrMetadataTestBuilder.groovy index cf9fda16..7daa5db1 100644 --- a/initializr/src/test/groovy/io/spring/initializr/test/InitializrMetadataTestBuilder.groovy +++ b/initializr/src/test/groovy/io/spring/initializr/test/InitializrMetadataTestBuilder.groovy @@ -104,7 +104,7 @@ class InitializrMetadataTestBuilder { } InitializrMetadataTestBuilder addDefaultJavaVersions() { - addJavaVersion('1.6', false).addJavaVersion('1.7', true).addJavaVersion('1.8', false) + addJavaVersion('1.6', false).addJavaVersion('1.7', false).addJavaVersion('1.8', true) } InitializrMetadataTestBuilder addJavaVersion(String version, boolean defaultValue) { diff --git a/initializr/src/test/resources/application-test-default.yml b/initializr/src/test/resources/application-test-default.yml index 00158959..3cc874c1 100644 --- a/initializr/src/test/resources/application-test-default.yml +++ b/initializr/src/test/resources/application-test-default.yml @@ -87,9 +87,9 @@ initializr: - id: 1.6 default: false - id: 1.7 - default: true - - id: 1.8 default: false + - id: 1.8 + default: true languages: - name: Groovy id: groovy diff --git a/initializr/src/test/resources/metadata/config/test-default.json b/initializr/src/test/resources/metadata/config/test-default.json index 21f111f8..0153e5e0 100644 --- a/initializr/src/test/resources/metadata/config/test-default.json +++ b/initializr/src/test/resources/metadata/config/test-default.json @@ -161,12 +161,12 @@ "name": "1.6" }, { - "default": true, + "default": false, "id": "1.7", "name": "1.7" }, { - "default": false, + "default": true, "id": "1.8", "name": "1.8" } diff --git a/initializr/src/test/resources/metadata/test-default-2.0.0.json b/initializr/src/test/resources/metadata/test-default-2.0.0.json index 8ed875ee..5dc28d3f 100644 --- a/initializr/src/test/resources/metadata/test-default-2.0.0.json +++ b/initializr/src/test/resources/metadata/test-default-2.0.0.json @@ -115,7 +115,7 @@ }, "javaVersion": { "type": "single-select", - "default": "1.7", + "default": "1.8", "values": [ { "id": "1.6", diff --git a/initializr/src/test/resources/metadata/test-default-2.1.0.json b/initializr/src/test/resources/metadata/test-default-2.1.0.json index 365fea47..b6d2ca76 100644 --- a/initializr/src/test/resources/metadata/test-default-2.1.0.json +++ b/initializr/src/test/resources/metadata/test-default-2.1.0.json @@ -125,7 +125,7 @@ }, "javaVersion": { "type": "single-select", - "default": "1.7", + "default": "1.8", "values": [ { "id": "1.6",