Update basewebapp to Spring Boot 1.3.5 and Java 8.

Andrea Zanelli · Andrea Zanelli · commit e67bf3cd8e27 · 2016-05-22T10:40:55.000+02:00
diff --git a/spring-boot-basewebapp/pom.xml b/spring-boot-basewebapp/pom.xml
@@ -1,37 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
   <groupId>netgloo</groupId>
   <artifactId>spring-boot-basewebapp</artifactId>
   <version>0.0.1-SNAPSHOT</version>
+  <packaging>jar</packaging>
 
   <name>spring-boot-basewebapp</name>
   <description>Spring Boot base web application</description>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>1.2.3.RELEASE</version>
+    <version>1.3.5.RELEASE</version>
     <relativePath /> <!-- lookup parent from repository -->
   </parent>
 
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <java.version>1.8</java.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
   </dependencies>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <start-class>netgloo.Application</start-class>
-    <java.version>1.7</java.version>
-  </properties>
-
   <build>
     <plugins>
       <plugin>
diff --git a/spring-boot-basewebapp/readme.md b/spring-boot-basewebapp/readme.md
@@ -4,17 +4,13 @@ Basic Spring Boot web application serving static content.
 
 See here for more informations: http://blog.netgloo.com/2014/05/18/very-basic-web-application-with-spring-mvc-spring-boot-and-eclipse-sts/
 
-### Usage
-
-- Launch the application and go on http://localhost:8080/
-- You can see the content from the static page `hello.html`
 
 ### Build and run
 
 #### Prerequisites
 
-- Java 7
-- Maven 3
+- Java 8
+- Maven 3.0+
 
 #### Using the terminal
 
@@ -25,3 +21,9 @@ Go on the project's root folder, then type:
 #### From Eclipse (Spring Tool Suite)
 
 Import as *Existing Maven Project* and run it as *Spring Boot App*.
+
+
+### Usage
+
+- Launch the application and go on http://localhost:8080/
+- You can see the content from the static page `hello.html`
diff --git a/spring-boot-basewebapp/src/main/java/netgloo/Application.java b/spring-boot-basewebapp/src/main/java/netgloo/Application.java
@@ -1,16 +1,13 @@
 package netgloo;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@Configuration
-@ComponentScan
-@EnableAutoConfiguration
+@SpringBootApplication
 public class Application {
 
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }
+
 }
diff --git a/spring-boot-basewebapp/src/main/resources/static/hello.html b/spring-boot-basewebapp/src/main/resources/static/hello.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <body>
-  <h1>Hello world!!! (hello.html)</h1>
+  <h2>Hello world!!! (hello.html)</h2>
   <p>
     By <a href="http://netgloo.com/en">netgloo</a>!
   </p>
