Merge branch 'spring-projects:main' into test_improvement

This commit is contained in:
Elvys Soares 2021-05-11 09:49:51 -03:00
commit 93102aee8e
2 changed files with 17 additions and 3 deletions

View file

@ -4,6 +4,6 @@ jdk: oraclejdk8
services: services:
- docker - docker
before_script: before_script:
- docker login -u springbuildmaster -p "$DOCKERHUB_PASSWORD" - '[ "${TRAVIS_BRANCH}" = "main" ] && docker login -u springbuildmaster -p "$DOCKERHUB_PASSWORD"'
script: script:
- ./mvnw spring-boot:build-image -D spring-boot.build-image.imageName=springio/petclinic && [ "${TRAVIS_BRANCH}" = "main" ] && docker push springio/petclinic - ./mvnw spring-boot:build-image -D spring-boot.build-image.imageName=springio/petclinic && [ "${TRAVIS_BRANCH}" = "main" ] && docker push springio/petclinic

18
pom.xml
View file

@ -5,12 +5,12 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.samples</groupId> <groupId>org.springframework.samples</groupId>
<artifactId>spring-petclinic</artifactId> <artifactId>spring-petclinic</artifactId>
<version>2.4.2</version> <version>2.4.5</version>
<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>2.4.2</version> <version>2.4.5</version>
</parent> </parent>
<name>petclinic</name> <name>petclinic</name>
@ -241,6 +241,7 @@
<executions> <executions>
<execution> <execution>
<phase>generate-resources</phase> <phase>generate-resources</phase>
<?m2e execute onConfiguration,onIncremental?>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
</goals> </goals>
@ -360,6 +361,19 @@
<ignore/> <ignore/>
</action> </action>
</pluginExecution> </pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>io.spring.javaformat</groupId>
<artifactId>spring-javaformat-maven-plugin</artifactId>
<versionRange>[0,)</versionRange>
<goals>
<goal>validate</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore/>
</action>
</pluginExecution>
</pluginExecutions> </pluginExecutions>
</lifecycleMappingMetadata> </lifecycleMappingMetadata>
</configuration> </configuration>