Revert "Merge branch 'master' of https://gitlab.ewi.tudelft.nl/cse1105/2018-2019/oopp-group-43/template"
This reverts commit 4d09f82aec
This commit is contained in:
40
Server/.gitignore
vendored
40
Server/.gitignore
vendored
@@ -1,40 +0,0 @@
|
||||
# # Maven ignores
|
||||
# target/
|
||||
# pom.xml.tag
|
||||
# pom.xml.releaseBackup
|
||||
# pom.xml.versionsBackup
|
||||
# pom.xml.next
|
||||
# release.properties
|
||||
# dependency-reduced-pom.xml
|
||||
# buildNumber.properties
|
||||
# .mvn/timing.properties
|
||||
|
||||
# # Exclude maven wrapper
|
||||
# !/.mvn/wrapper/maven-wrapper.jar
|
||||
|
||||
|
||||
|
||||
|
||||
# Created by https://www.gitignore.io/api/java,maven,eclipse,intellij,visualstudiocode
|
||||
# Edit at https://www.gitignore.io/?templates=java,maven,eclipse,intellij,visualstudiocode
|
||||
|
||||
### Gradle ###
|
||||
.gradle
|
||||
build/
|
||||
|
||||
# Ignore Gradle GUI config
|
||||
gradle-app.setting
|
||||
|
||||
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
|
||||
!gradle-wrapper.jar
|
||||
|
||||
# Cache of project
|
||||
.gradletasknamecache
|
||||
|
||||
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
|
||||
# gradle/wrapper/gradle-wrapper.properties
|
||||
|
||||
### Gradle Patch ###
|
||||
**/build/
|
||||
|
||||
# End of https://www.gitignore.io/api/java,maven,eclipse,intellij,visualstudiocode
|
||||
@@ -3,11 +3,9 @@ package hello;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
|
||||
//application to boot with spring
|
||||
@SpringBootApplication
|
||||
public class Application {
|
||||
|
||||
//run the application
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(Application.class, args);
|
||||
}
|
||||
|
||||
@@ -13,7 +13,6 @@ public class GreetingController {
|
||||
|
||||
@RequestMapping("/greeting")
|
||||
public Greeting greeting(@RequestParam(value="name", defaultValue="World") String name) {
|
||||
//increment the id every time the page is refreshed (a new user visits the page)
|
||||
return new Greeting(counter.incrementAndGet(),
|
||||
String.format(template, name));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user