diff --git a/foo.txt b/foo.txt new file mode 100644 index 000000000..6aae500bb --- /dev/null +++ b/foo.txt @@ -0,0 +1 @@ +asdkfjk diff --git a/joespipeline b/joespipeline new file mode 100644 index 000000000..5ef199d6c --- /dev/null +++ b/joespipeline @@ -0,0 +1,15 @@ +echo 'Hello from Pipeline Demo' + stage 'Compile' + node { + git url: 'https://github.com/nachofree/spring-petclinic.git' + sh "/usr/bin/mvn -B compile war:war" + } + stage 'Test' + node{ + git url: 'https://github.com/nachofree/spring-petclinic.git' + sh "/usr/bin/mvn -B verify" + + step([$class: 'ArtifactArchiver', artifacts: '**/target/*.war', fingerprint: true]) + step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*.xml']) + } + diff --git a/pom.xml b/pom.xml index f64e6d122..6409f3f28 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.samples spring-petclinic 1.5.1 - + war org.springframework.boot spring-boot-starter-parent @@ -50,6 +50,11 @@ org.springframework.boot spring-boot-starter-web + + org.apache.tomcat.embed + tomcat-embed-el + provided + org.springframework.boot spring-boot-starter-thymeleaf @@ -65,6 +70,11 @@ spring-boot-starter-test test + + org.springframework.boot + spring-boot-starter-tomcat + provided + @@ -140,6 +150,21 @@ + + + org.apache.tomcat.maven + tomcat7-maven-plugin + 2.2 + + tomcat-development-server + http://144.38.196.18:8080/manager/text + target\spring-petclinic-1.5.1.war + /petclinic + joe + 1francom$ + + + org.codehaus.mojo cobertura-maven-plugin diff --git a/readme.md b/readme.md index ac30d6392..41b2ca206 100644 --- a/readme.md +++ b/readme.md @@ -100,6 +100,6 @@ The [issue tracker](https://github.com/spring-projects/spring-petclinic/issues) For pull requests, editor preferences are available in the [editor config](.editorconfig) for easy use in common text editors. Read more and download plugins at . - +# foo diff --git a/sonar-project.properties b/sonar-project.properties index d84ed7c2d..ffe4dc3b2 100755 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -5,9 +5,10 @@ sonar.projectVersion=1.0 # Comma-separated paths to directories with sources (required) sonar.sources=src +sonar.java.binaries=src # Language sonar.language=java # Encoding of the source files -sonar.sourceEncoding=UTF-8 \ No newline at end of file +sonar.sourceEncoding=UTF-8 diff --git a/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java b/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java index 224c326c7..daf77bc28 100644 --- a/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java +++ b/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java @@ -18,6 +18,8 @@ package org.springframework.samples.petclinic; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.support.SpringBootServletInitializer; /** * PetClinic Spring Boot Application. @@ -26,7 +28,11 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * */ @SpringBootApplication -public class PetClinicApplication { +public class PetClinicApplication extends SpringBootServletInitializer { + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(PetClinicApplication.class); + } public static void main(String[] args) throws Exception { SpringApplication.run(PetClinicApplication.class, args);