DevFW-CICD/spring-petclinic
16
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-17 21:15:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
506 commits 8 branches 1 tag 713 MiB
Commit graph

506 commits

This branch
This branch
All branches
Author SHA1 Message Date
Antoine Rey
7961e44714 Merge branch 'master' into javaconfig 
Conflicts:
	src/main/java/org/springframework/samples/petclinic/PetclinicInitializer.java
	src/main/resources/spring/data-access.properties
 2016-10-08 09:33:55 +02:00
Antoine Rey
377ef7e500 Fix #171 Jetty 9 support by removing Dandelion 2016-10-07 18:58:19 +02:00
Antoine Rey
d5571c0fe4 Upgrade to Spring IO Platform to 2.0.8 2016-09-25 18:37:40 +02:00
Dapeng
17b6636b50 Remove dependency with joda time to simplify the project dependencies 2016-09-23 19:52:09 +02:00
Antoine Rey
9e6a8caf31 Merge pull request #186 from bozzwin/master 
Make easier switch between MySQL and HSQLDB Fix #184
 2016-09-21 14:14:29 +02:00
Mariusz Borwin
fcf1415a89 Make easier switch between MySQL and HSQLDB #184 
Signed-off-by: Mariusz Borwin <mariusz.borwin@gmail.com>
 2016-09-20 13:35:07 +02:00
Antoine Rey
08bf0a5ae6 Remove @Cacheable in Repository layer (already managed at Service layer) 2016-09-14 18:19:50 +02:00
Antoine Rey
b45457993c Merge branch 'master' into javaconfig 
Conflicts:
	src/main/webapp/WEB-INF/web.xml
	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-22 18:31:24 +02:00
Antoine Rey
e5254156ec Convert Controler's integration test to unit test 2016-08-19 18:54:56 +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
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
3ad8040ed2 Merge branch 'master' into javaconfig 
Conflicts:
	.gitignore
	pom.xml
	readme.md
	src/main/resources/spring/business-config.xml
	src/main/resources/spring/data-access.properties
	src/main/resources/spring/datasource-config.xml
	src/main/resources/spring/mvc-core-config.xml
	src/main/resources/spring/mvc-view-config.xml
	src/main/resources/spring/tools-config.xml
 2016-07-01 18:55:36 +02:00
Antoine Rey
b159e910a4 Adding generated/ directory to .gitignore in order to switch more easily between the springboot branch and the javaconfig branch 2016-07-01 18:31:29 +02:00
Antoine Rey
1e412c6020 Add some missing trimDirectiveWhitespaces on JSPs 2016-06-29 08:46:56 +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
4c722465d8 Update vetsXml test using xpath 2016-06-28 08:11:40 +02:00
Antoine Rey
647985cdaf Add a reference to the Spring Boot branch 2016-06-27 17:57:03 +02:00
Dapeng
a2849f75f2 Simplify jsp layout management 
abstract the page layout into “layout.tag”
 2016-06-27 17:32:09 +02:00
Antoine Rey
50f46fdd0e Remove outdated HTML files 2016-06-24 21:22:15 +02:00
Ameya Pandilwar
be7acc5052 Upgrade Spring IO Platform to 2.0.5 2016-06-19 02:23:53 -04:00
Antoine Rey
76a4ca330b Merge pull request #159 from attil-io/visit-repository-fix 
Fix #158 Improvements in VisitRepository.findByPetId implementation.
 2016-06-16 18:59:29 +02:00
Attilio
ca755be44a Improvements in VisitRepository.findByPetId implementation. 
- In the Jdbc implementation: pets belonging to a visit were not added.
- In the Jpa implementation: query variable was wrong.
- Test case: AbstractClinicServiceTests.shouldFindVisitsByPetId()
 2016-06-15 22:46:47 +02:00
Antoine Rey
817fabd9ea Fix #155 Fix logback + JMX memory leak on web application reload 2016-06-06 18:37:44 +02:00
Antoine Rey
ed540a3d07 Fix #156 jdbcTemplate bean naming 2016-06-02 18:55:53 +02:00
Antoine Rey
05f7cf4e3f Merge pull request #152 from DevFactory/release/general-code-quality-fix-1 
General code quality fix-1
 2016-05-13 19:49:46 +02:00
Faisal Hameed
ad3d322fc6 Fising squid:S2970, squid:S1192, squid:S1488, squid:UselessParenthesesCheck 2016-05-13 14:59:46 +05:00
Antoine Rey
44b591f537 Using Spring Boot Dataflow UI graphic theme 2016-04-08 18:23:18 +02:00
Antoine Rey
e74b1bc160 #141 Configure Unicode and UTF-8 MySQL database for Chinese language 2016-04-05 22:05:41 +02:00
Antoine Rey
b68d7fc4f3 Merge pull request #146 from trepel/mvnwrunreadmefix 
Fix of how to run Petclinic in readme
 2016-04-05 09:52:09 +02:00
Antoine Rey
fa8bb74320 Merge pull request #145 from liouxiao/fix-for-issue-144 
Fix #144 Redundant 'less than' symbol in exception.jsp
 2016-04-05 09:51:32 +02:00
Tomas Repel
597d29c85d Fix of how to run Petclinic in readme 2016-04-05 09:01:37 +02:00
XIAO XI LIU
e6ca8a37a5 fix issue #144: remove redundant less-than sign 2016-04-05 07:04:33 +08:00
XIAO XI LIU
ea8ab0735e Merge branch 'bootstrap-3' of https://github.com/liouxiao/spring-petclinic into bootstrap-3 2016-04-05 06:33:11 +08:00
Antoine Rey
9a150fcc45 Merge pull request #131 from ameya-pandilwar/update-link-title 
Update link navigation title to make it consistent
 2016-04-04 08:36:55 +02:00
Antoine Rey
7dcf82af94 Fix #78 Migrate to Bootstrap 3.x 2016-04-04 08:13:51 +02:00
Antoine Rey
482eeb1c21 Revert "Jetty 9.3 support" 
This reverts commit 4b1f7a7a58.
 2016-03-13 10:14:05 +01:00
Antoine Rey
4b1f7a7a58 Jetty 9.3 support 2016-03-13 10:10:30 +01:00
Antoine Rey
203d20efcc Upgrade to Spring IO Platform 2.0.3 2016-03-09 08:40:57 +01:00
Antoine Rey
78a2532b33 Merge pull request #136 from lukasz-szewc/staticFiles-jquery-url-fix 
Fixes #135 Fixed url for jquery-ui.
 2016-03-08 18:23:41 +01:00