Antoine Rey
|
89d0e24488
|
Merge branch 'master' into springboot
Conflicts:
pom.xml
readme.md
src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImpl.java
src/main/java/org/springframework/samples/petclinic/web/VetController.java
src/test/java/org/springframework/samples/petclinic/web/CrashControllerTests.java
src/test/java/org/springframework/samples/petclinic/web/OwnerControllerTests.java
src/test/java/org/springframework/samples/petclinic/web/PetControllerTests.java
src/test/java/org/springframework/samples/petclinic/web/VetControllerTests.java
src/test/java/org/springframework/samples/petclinic/web/VisitControllerTests.java
|
2016-08-19 18:57:51 +02:00 |
|
Antoine Rey
|
e5254156ec
|
Convert Controler's integration test to unit test
|
2016-08-19 18:54:56 +02:00 |
|
Antoine Rey
|
620141da5d
|
Convert Controler's integration test to unit test
|
2016-08-19 18:29:53 +02:00 |
|
Antoine Rey
|
1080006218
|
Merging AbstractClinicServiceTests and ClinicServiceSpringDataJpaTests then using the Spring Boot @DataJpaTest annotation
|
2016-08-19 18:29:17 +02:00 |
|
Antoine Rey
|
2637f65b90
|
Upgrade to Spring Boot 1.4.0
|
2016-08-17 18:31:38 +02:00 |
|
AndrejGajdos
|
dbd1e54492
|
responsive menu fix
responsive menu fix - data-target attribute added
|
2016-08-16 19:09:35 +02:00 |
|
Antoine Rey
|
0adaea9efa
|
Upgrade to Spring IO Platform to 2.0.7
|
2016-08-16 19:09:09 +02:00 |
|
Antoine Rey
|
84d5e8270d
|
Merge pull request #177 from AndrejGajdos/master
Responsive menu fix
|
2016-08-10 18:15:40 +02:00 |
|
Antoine Rey
|
ef4a808828
|
Fix #172 'mvn site' fails with cobertura-maven-plugin version 2.7
|
2016-08-10 18:08:34 +02:00 |
|
Antoine Rey
|
eac43666b3
|
Merge pull request #175 from meltsufin/master
Use build finalName instead of warName in pom.xml
|
2016-08-09 15:50:22 +02:00 |
|
AndrejGajdos
|
fa466855ef
|
responsive menu fix
responsive menu fix - data-target attribute added
|
2016-07-28 13:50:07 +02:00 |
|
Mike Eltsufin
|
ed0ab2af41
|
Use build finalName instead of warName in pom.xml
|
2016-07-22 11:31:12 -04:00 |
|
Jenkins Continuous Integration Server
|
de7c4d1e5c
|
[maven-release-plugin] prepare for next development iteration
|
2016-07-15 16:18:46 +00:00 |
|
Jenkins Continuous Integration Server
|
cfea96e092
|
[maven-release-plugin] prepare release spring-petclinic-1.0.2
|
2016-07-15 16:18:41 +00:00 |
|
Jenkins Continuous Integration Server
|
db7c34a339
|
[maven-release-plugin] prepare for next development iteration
|
2016-07-15 08:29:10 +00:00 |
|
Jenkins Continuous Integration Server
|
f9e0416f72
|
[maven-release-plugin] prepare release spring-petclinic-1.0.1
|
2016-07-15 08:29:05 +00:00 |
|
Justin Bankes
|
4ea091d903
|
Fixed merge conflict post maven release
|
2016-07-15 01:33:47 -07:00 |
|
Jenkins Continuous Integration Server
|
8e8b8cf519
|
[maven-release-plugin] prepare release spring-petclinic-1.0.0
|
2016-07-15 08:25:30 +00:00 |
|
Justin Bankes
|
286d4ec90f
|
Fixed merge conflict post maven release
|
2016-07-15 01:29:57 -07:00 |
|
Justin Bankes
|
e63e8da531
|
Fixed merge conflict post maven release
|
2016-07-15 01:26:59 -07:00 |
|
Justin Bankes
|
e4df4d21f3
|
Fixed merge conflict post maven release
|
2016-07-15 01:25:45 -07:00 |
|
Justin Bankes
|
69ab98a78c
|
Fixed merge conflict post maven release
|
2016-07-15 01:25:12 -07:00 |
|
Justin Bankes
|
4ab656f6c9
|
Fixed release destination
|
2016-07-15 01:22:21 -07:00 |
|
Jenkins Continuous Integration Server
|
01e0e14dae
|
[maven-release-plugin] prepare release spring-petclinic-1.0.0
|
2016-07-15 08:16:42 +00:00 |
|
Jenkins Continuous Integration Server
|
3457299241
|
[maven-release-plugin] prepare for next development iteration
|
2016-07-15 08:10:34 +00:00 |
|
Jenkins Continuous Integration Server
|
0ed703348d
|
[maven-release-plugin] prepare release spring-petclinic-1.0.0
|
2016-07-15 08:10:30 +00:00 |
|
Justin Bankes
|
46a05dd036
|
Added maven release plugin information to pom
|
2016-07-14 22:59:45 -07:00 |
|
Justin Bankes
|
fad8750b08
|
Fixed GAV for demo
|
2016-07-14 22:39:37 -07:00 |
|
Justin Bankes
|
b5882026ec
|
Reset POM version to 1.0.0-SNAPSHOT for MRP demo
|
2016-07-14 22:38:21 -07:00 |
|
Justin Bankes
|
e21e2b015e
|
Changed dependency again, needed a non snapshot version to get into the pom
|
2016-07-14 22:32:55 -07:00 |
|
Justin Bankes
|
0258c9c36a
|
Changed Dependency on Joda time to pass the push
|
2016-07-14 22:31:11 -07:00 |
|
Justin Bankes
|
9e9c59d91d
|
Changed pom to push to local box
|
2016-07-14 22:29:12 -07:00 |
|
Antoine Rey
|
eddc72cfa8
|
Upgrade Spring IO Platform to 2.0.6
|
2016-07-09 12:06:26 +02:00 |
|
Antoine Rey
|
d77f31c96e
|
Fix Jetty 9 startup
|
2016-07-06 19:00:32 +02:00 |
|
Antoine Rey
|
2f3e035c60
|
The maven-war-plugin does not failed on missing web.xml
|
2016-07-06 18:18:40 +02:00 |
|
Antoine Rey
|
1a6572d1ac
|
Replace web.xml by PetclinicInitializer
|
2016-07-06 18:04:23 +02:00 |
|
Antoine Rey
|
835f53da30
|
Remove spring-boot dependencies
|
2016-07-05 18:28:09 +02:00 |
|
Antoine Rey
|
515f8d99fd
|
Fix jQuery version
|
2016-06-30 20:02:53 +02:00 |
|
Antoine Rey
|
bbc1c8bb80
|
Add some missing trimDirectiveWhitespaces on JSPs
|
2016-06-30 19:07:54 +02:00 |
|
Antoine Rey
|
30fbe76c7d
|
A few fixes to the readme.md for Spring-Boot branch
Merge pull request #169 from aaguilera/springboot
|
2016-06-29 18:13:06 +02:00 |
|
Angel Aguilera
|
b3080ccb2b
|
Updated instructions to switch into springboot branch
|
2016-06-29 09:42:21 +02:00 |
|
Angel Aguilera
|
c39ed81904
|
Fixed typo
|
2016-06-29 09:39:56 +02:00 |
|
Antoine Rey
|
1e412c6020
|
Add some missing trimDirectiveWhitespaces on JSPs
|
2016-06-29 08:46:56 +02:00 |
|
Antoine Rey
|
616386803c
|
Revert "Make jar not war"
This reverts commit be048ae2ac .
|
2016-06-28 20:08:26 +02:00 |
|
Antoine Rey
|
be048ae2ac
|
Make jar not war
|
2016-06-28 20:01:32 +02:00 |
|
Antoine Rey
|
fd524d05d5
|
Centralized framework versions to the properties section
|
2016-06-28 19:52:59 +02:00 |
|
Antoine Rey
|
7b488c6846
|
Merge pull request #163 from ameya-pandilwar/fix-157
Fix #157 Upgrade Spring IO Platform to 2.0.5
|
2016-06-28 19:44:07 +02:00 |
|
Antoine Rey
|
6be7ec558e
|
Add the generated/ directory for easier switching between master and develop branches
|
2016-06-28 19:41:53 +02:00 |
|
Antoine Rey
|
078bdc6cfb
|
#149 JdbcPetRepositoryImpl:: findById() simplification
|
2016-06-28 18:47:51 +02:00 |
|
Antoine Rey
|
9a1298be2d
|
Merge pull request #168 from verydapeng/spring-projects/springboot
Migrate to webjars for frontend resource management
|
2016-06-28 18:17:51 +02:00 |
|