Skip to content

Commit

Permalink
#2 executable jar generation from gradle, plus fixed a test
Browse files Browse the repository at this point in the history
  • Loading branch information
sbohmann committed Feb 21, 2019
1 parent 5de14df commit f2af436
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 19 deletions.
1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

2 changes: 2 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 19 additions & 4 deletions build.gradle
@@ -1,7 +1,18 @@
plugins {
id 'java'
buildscript {
repositories {
mavenCentral()
}
ext {
springBootVersion = '2.0.4.RELEASE'
}
dependencies {
classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
}
}

apply plugin: 'java'
apply plugin: 'org.springframework.boot'

compileJava {
options.compilerArgs += ["-h", file("generated_headers")]
// options.verbose = true
Expand All @@ -12,7 +23,7 @@ dependencies {
}

group 'at.yeoman.photobackup'
version '1.0-SNAPSHOT'
version '1.0.0-SNAPSHOT'

sourceCompatibility = 1.8

Expand All @@ -25,7 +36,7 @@ repositories {
}

dependencies {
def springBootVersion = '2.0.4.RELEASE'
compile group: 'org.springframework.boot', name: 'spring-boot-gradle-plugin', version: springBootVersion

compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: springBootVersion
compile group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf', version: springBootVersion
Expand All @@ -45,3 +56,7 @@ task run(type: JavaExec) {

main = 'at.yeoman.photobackup.server.Server'
}

bootJar {
launchScript()
}
1 change: 0 additions & 1 deletion settings.gradle
@@ -1,2 +1 @@
rootProject.name = 'server'

2 changes: 1 addition & 1 deletion src/test/java/jackson/BasicSerialization.java
Expand Up @@ -9,7 +9,7 @@
public class BasicSerialization {
@Test
public void deserializeAssetReport() throws IOException {
String json = "{\"descriptions\":[{\"name\":\"hello\"}]}";
String json = "{\"descriptions\":[{\"name\":\"hello\", \"resourceDescriptions\": []}]}";
System.out.println(json);
AssetReport result = new ObjectMapper().readValue(json, AssetReport.class);
System.out.println(result);
Expand Down

0 comments on commit f2af436

Please sign in to comment.