mirror of
https://github.com/spring-projects/spring-petclinic.git
synced 2025-07-23 15:55:49 +00:00
merging latest build
This commit is contained in:
commit
ff60b6747a
6 changed files with 11 additions and 56 deletions
6
.gitignore
vendored
6
.gitignore
vendored
|
@ -8,9 +8,5 @@ target/*
|
||||||
*.iml
|
*.iml
|
||||||
/target
|
/target
|
||||||
.sts4-cache/
|
.sts4-cache/
|
||||||
.vscode/*
|
.vscode
|
||||||
!.vscode/settings.json
|
|
||||||
!.vscode/tasks.json
|
|
||||||
!.vscode/launch.json
|
|
||||||
!.vscode/extensions.json
|
|
||||||
_site/
|
_site/
|
||||||
|
|
|
@ -1,3 +1,9 @@
|
||||||
dist: trusty
|
dist: trusty
|
||||||
language: java
|
language: java
|
||||||
jdk: oraclejdk8
|
jdk: oraclejdk8
|
||||||
|
services:
|
||||||
|
- docker
|
||||||
|
before_script:
|
||||||
|
- docker login -u springbuildmaster -p "$DOCKERHUB_PASSWORD"
|
||||||
|
script:
|
||||||
|
- ./mvnw spring-boot:build-image -D spring-boot.build-image.imageName=springio/petclinic && [ "${TRAVIS_BRANCH}" = "main" ] && docker push springio/petclinic
|
||||||
|
|
26
.vscode/launch.json
vendored
26
.vscode/launch.json
vendored
|
@ -1,26 +0,0 @@
|
||||||
{
|
|
||||||
// Use IntelliSense to learn about possible attributes.
|
|
||||||
// Hover to view descriptions of existing attributes.
|
|
||||||
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
|
||||||
"version": "0.2.0",
|
|
||||||
"configurations": [
|
|
||||||
{
|
|
||||||
"type": "java",
|
|
||||||
"name": "Debug (Launch)-PetClinicApplication<spring-petclinic>",
|
|
||||||
"request": "launch",
|
|
||||||
"cwd": "${workspaceFolder}",
|
|
||||||
"console": "internalConsole",
|
|
||||||
"stopOnEntry": false,
|
|
||||||
"mainClass": "org.springframework.samples.petclinic.PetClinicApplication",
|
|
||||||
"projectName": "spring-petclinic",
|
|
||||||
"args": ""
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "java",
|
|
||||||
"name": "Debug (Attach)",
|
|
||||||
"request": "attach",
|
|
||||||
"hostName": "localhost",
|
|
||||||
"port": 0
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
3
.vscode/settings.json
vendored
3
.vscode/settings.json
vendored
|
@ -1,3 +0,0 @@
|
||||||
{
|
|
||||||
"java.configuration.updateBuildConfiguration": "interactive"
|
|
||||||
}
|
|
19
.vscode/tasks.json
vendored
19
.vscode/tasks.json
vendored
|
@ -1,19 +0,0 @@
|
||||||
{
|
|
||||||
// See https://go.microsoft.com/fwlink/?LinkId=733558
|
|
||||||
// for the documentation about the tasks.json format
|
|
||||||
"version": "2.0.0",
|
|
||||||
"tasks": [
|
|
||||||
{
|
|
||||||
"label": "verify",
|
|
||||||
"type": "shell",
|
|
||||||
"command": "mvn -B verify",
|
|
||||||
"group": "build"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "test",
|
|
||||||
"type": "shell",
|
|
||||||
"command": "mvn -B test",
|
|
||||||
"group": "test"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
7
pom.xml
7
pom.xml
|
@ -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.3.0.BUILD-SNAPSHOT</version>
|
<version>2.4.2</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.3.5.RELEASE</version>
|
<version>2.4.2</version>
|
||||||
</parent>
|
</parent>
|
||||||
<name>petclinic</name>
|
<name>petclinic</name>
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@
|
||||||
<webjars-bootstrap.version>3.3.6</webjars-bootstrap.version>
|
<webjars-bootstrap.version>3.3.6</webjars-bootstrap.version>
|
||||||
<webjars-jquery-ui.version>1.11.4</webjars-jquery-ui.version>
|
<webjars-jquery-ui.version>1.11.4</webjars-jquery-ui.version>
|
||||||
<webjars-jquery.version>2.2.4</webjars-jquery.version>
|
<webjars-jquery.version>2.2.4</webjars-jquery.version>
|
||||||
<wro4j.version>1.9.0</wro4j.version>
|
<wro4j.version>1.8.0</wro4j.version>
|
||||||
|
|
||||||
<jacoco.version>0.8.5</jacoco.version>
|
<jacoco.version>0.8.5</jacoco.version>
|
||||||
<nohttp-checkstyle.version>0.0.4.RELEASE</nohttp-checkstyle.version>
|
<nohttp-checkstyle.version>0.0.4.RELEASE</nohttp-checkstyle.version>
|
||||||
|
@ -257,6 +257,7 @@
|
||||||
<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties
|
<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties
|
||||||
</generateGitPropertiesFilename>
|
</generateGitPropertiesFilename>
|
||||||
<failOnNoGitDirectory>false</failOnNoGitDirectory>
|
<failOnNoGitDirectory>false</failOnNoGitDirectory>
|
||||||
|
<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue