Commit Graph

283 Commits

Author SHA1 Message Date
exaucae 7adea75450 feat(wip): add function call examples 2022-06-17 16:55:28 +00:00
exaucae cd033c2109 fix: upgrade to cargo-maven3
Application couldn't start with previous setup. Plus, maven3 is the preferred way of using cargo now.
See https://codehaus-cargo.github.io/cargo/Maven+3+Plugin.html

Relevant section: Reg. Lifetime of our Maven 2 plugin
" Please be aware that the Maven 2 / Maven 3 plugin of Codehaus Cargo has been retired with our version 1.9.0 and has been superseded by a Maven 3 only plugin. "
2022-06-17 15:14:02 +00:00
Asjad J a8f1e1787d Updated README.md
added link back to the article: https://www.baeldung.com/spring-requestmapping-properties-file
2022-06-02 11:18:09 +05:00
Pablo Aragonés López f57604bef0 Request Mapping value in properties file (#12226)
* Exception Handler implemented for Spring Security Resource Server

* Renamed test class name to solve PMD Failure

* Code formatting

* Using property parameter as Request Mapping value

* Renamed test class name to solve PMD Failure
2022-05-17 12:02:03 -07:00
freelansam 557dba376b JAVA-11765: Dissolve spring-boot-rest-2 and distribute its articles (#12195)
* JAVA-11765: Dissolve spring-boot-rest-2 and distribute its articles
spring-boot-modules

* JAVA-11765: removed module from main pom
2022-05-13 16:14:49 +05:30
sampadawagde aed8f9100b JAVA-11792: Fix formatting of POMs 2022-05-08 16:36:25 +05:30
anuragkumawat f89cbffe9d Fix for pact test and use Junit5 insead of Hamcrest library 2022-03-29 21:04:18 +05:30
anuragkumawat c2e38da0fb JAVA-9809 Update tests in spring-resttemplate module 2022-03-29 20:36:29 +05:30
anuragkumawat 1377f718eb JAVA-10922 Fix RestTemplateBasicLiveTest in spring-resttemplate module 2022-03-27 10:55:35 +05:30
Dhawal Kapil 7b880dd135 JAVA-10377 Removed @RunWith as there is no specific configuration class needed to run this test 2022-03-23 08:39:37 +05:30
Dhawal Kapil ec6ff84766 JAVA-10377 Moved code for spring-response-header article to spring-rest-http 2022-03-23 08:33:59 +05:30
ACHRAF TAITAI c6e2b905f5 BAEL-5413: populate a drop down with a list (#11947) 2022-03-20 08:45:32 +01:00
sampadawagde b8176a265a JAVA-10138 - Fix formatting of POMs 2022-03-13 14:48:44 +05:30
Greg Martin b91ca46c23 Merge pull request #11813 from achraftt/BAEL-5039
BAEL-5039: Add a new section on using a datepicker to submit date values
2022-02-27 10:20:24 -05:00
sampadawagde 9d19160043 JAVA-9824: Identify boot modules not using parent-boot-2 as parent and
upgrade log4j for them
2022-02-22 21:53:39 +05:30
achraftt adca84eca2 BAEL-5039: edit identation 2022-02-16 14:22:45 +01:00
Haroon Khan e5f1f8a3b6 [JAVA-9910] Update Cargo plugin to latest version 2022-02-14 21:18:51 +00:00
achraftt a4639b70e8 BAEL-5039: Add a new section on using a datepicker to submit date values 2022-02-13 12:17:53 +01:00
Haroon Khan 01ca4575ba [JAVA-9604] Refactor and code clean-up for Metrics article 2022-01-31 12:45:28 +00:00
Haroon Khan b7259db652 [JAVA-9385] Fix code to use List for matrix vars 2022-01-20 17:08:39 +00:00
johnA1331 54c298939d Update README.md 2022-01-20 17:46:45 +08:00
Krzysiek 5242966787 JAVA-9486: Use guava.version defined in the parent pom 2022-01-18 09:42:21 +01:00
Haroon Khan 06ba4f7852 [JAVA-9450] Fix Timeout integration tests 2022-01-15 20:59:55 +00:00
kwoyke 4000ebcf65 Merge pull request #11659 from chaos2418/JAVA-8981
JAVA:8981: verify spring.mvc.pathmatch.matching-strategy property usage
2022-01-13 11:01:21 +01:00
kwoyke 4eb04dc0bc Merge pull request #11670 from freelansam/JAVA-9022
JAVA-9022: Fix formatting of POMs
2022-01-13 09:50:07 +01:00
Haroon Khan 0bd238b98b [JAVA-9386] Fix test directory 2022-01-12 08:40:50 +00:00
sampadawagde 65f643262d JAVA-9022: Fix formatting of POMs 2022-01-10 22:05:47 +05:30
kwoyke 53780ceaf2 Merge pull request #11657 from hkhan/JAVA-9347-split-spring-rest-http-module
[JAVA-9347] Split spring-rest-http module
2022-01-10 11:23:51 +01:00
Haroon Khan 5521870d64 [JAVA-9347] Split spring-rest-http module 2022-01-10 08:57:45 +00:00
chaos2418 ac0df69dbf JAVA-8284: split or move spring-mvc-basics-2 module 2022-01-08 16:51:06 +05:30
chaos2418 0bc3f44656 JAVA:8981: verify spring.mvc.pathmatch.matching-strategy property usage 2022-01-08 13:12:01 +05:30
kwoyke b9cc959bed Merge pull request #11608 from anuragkumawat/master
JAVA-8291 : Split or move spring-thymeleaf-2 module
2021-12-24 13:05:14 +01:00
anuragkumawat 73d4b9af4b Adding new module to parent pom 2021-12-24 14:20:34 +05:30
kwoyke 58eb7f641a Merge pull request #11609 from chaos2418/JAVA-3591
JAVA-3591: updating mockito version in parent-boot-2
2021-12-23 12:59:14 +01:00
chaos2418 1227c38388 JAVA-3591: updating mockito version in parent-boot-2 2021-12-23 14:58:50 +05:30
kwoyke 1824fbc9f4 Merge pull request #11610 from chaos2418/JAVA-8281
JAVA-8281: fixing integration tests in spring-thymeleaf
2021-12-22 21:28:23 +01:00
chaos2418 bdf9a486dc JAVA-8281: fixing integration tests in spring-thymeleaf 2021-12-22 19:24:07 +05:30
anuragkumawat 197ed59369 Remove unused code 2021-12-22 15:50:59 +05:30
anuragkumawat 4ba7a2d890 JAVA-8291 : Split or move spring-thymeleaf-2 module 2021-12-22 15:16:34 +05:30
kwoyke 514e80aae7 Merge pull request #11585 from chaos2418/JAVA-3591
JAVA-3591: updating mockito-core to 4.1.0
2021-12-20 09:38:12 +01:00
kwoyke 3a2adcdb8e Merge pull request #11595 from chaos2418/JAVA-8281
JAVA-8281: split or move spring-thymeleaf module
2021-12-20 09:27:19 +01:00
Loredana Crusoveanu 77dcb8853f Merge pull request #11592 from eugenp/JAVA-8794
JAVA-8794: Upgrade to Spring Boot 2.6.1
2021-12-19 11:57:17 +02:00
chaos2418 ff67d378b0 JAVA-8281: split or move spring-thymeleaf module 2021-12-18 17:48:58 +05:30
chaos2418 000dcdf966 JAVA-3591: updating mockito-core to 4.1.0 2021-12-18 13:40:53 +05:30
sampadawagde 89004f02de JAVA-8359: Split or move spring-boot-artifacts module 2021-12-17 19:23:10 +05:30
Krzysiek c7aef4d95f Merge remote-tracking branch 'upstream/master' into JAVA-8794 2021-12-16 12:21:43 +01:00
Krzysiek a6d23155da JAVA-8794: Set spring.mvc.pathmatch.matching-strategy=ant-path-matcher 2021-12-14 16:40:11 +01:00
Krzysiek 8cd351bddd JAVA-8794: Fix spring-resttemplate pom 2021-12-14 12:37:33 +01:00
Haroon Khan 3d6a16866e [JAVA-8295] Split spring-mvc-xml module 2021-12-13 21:48:11 +00:00
Krzysiek 7d159679cf JAVA-8285: Add spring-mvc-basics-5 to the parent pom 2021-12-13 10:38:54 +01:00
Haroon Khan e3a777298f [JAVA-8285] Split spring-mvc-basics into a new module 2021-12-11 19:52:50 +00:00
Krzysiek 0639aa4c57 JAVA-8289: Add spring-web-url to the parent pom 2021-12-09 14:23:20 +01:00
anuragkumawat 31cc95fda1 Removed unused annotations 2021-12-09 18:07:56 +05:30
anuragkumawat aa0207e2d2 Remove unused libraries and code 2021-12-09 17:32:11 +05:30
anuragkumawat bbec00c4cd Removed redundent clases 2021-12-09 11:21:11 +05:30
anuragkumawat 1e9cc72570 Removed the used code 2021-12-08 18:27:42 +05:30
anuragkumawat 1862d8cce2 Adding spring-web-url 2021-12-07 16:05:59 +05:30
Krzysiek 8b280e689a JAVA-8667: Remove hamcrest dependency declarations from the child modules 2021-11-24 13:20:20 +01:00
kwoyke 1871d1a89c Merge pull request #11468 from chaos2418/JAVA-8405
JAVA-8405: reducing logging for tutorials-build-job
2021-11-23 13:43:19 +01:00
chaos2418 58e6087b3d JAVA-8405: reducing logging for tutorials-build-job 2021-11-19 13:39:00 +05:30
Krzysiek d7caae1c24 JAVA-7783: POM properties cleanup 2021-11-16 11:25:14 +01:00
chaos2418 b0176d85cf JAVA-1672: removing surefire configurations from parents 2021-11-07 19:14:37 +05:30
chaos2418 9bbd34d45f JAVA-1664: upgrading parent-boot-2 junit and surefire configurations 2021-11-02 14:51:24 +05:30
Dhawal Kapil 1ab0a19d25 Java 3590 (#11367) (#11380)
* Java 3590 (#11367)

* JAVA-3590: updating junit-jupiter dependency in the main pom.xml

* resolving unnecessary mockito stubbings exception

* adding junit-bom in dependency management

* fixing tests which were not getting discovered

* Revert "fixing tests which were not getting discovered"

This reverts commit 2e9ed8df42eb96f7e0929167aabbc2ddd374a263.

* fixing tests in ninja, open-liberty and spring-ejb

* removing junit4 dependency and replacing it with junit-vintage-engine

* removing junit4 dependency and replacing it with junit-vintage-engine in testing-modules, maven-modules and aws-lambda

* removing junit dependency and replacing it with junit-vintage-engine

* removing junit and replacing it with junit-vintage-engine

* fixing tests that were not getting discovered due to old version of junit:junit

* updated failsafe plugin configuration to skip integration tests in blade

* fixing tests that were not getting discovered due to old version of junit:junit

* fixing tests in libraries and libraries-2 modules

Co-authored-by: chaos2418 <>

* Java 3590 - fixing integration tests in restx and spring-5-webflux (#11382)

* JAVA-3590: updating junit-jupiter dependency in the main pom.xml

* resolving unnecessary mockito stubbings exception

* adding junit-bom in dependency management

* fixing tests which were not getting discovered

* Revert "fixing tests which were not getting discovered"

This reverts commit 2e9ed8df42eb96f7e0929167aabbc2ddd374a263.

* fixing tests in ninja, open-liberty and spring-ejb

* removing junit4 dependency and replacing it with junit-vintage-engine

* removing junit4 dependency and replacing it with junit-vintage-engine in testing-modules, maven-modules and aws-lambda

* removing junit dependency and replacing it with junit-vintage-engine

* removing junit and replacing it with junit-vintage-engine

* fixing tests that were not getting discovered due to old version of junit:junit

* updated failsafe plugin configuration to skip integration tests in blade

* fixing tests that were not getting discovered due to old version of junit:junit

* fixing tests in libraries and libraries-2 modules

* fixing integration tests in restx and spring-5-webflux

Co-authored-by: chaos2418 <>

Co-authored-by: chaos2418 <92030908+chaos2418@users.noreply.github.com>
2021-10-29 09:37:04 +05:30
anuragkumawat 48e194e9f7 JAVA-8130 : Update Spring Boot in the spring-mvc-basics-2 2021-10-28 15:42:05 +05:30
kwoyke 2dfd2e9e27 BAEL-5219: Fix spring-mvc-webflow and spring-mvc-xml poms (#11350) 2021-10-19 10:37:14 +02:00
Shashank 3fce5f424d feat: removing deprecated view resolver classes and configuring BeanNameViewResolver 2021-10-02 21:33:59 +05:30
freelansam fe7d2af8c0 JAVA-7178: Fix formatting of POMs (#11236)
* JAVA-7178: Fix formatting of POMs

* JAVA-7178: fix failing build
2021-09-20 00:04:26 +05:30
anuragkumawat 3ead19dc38 JAVA-5947 - Corrected the package name in code 2021-09-06 20:03:03 +05:30
anuragkumawat 8f737fc3c2 JAVA-5947 - Changed the Integration Test to Manual Test and also added the comment to download the location file and run the test manually in code 2021-09-06 19:58:33 +05:30
anuragkumawat d4d3ac77f8 Removed the large Geo Location File - GeoLite2-City.mmdb from code and it's references. 2021-09-03 02:23:16 +05:30
johnA1331 db0878692d Update README.md 2021-08-05 01:11:20 +08:00
freelansam 32dde5b5d1 JAVA-6475: Fix formatting of POMs (#11087)
* JAVA-6475: Fix formatting of POMs

* correct build error
2021-08-03 00:27:15 +05:30
Usman Mohyuddin dd50f5e80b Create GreetingsController.java (#11057)
* Create GreetingsController.java

add controller to test the content type being set properly or not

* add unit tests for greetings controller

* update to avoid PMD violation

* correct the file type

* Update GreetingsControllerUnitTest.java

fix some imports & correct the names

* Update GreetingsControllerUnitTest.java

update the unit case to avoid internal server error for junit
2021-07-25 10:02:16 -07:00
sampadawagde 181834efeb JAVA-5937: Analyse bean overriding fix in modules - Part 5 2021-07-12 22:52:58 +05:30
kwoyke b45ee10f63 Merge pull request #10962 from freelansam/JAVA-5933
JAVA-5933: Analyse bean overriding fix in modules - Part 1
2021-06-28 10:38:59 +02:00
sampadawagde e746beee45 JAVA-5933: Analyse bean overriding fix in modules - Part 1 2021-06-26 15:59:38 +05:30
kwoyke eb1f4e1e90 JAVA-5875: Upgrade Spring Boot to 2.5.1 (#10956)
* JAVA-5875: Upgrade Spring Boot to 2.5.1

* JAVA-5875: Leave jta module on Spring Boot 2.4.7

* JAVA-5875: Update spring-boot-persistence-mongodb to use embedded Mongo 3.0

* JAVA-5875: Leave spring-data-dynamodb on Spring Boot 2.4.7

* JAVA-5875: ErrorController#getErrorPath has been removed

* JAVA-5875: Fix SQL Script DataSource Initialization

* JAVA-5875: ErrorController#getErrorPath has been removed

* JAVA-5875: Fix RepositoryRestConfigurer

* JAVA-5875: Fix issues caused by rest-assured upgrade

* JAVA-5875: Upgrade spring-cloud-dependencies to 2020.0.3

* JAVA-5875: Leave spring-boot-keycloak on Spring Boot 2.4.7

* JAVA-5875: Fix data.sql script initialization

* JAVA-5875: Leave spring-security-legacy-oidc on Spring Boot 2.4.7

* JAVA-5875: Fix data.sql script initialization

* JAVA-5875: Fix data.sql script initialization

* JAVA-5875: Update de.flapdoodle.embed.mongo dependency

* JAVA-5875: Upgrade spring-cloud-dependencies to 2020.0.3

* JAVA-5875: Update Spring Cloud dependencies

* JAVA-5875: Update cloud dependencies

* JAVA-5875: Defer datasource initialization

* JAVA-5875: Fix rest assured version

* JAVA-5875: Fix Spring Batch serialization issue

* JAVA-5875: Update Spring Cloud Stream version

* JAVA-5875: Update Spring Kafka version

* JAVA-5875: Leave spring-zuul-rate-limiting on Spring Boot 2.4.7

Co-authored-by: Krzysztof Woyke <krzysztof.woyke.sp@lhsystems.com>
2021-06-26 01:20:37 +05:30
johnA1331 ea553b2d73 Update README.md 2021-05-27 00:56:46 +08:00
uzma khan 1506fdef1f [BAEL-4829] Multipart request in spring 2021-05-18 11:55:32 +01:00
freelansam 8cc6444700 Merge branch 'master' into JAVA-5223 2021-05-17 22:37:02 +05:30
sampadawagde 5b49805e3c JAVA-5223: Fix formatting of POMs (Spring Web Modules) 2021-05-17 20:23:25 +05:30
kwoyke 1702cfc4a1 BAEL-4950: Use our S3 to host test file (#10752)
Co-authored-by: Krzysztof Woyke <krzysztof.woyke.sp@lhsystems.com>
2021-05-11 14:48:41 +02:00
johnA1331 63f5811bd6 Update README.md 2021-04-29 05:24:28 +08:00
LiamGve 6a3ba86878 BAEL-4915 added in the code for the article on long polling (#10660)
* BAEL-4915 added in the code for the article on long polling using DeferredResult

* BAEL-4915 altered package for long polling article due to previous package being full

Co-authored-by: Liam Garvie <liamgarvie@Liams-MacBook-Pro.local>
2021-04-21 20:44:33 -05:00
johnA1331 b7335a6c3e Update README.md 2021-04-21 23:44:27 +08:00
freelansam e0b4e6bcd6 BAEL-4223: Displaying Spring error messages with Thymeleaf (#10652) 2021-04-13 12:55:33 -07:00
johnA1331 ca37bcc876 Create README.md 2021-04-07 16:33:34 +08:00
Jonathan Cook 0039f3c637 Merge pull request #10553 from jason-m-s/BAEL-4810-spring-boot-with-jsp
BAEL-4810 Spring Boot with JSP
2021-04-02 13:16:40 +02:00
Krzysztof Woyke 0ae1bfedde JAVA-4931: Cleanup surefire config. Part 2. 2021-03-29 18:57:35 +02:00
Loredana Crusoveanu d3317c4963 Merge pull request #10584 from kwoyke/JAVA-3295
JAVA-3295: POM Properties Cleanup
2021-03-29 14:57:35 +03:00
Krzysztof Woyke baa6756607 JAVA-4167: Remove spring.main.allow-bean-definition-overriding flag 2021-03-26 13:41:41 +01:00
Krzysztof Woyke a382f77a64 JAVA-3295: Remove redundant java.version property 2021-03-26 12:55:14 +01:00
Krzysztof Woyke 6733a4cf15 JAVA-3295: Fix pom properties in spring-web-modules 2021-03-25 13:16:01 +01:00
Jason 4c1b4723e0 BAEL-4810: Second Review Improvements. Fixed some pom warnings and dependencies. Removed incorrectly added Readme.md 2021-03-22 21:06:02 +05:30
Jason c5e0771e1d BAEL-4810: First Review Improvements. Added test cases and fixed some indentations 2021-03-22 21:06:02 +05:30
Jason a6b215d7a3 BAEL-4810 Spring Boot with JSP initial sample commit 2021-03-22 21:06:02 +05:30
Loredana Crusoveanu 7e1dd6103a Merge pull request #10475 from michaelzangl/patch-1
Update README.md
2021-03-15 11:19:32 +02:00
Dhawal Kapil aa466da2ce Merge pull request #10547 from freelansam/JAVA-3961
JAVA-4802: Upgrade parent-spring-5 to the latest version of Spring 5
2021-03-13 01:07:01 +05:30
Jordan Simpson eea3ae3084 BAEL-4685 (#10418)
* Add code examples for article BAEL-4685

* Add tests for the endpoints.

* Rename RequestTimeoutTests.java to RequestTimeoutUnitTest.java
2021-03-11 23:04:20 -08:00
sampadawagde bd81992f66 JAVA-4802: Upgrade parent-spring-5 to the latest version of Spring 5 2021-03-11 16:53:44 +05:30
Krzysztof Woyke 6704dec346 JAVA-4397: Use random port for the GreetControllerRealIntegrationTest 2021-02-25 23:45:12 +01:00
davidmartinezbarua fb5b155667 Merge pull request #10463 from vishal1023/origin/BAEL-2620-local
BAEL-2620 | Update test with latest version of Spring 5 and JUnit 5
2021-02-24 10:34:36 -03:00
freelansam 5832baeccc BAEL-3821: Add new section in "Spring redirect and forward" article (#10502) 2021-02-20 08:57:17 -08:00
vishal 2d2f29b524 Merge remote-tracking branch 'upstream/master' 2021-02-13 08:50:10 +01:00
Michael Zangl f51d7e9f02 Update README.md
Typo in Article Title (is in the original article as well, but that is not editable)
2021-02-10 17:49:03 +01:00
johnA1331 43efec8e23 Update README.md 2021-02-10 01:44:24 +08:00
johnA1331 4f0173ebae Update README.md 2021-02-10 01:08:46 +08:00
johnA1331 bb5c238631 Update README.md 2021-02-04 00:14:49 +08:00
johnA1331 d779223e57 Update README.md 2021-02-04 00:13:24 +08:00
osser-sam 7d78e63edf JAVA-4277: Fix tests in spring-resttemplate module (#10447)
* JAVA-4277: Fix tests in spring-resttemplate module

* JAVA-4277: Moved article from spring-resttemplate to
spring-resttemplate-2
2021-02-03 01:12:29 +05:30
sampada07 28fe37cac4 BAEL-3820: Multiple submit button to a Form (#10457) 2021-01-31 09:39:23 -08:00
Jonathan Cook eb61bc0dc2 Merge pull request #10429 from azhwani/BAEL-4739
BAEL-4739: Spring RestTemplate Exception
2021-01-31 16:13:28 +01:00
johnA1331 fe2aab7fb9 Update README.md 2021-01-28 01:21:00 +08:00
Azhwani 8396dabf77 quick fix 2021-01-17 02:27:34 +01:00
Azhwani 100e3b652d first commit 2021-01-17 02:08:18 +01:00
sampadawagde a0e7e3bf80 JAVA-4010: Added new module to parent pom 2021-01-15 23:17:03 +05:30
sampadawagde 2931dcbeb4 JAVA-4010: Moved 3 articles from this module 2021-01-15 23:16:39 +05:30
sampadawagde e54423ce83 JAVA-4010: Added new module and moved 3 articles to it 2021-01-15 23:15:41 +05:30
Loredana Crusoveanu 87f28fe878 Merge pull request #10407 from kwoyke/JAVA-3588
JAVA-3588: Upgrade commons-fileupload dependency
2021-01-11 12:18:28 +02:00
Eric Martin 28436e3bc1 Merge pull request #10378 from tapankavasthi/master
Use shouldNotFilter to exclude URLs for a Filter
2021-01-10 20:04:18 -06:00
Krzysiek d450e4a2f8 JAVA-3588: Use common commons-fileupload.version property in all child modules 2021-01-08 20:01:27 +01:00
Krzysiek ba5343cab2 JAVA-3585: Use common commons-io.version property in all child modules 2021-01-07 20:42:57 +01:00
Loredana Crusoveanu 66b453758b Merge pull request #10397 from kwoyke/JAVA-3541
JAVA-3541: Move spring-5-mvc into spring-web-modules
2021-01-06 17:09:53 +02:00
Krzysztof Woyke 108522e190 JAVA-3541: Move spring-5-mvc into spring-web-modules 2021-01-06 11:16:55 +01:00
Loredana Crusoveanu 0c1ccf3bf4 Merge pull request #10392 from kwoyke/JAVA-3586
JAVA-3586: Upgrade commons-lang3 dependency
2021-01-06 12:13:38 +02:00
Krzysztof Woyke f361ccc834 JAVA-3540: Move spring-resttemplate into spring-web-modules 2021-01-05 14:10:30 +01:00
Krzysztof Woyke d8c26b6adb JAVA-3586: Get rid of the overriden commons-lang3.version property 2021-01-04 23:01:41 +01:00
Krzysztof Woyke 7dc8fdba7e JAVA-3538: Move spring-rest-testing into spring-web-modules 2021-01-04 16:27:21 +01:00
Krzysztof Woyke 68d3abae10 JAVA-3537: Move spring-rest-simple into spring-web-modules 2021-01-04 10:50:19 +01:00
Tapan Avasthi 71bbdb7fed Use shouldNotFilter to exclude URLs for a Filter
Jira ticket:
http://jira.baeldung.com/browse/BAEL-4703

The existing article uses an out-dated way is used to excluded filtering
for certain urls, instead shouldNotFilter should be used.
2021-01-03 13:11:54 +05:30
Loredana Crusoveanu 5cf91b556c Merge branch 'master' into JAVA-3536-move-spring-rest-shell 2021-01-02 15:15:35 +02:00
Loredana Crusoveanu 4f1bc07739 Merge branch 'master' into JAVA-3528-move-spring-mvc-velocity-module 2021-01-02 14:04:41 +02:00
Loredana Crusoveanu 78c8005199 Merge pull request #10357 from kwoyke/JAVA-3533
JAVA-3533: Move spring-rest-http-2 into spring-web-modules
2021-01-02 13:58:29 +02:00
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