2637 Commits

Author SHA1 Message Date
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
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
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
eugenp
2b7f03e881 adding back the missing code 2016-08-08 00:02:59 +03: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
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
Alex Theedom
14d33019b7 Merge pull request #573 from egimaben/master
added project for orika tutorial
2016-08-04 21:42:29 +01:00
eugenp
cada4a4027 minor cleanup 2016-08-04 19:58:51 +03:00
slavisa-baeldung
ca74e60de8 BAEL-90 - ignoring test on a first commit 2016-08-04 07:32:33 +02:00
slavisa-baeldung
8fb67db7dd Merge branch 'pr/568-christian-spring-cloud-conf' 2016-08-04 06:54:19 +02:00
slavisa-baeldung
09465965b7 BAEL-90 - versioned config 2016-08-04 06:53:42 +02:00
slavisa-baeldung
4b5f4d7c20 BAEL-90 - versioned config 2016-08-04 06:40:17 +02:00
slavisa-baeldung
2040fda6d2 BAEL-90 - versioned config 2016-08-04 06:31:44 +02:00
Zeger Hendrikse
12fe9a69c4 Merge branch 'juliuskrah-master' 2016-08-04 00:47:51 +02:00
Zeger Hendrikse
b28e3e1389 Minor code clean-ups. 2016-08-04 00:47:10 +02:00
Zeger Hendrikse
5338f8b190 Merge branch 'master' of https://github.com/juliuskrah/tutorials into juliuskrah-master 2016-08-03 23:50:23 +02:00
SHYAM RAMATH
28a96436e5 Autowiring the RestTemplate 2016-08-03 16:20:49 -05:00
egimaben
419f28732b added project for orika tutorial 2016-08-02 23:57:57 +03:00
Alex Theedom
5a305a25ae Minor changes following review 2016-08-02 19:37:55 +01:00