mirror of
https://github.com/spring-projects/spring-petclinic.git
synced 2025-07-23 15:55:49 +00:00
Merge branch 'travis' into develop
This commit is contained in:
commit
aa068be971
3 changed files with 10 additions and 39 deletions
13
.travis.yml
13
.travis.yml
|
@ -2,8 +2,13 @@ dist: trusty
|
||||||
language: java
|
language: java
|
||||||
jdk: oraclejdk8
|
jdk: oraclejdk8
|
||||||
services:
|
services:
|
||||||
- docker
|
- mysql
|
||||||
before_script:
|
install:
|
||||||
- docker login -u springbuildmaster -p "$DOCKERHUB_PASSWORD"
|
- ./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
|
||||||
|
before_install:
|
||||||
|
- chmod +x mvnw
|
||||||
|
- mysql -e 'CREATE DATABASE cheapy;'
|
||||||
|
- sudo apt-get update
|
||||||
script:
|
script:
|
||||||
- ./mvnw spring-boot:build-image -D spring-boot.build-image.imageName=springio/petclinic && [ "${TRAVIS_BRANCH}" = "main" ] && docker push springio/petclinic
|
- mvn test -Dspring.profiles.active=mysql-travis
|
||||||
|
|
||||||
|
|
34
pom.xml
34
pom.xml
|
@ -135,40 +135,6 @@
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-checkstyle-plugin</artifactId>
|
|
||||||
<version>3.1.1</version>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.puppycrawl.tools</groupId>
|
|
||||||
<artifactId>checkstyle</artifactId>
|
|
||||||
<version>8.32</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.spring.nohttp</groupId>
|
|
||||||
<artifactId>nohttp-checkstyle</artifactId>
|
|
||||||
<version>${nohttp-checkstyle.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>nohttp-checkstyle-validation</id>
|
|
||||||
<phase>validate</phase>
|
|
||||||
<configuration>
|
|
||||||
<configLocation>src/checkstyle/nohttp-checkstyle.xml</configLocation>
|
|
||||||
<suppressionsLocation>src/checkstyle/nohttp-checkstyle-suppressions.xml</suppressionsLocation>
|
|
||||||
<encoding>UTF-8</encoding>
|
|
||||||
<sourceDirectories>${basedir}</sourceDirectories>
|
|
||||||
<includes>**/*</includes>
|
|
||||||
<excludes>**/.git/**/*,**/.idea/**/*,**/target/**/,**/.flattened-pom.xml,**/*.class</excludes>
|
|
||||||
</configuration>
|
|
||||||
<goals>
|
|
||||||
<goal>check</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
|
|
|
@ -7,4 +7,4 @@ INSERT IGNORE INTO owners VALUES (6, 'Jean', 'Coleman', '105 N. Lake St.', 'Mono
|
||||||
INSERT IGNORE INTO owners VALUES (7, 'Jeff', 'Black', '1450 Oak Blvd.', 'Monona', '6085555387');
|
INSERT IGNORE INTO owners VALUES (7, 'Jeff', 'Black', '1450 Oak Blvd.', 'Monona', '6085555387');
|
||||||
INSERT IGNORE INTO owners VALUES (8, 'Maria', 'Escobito', '345 Maple St.', 'Madison', '6085557683');
|
INSERT IGNORE INTO owners VALUES (8, 'Maria', 'Escobito', '345 Maple St.', 'Madison', '6085557683');
|
||||||
INSERT IGNORE INTO owners VALUES (9, 'David', 'Schroeder', '2749 Blackhawk Trail', 'Madison', '6085559435');
|
INSERT IGNORE INTO owners VALUES (9, 'David', 'Schroeder', '2749 Blackhawk Trail', 'Madison', '6085559435');
|
||||||
INSERT IGNORE INTO owners VALUES (10, 'Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', '6085555487');
|
INSERT IGNORE INTO owners VALUES (10, 'Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', '6085555487');
|
||||||
|
|
Loading…
Reference in a new issue