From 2f90c92b3b571b4e978640f85f255f6ef91104ef Mon Sep 17 00:00:00 2001 From: Markus Kreth Date: Sun, 9 Dec 2018 23:21:46 +0100 Subject: [PATCH] Deployable application --- .classpath | 4 +++- .settings/com.vaadin.integration.eclipse.prefs | 2 +- .settings/org.eclipse.core.resources.prefs | 1 - .../vaadinclubhelper/VaadinClubhelperApplication.java | 9 ++++++++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.classpath b/.classpath index 2323c6f..aa94cd6 100644 --- a/.classpath +++ b/.classpath @@ -35,9 +35,11 @@ - + + + diff --git a/.settings/com.vaadin.integration.eclipse.prefs b/.settings/com.vaadin.integration.eclipse.prefs index 9834749..6070504 100644 --- a/.settings/com.vaadin.integration.eclipse.prefs +++ b/.settings/com.vaadin.integration.eclipse.prefs @@ -1,2 +1,2 @@ -com.vaadin.integration.eclipse.mavenLatestVersionsUpgrade=["8.4.5","8.5.2"] +com.vaadin.integration.eclipse.mavenLatestVersionsUpgrade=["8.6.2"] eclipse.preferences.version=1 diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 6d88dab..f004f42 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -5,5 +5,4 @@ encoding//src/main/resources/jasper/calendar_month.jrxml=UTF-8 encoding//src/main/resources/jasper/calendar_year.jrxml=UTF-8 encoding//src/test/java=UTF-8 encoding//src/test/resources=UTF-8 -encoding//target/generated-resources/gwt=UTF-8 encoding/=UTF-8 diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/VaadinClubhelperApplication.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/VaadinClubhelperApplication.java index b70578a..c7f010e 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/VaadinClubhelperApplication.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/VaadinClubhelperApplication.java @@ -2,13 +2,20 @@ package de.kreth.vaadin.clubhelper.vaadinclubhelper; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication @EnableScheduling -public class VaadinClubhelperApplication { +public class VaadinClubhelperApplication extends SpringBootServletInitializer { public static void main(String[] args) { SpringApplication.run(VaadinClubhelperApplication.class, args); } + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { + return builder.sources(VaadinClubhelperApplication.class); + } }