Commit Graph

5792 Commits

Author SHA1 Message Date
Sampada 05b20f4c20 Merge branch 'master' into JAVA-3524 2020-12-31 12:18:57 +05:30
Eric Martin 187aa4031b Merge pull request #10334 from sk1418/BAEL-4735_springboot_repackage
mvn package vs springboot:repackage
2020-12-30 19:19:52 -06:00
mikr 08435be190 JAVA-3536 Move spring-rest-shell module 2020-12-30 22:57:22 +01:00
mikr 8f84398082 JAVA-3531 Move spring-mvc-xml module (correct package for test) 2020-12-30 22:37:42 +01:00
mikr de5f9940dd JAVA-3531 Move spring-mvc-xml module 2020-12-30 22:26:14 +01:00
Maiklins 24ef4eaa19 Merge pull request #79 from eugenp/master
update
2020-12-30 22:15:44 +01:00
mikr ad461edca2 JAVA-2824 Fix tests in Java 9 and above modules 2020-12-30 21:46:25 +01:00
Loredana Crusoveanu 6630c81406 Merge branch 'master' into JAVA-3533 2020-12-30 15:48:46 +02:00
Loredana Crusoveanu 3f29e25765 Merge pull request #10364 from Maiklins/JAVA-3529-move-spring-mvc-views
Java 3529 move spring mvc views
2020-12-30 15:44:57 +02:00
Sampada 22446e6df0 Merge branch 'master' into JAVA-3524 2020-12-30 19:10:19 +05:30
mikr c2a10624ec Merge branch 'master' of https://github.com/Maiklins/tutorials into JAVA-3528-move-spring-mvc-velocity-module
 Conflicts:
	spring-web-modules/pom.xml
2020-12-30 12:41:29 +01:00
Maiklins 918057ed1b Merge pull request #78 from eugenp/master
update
2020-12-30 12:40:12 +01:00
kwoyke 078169109d BAEL-4755: Add Files.list example (#10356) 2020-12-30 12:39:45 +01:00
mikr 6a0313b4db JAVA-3528 Move spring-mvc-velocity module 2020-12-30 12:34:37 +01:00
mikr c99f74a6a1 JAVA-3535 Move spring rest query language module 2020-12-30 12:14:14 +01:00
Loredana Crusoveanu f6d43be948 Merge branch 'master' into JAVA-3529-move-spring-mvc-views 2020-12-30 13:04:07 +02:00
Loredana Crusoveanu fc7470b82a Merge pull request #10365 from Maiklins/JAVA-3530-move-spring-mvc-webflow
Java 3530 move spring mvc webflow
2020-12-30 13:00:04 +02:00
Maiklins eb6bd4ed18 Merge pull request #77 from eugenp/master
update
2020-12-30 11:59:48 +01:00
Loredana Crusoveanu bd22cd94f2 Merge pull request #10194 from Maiklins/Java-2824-Fix-Tests-in-Java-9-and-above-modules
Java-2824 fix tests in java 9 and above modules
2020-12-30 12:13:19 +02:00
Loredana Crusoveanu 0d3a3aeee6 Merge pull request #10354 from eugenp/lor6-patch-1-1
Update README.md
2020-12-30 12:02:26 +02:00
Loredana Crusoveanu 98ceb510fb Merge pull request #10353 from eugenp/lor6-patch-1
Update README.md
2020-12-30 12:02:04 +02:00
Loredana Crusoveanu a61e004aa1 Merge pull request #10367 from vatsalgosar/BAEL-4301
BAEL-4301
2020-12-30 11:58:51 +02:00
Loredana Crusoveanu 4801636b3b Merge pull request #10332 from eugenp/JAVA-3570
JAVA-3570: Upgrade parent-boot-2 to Spring Boot 2.4.0
2020-12-30 11:40:44 +02:00
Loredana Crusoveanu 48b2da7f16 Merge branch 'master' into JAVA-3530-move-spring-mvc-webflow 2020-12-30 11:35:44 +02:00
Loredana Crusoveanu 0f0ea84c0f Merge pull request #10363 from Maiklins/JAVA-3523-move-spring-rest-angular
Java-3523 move spring rest angular
2020-12-30 11:32:56 +02:00
Loredana Crusoveanu 5e988767d1 Merge pull request #10360 from Maiklins/JAVA-3539-move-spring-resttemplate-2
Java-3539 move spring resttemplate 2
2020-12-30 11:20:35 +02:00
Loredana Crusoveanu 5a5b4fabe4 Merge pull request #10368 from johnA1331/master
BAEL-31911 - add links to github-baeldung articles
2020-12-30 11:16:50 +02:00
johnA1331 9b808b2fde Update README.md 2020-12-30 16:34:08 +08:00
unknown 1cc511ae5e BAEL-4301
- Updated assertTrue to assertEqual
- Added examples
2020-12-30 13:32:07 +05:30
bfontana 91ade08d71 Merge pull request #10359 from adrian-maghear/BAEL-4015#fix-integration-tests
[BAEL-4015] fix integration tests
2020-12-29 21:16:20 -03:00
kwoyke 06d134769b Merge pull request #10358 from kwoyke/JAVA-3570
Merge remote-tracking branch 'upstream/master' into JAVA-3570
2020-12-29 23:46:05 +01:00
kwoyke 39390a1cb4 Merge pull request #10336 from kwoyke/JAVA-3496-2
JAVA-3496: Add integration tests for UserRepository
2020-12-29 23:40:38 +01:00
mikr 55d3676812 JAVA-3530 Move spring-mvc-webflow module 2020-12-29 22:56:18 +01:00
mikr e0ad1261c0 JAVA-3529 Move spring-mvc-views module 2020-12-29 22:31:40 +01:00
bfontana 5aec1d4055 Merge pull request #10301 from saleco/master
BAEL-4071 - Get advised method info in Spring AOP
2020-12-29 17:16:41 -03:00
mikr 1c07f40727 JAVA-3523 Move spring-rest-angular module 2020-12-29 20:31:13 +01:00
Sampada 594e7b0f81 Merge branch 'master' into JAVA-3524 2020-12-29 23:52:29 +05:30
sampadawagde 4eec2e35a2 Removed modules from main pom 2020-12-29 23:46:47 +05:30
sampadawagde 824fd5496f Added module to new parent's pom 2020-12-29 23:46:11 +05:30
sampadawagde 81b21f361c JAVA-3525: Moved spring-mvc-java-2 inside spring-web-modules 2020-12-29 23:44:51 +05:30
sampadawagde 11dae9ea5a JAVA-3526: Moved spring-mvc-java inside spring-web-modules 2020-12-29 23:44:00 +05:30
mikr 469e5c5c86 JAVA-3539 Move spring-resttemplate-2 module 2020-12-29 18:52:31 +01:00
Maiklins 391efe067c Merge pull request #76 from eugenp/master
update
2020-12-29 18:15:32 +01:00
Adrian Maghear 1a63c83f55 [BAEL-4015] fix integration tests 2020-12-29 16:42:52 +01:00
Krzysztof Woyke 962e8839d6 Merge remote-tracking branch 'upstream/master' into JAVA-3570 2020-12-29 15:11:31 +01:00
Krzysztof Woyke d84de4ccdf JAVA-3533: Move spring-rest-http-2 into spring-web-modules 2020-12-29 14:43:19 +01:00
Loredana Crusoveanu f5ef0bb500 Merge pull request #10355 from kwoyke/JAVA-3534
JAVA-3534: Move spring-rest-http into spring-web-modules
2020-12-29 14:46:38 +02:00
Krzysztof Woyke ee174737ab JAVA-3534: Move spring-rest-http into spring-web-modules 2020-12-29 12:15:04 +01:00
Loredana Crusoveanu 58e1b70793 Merge pull request #10350 from kwoyke/JAVA-3545-2
JAVA-3545: Move spring-thymeleaf-3 into spring-web-modules
2020-12-29 12:14:48 +02:00
Loredana Crusoveanu 3329202a44 Update README.md 2020-12-29 12:13:03 +02:00