Commit Graph

99 Commits

Author SHA1 Message Date
Loredana Crusoveanu 94c6ee972b Merge pull request #10361 from sampada07/JAVA-3524
JAVA-3524, JAVA-3525, JAVA-3526
2021-01-01 23:04:42 +02:00
Loredana Crusoveanu 296fe08dde Merge branch 'master' into JAVA-3533 2021-01-01 22:55:21 +02:00
Loredana Crusoveanu aec6ef01e4 Merge pull request #10372 from Maiklins/JAVA-3531-move-spring-mvc-xml
Java 3531 move spring mvc xml
2021-01-01 22:47:34 +02:00
Loredana Crusoveanu 8bf42fafc7 Merge pull request #10369 from Maiklins/JAVA-3535-move-spring-rest-query-language
Java 3535 move spring rest query language
2021-01-01 22:41:02 +02:00
Sampada 05b20f4c20 Merge branch 'master' into JAVA-3524 2020-12-31 12:18:57 +05:30
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
Loredana Crusoveanu 6630c81406 Merge branch 'master' into JAVA-3533 2020-12-30 15:48:46 +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
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
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
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
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 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
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
Krzysztof Woyke ee174737ab JAVA-3534: Move spring-rest-http into spring-web-modules 2020-12-29 12:15:04 +01:00
sampadawagde bcfbe6102c JAVA-3524: Added module to new parent's pom 2020-12-29 11:37:05 +05:30
sampadawagde 05c7fa9269 JAVA-3524: Moved spring-mvc-forms-thymeleaf inside spring-web-modules 2020-12-29 11:36:14 +05:30
Krzysiek 559fb4eb7f JAVA-3545: Move spring-thymeleaf-3 into spring-web-modules 2020-12-28 22:42:11 +01:00
Krzysztof Woyke eb8724a0d7 JAVA-3544: Move spring-thymeleaf-2 into spring-web-modules 2020-12-28 12:10:31 +01:00
Loredana Crusoveanu 5f59cf3c8f Merge branch 'master' into JAVA-3543 2020-12-27 18:01:27 +02:00
Krzysiek 8fc0ea77cc JAVA-3543: Move spring-thymeleaf into spring-web-modules 2020-12-27 12:59:42 +01:00
sampadawagde 950ec2f8df JAVA-3522: Added modules to new parent's pom 2020-12-27 12:18:06 +05:30
sampadawagde 50b03440ea JAVA-3522: Moved spring-mvc-forms-jsp to spring-web-modules 2020-12-27 12:17:36 +05:30
sampadawagde fa02e7b104 JAVA-3522: Moved spring-mvc-crash inside spring-web-modules 2020-12-27 12:16:48 +05:30
sampadawagde 6af74b63f1 JAVA-3521: added module to new parent's pom 2020-12-24 19:59:41 +05:30
sampadawagde 405bb17b46 JAVA-3521: Moved spring-mvc-basics-4 inside spring-web-modules 2020-12-24 19:58:59 +05:30
sampadawagde e0db0ca9f8 JAVA-3520: added module to new parent's pom 2020-12-23 18:51:57 +05:30
sampadawagde 500b2f63f8 JAVA-3520: Moved spring-mvc-basics-3 inside spring-web-modules 2020-12-23 18:51:25 +05:30
sampadawagde f54863d501 JAVA-3519: Added module to new parent's pom 2020-12-22 16:25:19 +05:30
sampadawagde 8bf0f8a0a3 JAVA-3519: Moved spring-mvc-basics-2 inside spring-web-modules 2020-12-22 16:24:43 +05:30
Krzysztof Woyke 515d213c90 Merge remote-tracking branch 'upstream/master' into JAVA-3570 2020-12-22 10:50:48 +01:00
sampadawagde c531b9851d JAVA-3509: Updated README to change link from http to https 2020-12-21 19:56:23 +05:30
sampadawagde faa64a1f75 JAVA-3509: Added module to new parent's pom 2020-12-21 19:53:49 +05:30
sampadawagde dcd9eaf33a JAVA-3509: Moved spring-mvc-basics inside spring-web-modules 2020-12-21 19:52:50 +05:30
sampadawagde df7af0d0ec JAVA-3508: Create spring-web-modules parent 2020-12-20 23:02:10 +05:30