Merge pull request #118 from MarkyMarkMcDonald/feature/default-to-java-8

* feature/default-to-java-8:
  Default java version to 8
This commit is contained in:
Stephane Nicoll
2015-06-09 11:47:30 +02:00
9 changed files with 16 additions and 16 deletions

View File

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

View File

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

View File

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

View File

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

View File

@@ -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) {

View File

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

View File

@@ -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"
}

View File

@@ -115,7 +115,7 @@
},
"javaVersion": {
"type": "single-select",
"default": "1.7",
"default": "1.8",
"values": [
{
"id": "1.6",

View File

@@ -125,7 +125,7 @@
},
"javaVersion": {
"type": "single-select",
"default": "1.7",
"default": "1.8",
"values": [
{
"id": "1.6",