Commit Graph

2756 Commits

Author SHA1 Message Date
Alex Theedom 95e81d9aed Merge remote-tracking branch 'origin/master' 2016-08-09 23:59:32 +01:00
Alex Theedom fa68a02d60 Minor changes after review 2016-08-09 23:58:55 +01:00
Zeger Hendrikse 51ab817796 Merge pull request #591 from bdragan/master
Upgrade to Hibernate 5.2.2.Final
2016-08-10 00:35:53 +02:00
bdragan 60a097624d Fixed a merge error. 2016-08-09 22:01:43 +02:00
bdragan ab1a928b1c Merge remote-tracking branch 'origin/master'
Conflicts:
	spring-jpa/pom.xml
	spring-jpa/src/test/java/META-INF/persistence.xml
2016-08-09 21:51:52 +02:00
bdragan 2d61ab0615 Upgraded Hibernate to 5.2.2.Final version. 2016-08-09 21:49:36 +02:00
Sergey Petunin f2f2b48782 Optimized the TreeNode constructor (#590) 2016-08-09 14:56:35 +02:00
Sunil Gulabani 709da6bcd2 Updated the test names and added Annotation Based Web Config. 2016-08-09 10:14:59 +05:30
tomjoebob f73bee24e1 Merge pull request #581 from ivanp81/master
Add JSONForms example
2016-08-08 22:13:14 -06:00
tomjoebob 5975a654fd Merge pull request #584 from chernykhalexander/master
Added Spring vs AspectJ module
2016-08-08 22:08:50 -06:00
eugenp 28dba6e094 Merge branch 'master' of https://github.com/eugenp/tutorials 2016-08-08 22:58:35 +03:00
eugenp ce0fb89076 2 new simple conversion tests 2016-08-08 22:58:26 +03:00
Alex Theedom 1e6efa68dd Add pagination module to parent POM 2016-08-08 20:58:00 +01:00
Alex Theedom d273566d4a Move project up one level 2016-08-08 20:57:23 +01:00
Alex Theedom 8251c25b6a Merge remote-tracking branch 'origin/master' 2016-08-08 20:42:59 +01:00
Alex Theedom 6e08121f61 Add a few more tests 2016-08-08 20:42:44 +01:00
Sergey Petunin 2327379d91 Added Guava thread pool examples (#589) 2016-08-08 18:22:01 +02:00
Sergey Petunin 1121a6ca29 Core threadpool implementation examples (#588) 2016-08-08 16:13:44 +02:00
Zeger Hendrikse 009e0045e2 Replaced tab with spaces 2016-08-08 13:49:03 +02:00
bdragan 8a03456386 Hibernate second-level cache. 2016-08-08 13:49:03 +02:00
Alex Theedom 440e247176 Merge pull request #586 from sivabalachandran/master
Hystrix Spring integration article 2
2016-08-08 07:49:53 +01:00
Kevin Gilmore 1c742b5f44 Merge remote-tracking branch 'upstream/master' 2016-08-07 21:43:52 -05:00
Kevin Gilmore f8e67f8dd5 BAEL-202: Asynchronous Operations in Couchbase 2016-08-07 21:43:06 -05:00
sbalachandran 640166999a fixed failing unit tests 2016-08-07 22:24:14 -04:00
sbalachandran bc38da4f43 added missing new files 2016-08-07 22:11:59 -04:00
sbalachandran 3c31664ea0 Updated with Hystrix integration to spring app 2016-08-07 22:06:57 -04:00
Christian Raedel fba9f8f81a Fixed indentation and removed empty lines. 2016-08-08 03:02:47 +02:00
Christian Rädel 98afa9f58a Merge remote-tracking branch 'upstream/master' 2016-08-08 02:01:17 +02:00
Christian Rädel 91a1804971 Merge remote-tracking branch 'upstream/master' into craedel-spring-security-x509 2016-08-08 01:59:08 +02:00
Christian Rädel 3c76943627 Added second version to authenticate with client certificates. 2016-08-08 01:55:42 +02:00
eugenp 2b7f03e881 adding back the missing code 2016-08-08 00:02:59 +03:00
slavisa-baeldung 5b06a350ad Merge remote-tracking branch 'origin/pr/583' into pr/582-tayo-jsf-3 2016-08-07 08:19:38 +02:00
chernykhalexander bd3580585b added cdi vs spring aspectj module 2016-08-06 23:03:58 +03:00
chernykhalexander ffa78dc175 remove old module 2016-08-06 22:59:54 +03:00
Alex Theedom 2d2cefa4bf Minor changes following review 2016-08-06 18:05:30 +01:00
Alex Theedom 1991864264 Merge remote-tracking branch 'origin/master' 2016-08-06 18:01:46 +01:00
Alex Theedom a06ce1fd81 Minor changes following review 2016-08-06 18:01:26 +01:00
k0l0ssus e97cd1122f Update el3_intro.xhtml 2016-08-06 00:45:22 -04:00
k0l0ssus 34e7557513 Backing bean code in support of EL 3.0 2016-08-06 00:43:06 -04:00
k0l0ssus 414735b8c3 EL 3.0 Page 2016-08-06 00:30:19 -04:00
tomjoebob 3c8f4081ed Merge pull request #580 from skoiloth/master
Removed unused coed
2016-08-05 11:57:45 -06:00
SHYAM RAMATH 8a1ac89ee8 Removed unused coed 2016-08-05 06:52:47 -05:00
Slavisa Baeldung 2225509d83 BAEL-227 - Renaming test to follow BDD convention 2016-08-05 12:17:09 +02:00
Slavisa Baeldung 4e1a0d478d Merge remote-tracking branch 'origin/master' 2016-08-05 11:57:02 +02:00
slavisa-baeldung e874e82848 Merge pull request #579 from GuenHamza/master
Add JaCoCo plugin declaration to pom.xml
2016-08-05 11:56:48 +02:00
Slavisa Baeldung fb5949f16e BAEL-90 - Renaming live tests, configuring surefire 2016-08-05 11:55:51 +02:00
GuenHamza 709bb7081d Add JaCoCo plugin declaration to pom.xml 2016-08-05 10:43:56 +01:00
tomjoebob 6aef1b0104 Merge pull request #575 from skoiloth/master
Autowiring the RestTemplate
2016-08-05 00:02:29 -06:00
ivan cc9370e8ff Add JSONForms example 2016-08-05 02:41:23 +02:00
ivan 4f1c0651c6 Add JsonForms example 2016-08-05 02:10:48 +02:00