Merge remote-tracking branch 'origin/master'

This commit is contained in:
Alex Theedom 2016-12-06 13:54:03 +00:00
commit 4de742cbaa
2 changed files with 7 additions and 5 deletions

View File

@ -13,13 +13,15 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>1.2.6.RELEASE</version> <version>1.4.2.RELEASE</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<quartz.version>2.2.3</quartz.version>
<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
</properties> </properties>
<dependencies> <dependencies>
@ -39,7 +41,7 @@
<dependency> <dependency>
<groupId>org.quartz-scheduler</groupId> <groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId> <artifactId>quartz</artifactId>
<version>2.2.1</version> <version>${quartz.version}</version>
</dependency> </dependency>
<!-- tests --> <!-- tests -->
@ -64,7 +66,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version> <version>${maven-compiler-plugin.version}</version>
<configuration> <configuration>
<source>1.8</source> <source>1.8</source>
<target>1.8</target> <target>1.8</target>

View File

@ -1,6 +1,6 @@
package org.baeldung.springquartz; package org.baeldung.springquartz;
import org.springframework.boot.SpringApplication; import org.springframework.boot.Banner.Mode;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;
@ -10,6 +10,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
public class SpringQuartzApp { public class SpringQuartzApp {
public static void main(String[] args) { public static void main(String[] args) {
new SpringApplicationBuilder(SpringQuartzApp.class).showBanner(false).run(args); new SpringApplicationBuilder(SpringQuartzApp.class).bannerMode(Mode.OFF).run(args);
} }
} }