Commit Graph

274 Commits

Author SHA1 Message Date
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
chaos2418 000dcdf966 JAVA-3591: updating mockito-core to 4.1.0 2021-12-18 13:40:53 +05:30
Krzysiek 15eeebb140 JAVA-8794: Leave spring-zuul-rate-limiting on 2.4.7 2021-12-16 12:21:02 +01:00
Krzysiek be0b41d232 JAVA-8794: Update spring-cloud-zuul dependencies 2021-12-15 10:54:36 +01:00
Krzysiek 556b3fbc51 JAVA-8794: Update Spring Cloud version 2021-12-15 09:48:48 +01:00
Krzysiek 197c72f882 JAVA-8794: Replace deprecated ConfigFileApplicationContextInitializer 2021-12-13 16:20:04 +01:00
Krzysiek a49cd9ebb4 JAVA-8794: allow-circular-references in spring-cloud-ribbon-client 2021-12-13 15:24:00 +01:00
Krzysiek 61b0f3f919 JAVA-8794: Update Spring Cloud dependencies 2021-12-13 15:23:22 +01:00
kwoyke f6f71b0167 Merge pull request #11551 from chaos2418/JAVA-8649-2
JAVA-8649: removing bootstrap.properties in spring-cloud-bus module
2021-12-06 10:49:58 +01:00
chaos2418 9d62c835c5 JAVA-8649: removing bootstrap.properties in spring-cloud-bus module 2021-12-05 20:59:15 +05:30
chaos2418 cb9bfcbce8 JAVA-8649-1: updating spring-cloud release train version in spring-cloud-vault and removing bootstrap.yml 2021-12-01 20:39:43 +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 ae26c0c61a JAVA-7832: spring-cloud-config bootstrap.properties need to change to application.properties/yml 2021-11-20 17:23:33 +05:30
chaos2418 58e6087b3d JAVA-8405: reducing logging for tutorials-build-job 2021-11-19 13:39:00 +05:30
Krzysiek 5088366074 JAVA-8436: Remove AssertJ depenendency from the child modules - part 2 2021-11-18 12:23:39 +01:00
freelansam 77e3e6a419 Merge branch 'master' into JAVA-8204 2021-11-09 18:20:05 +05:30
sampadawagde b984a4b618 JAVA-8204: Fix formatting of POMs 2021-11-09 16:27:03 +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
freelansam 4c600af55d JAVA-7782: Align module names, folder names and artifact id (#11361)
* JAVA-7782: Align module names, folder names and artifact id

* JAVA-7782: Align module names, folder names and artifact id
2021-10-25 01:36:50 +05:30
johnA1331 6dc9f39276 Update README.md 2021-09-24 16:05:13 +08:00
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
kwoyke 6ed0aee6a0 JAVA-7133: POM Properties Cleanup (#11229)
* JAVA-7133: Use common org.slf4j.version property

* JAVA-7133: Use common logback.version property
2021-09-16 22:34:26 +05:30
anuragkumawat 0c366f3220 JAVA-2800 : Upgrade spring-cloud-connectors-heroku to the latest Spring Boot version 2021-09-13 20:04:10 +05:30
Dhawal Kapil b42f71b08d JAVA-6216 Renamed spring-cloud-ribbon-retry to *ManualTest as they both (#11132)
expected at live running server to connect to
2021-08-17 23:35:33 +05:30
johnA1331 a00d8462e1 Create README.md 2021-08-11 11:38:19 +08:00
Gerald Boersma d43ac8d1b5 BAEL-5049 spring-cloud-dapr (#11063)
* BAEL-5049 Added tutorial code for article.

* BAEL-5049 Added readme.

* Initial code for 2-javasdk to properly include as part of Spring Boot project.

* Added binding with rabbitmq.

* Removed 1-intro module.

* Updates from comments.

* Added .gitignore back in.

* Cleaned up POMs.

* Get rid of .gitignore.

* Change controller to use GetMapping.

Co-authored-by: Gerald Boersma <gerald.boersma@icsynergy.com>
2021-08-07 19:55:35 -05: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
freelansam 5470ccfb97 JAVA-6474/JAVA-6324: Align module names, folder names and artifact id (#11071)
* JAVA-6474/JAVA-6324: Align module names, folder names and artifact id
(template)

* JAVA-6474/JAVA-6324: revert changes for guest modules
2021-07-28 20:10:03 +05:30
davidmartinezbarua fe8ec4460c Merge pull request #10857 from MicuEmerson/master
BAEL-4014 - added the code
2021-07-09 14:51:09 -03:00
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
kwoyke 51ceab1ac3 BAEL-3727: Add example NOT using Feign (#10929)
Co-authored-by: Krzysztof Woyke <krzysztof.woyke.sp@lhsystems.com>
2021-06-19 08:16:32 +02:00
johnA1331 8b599bbc05 Update README.md 2021-06-09 16:52:42 +08:00
MicuEmerson 4407da95c1 BAEL-4014 - added the code 2021-06-02 20:57:42 +03:00
kwoyke 4ff3ef1b89 Merge branch 'master' into task/JAVA-5550 2021-05-16 20:47:40 +02:00
Dhawal Kapil c3e386eb02 JAVA-5550 Removed Spring Milestones/RC dependencies from projects and upgraded them to their respective central versions 2021-05-16 16:40:29 +05:30
sampadawagde f451361625 JAVA-5409: Fix formatting of POMs (Spring Cloud - Part 2) 2021-05-14 17:43:57 +05:30
sampadawagde 776e3ca7c8 JAVA-5409: Fix formatting of POMs (Spring Cloud - Part 1) 2021-05-14 17:43:24 +05:30
johnA1331 f0043968a0 Create README.md 2021-04-14 23:42:50 +08:00
Loredana Crusoveanu f203051ccd Merge pull request #10604 from Maiklins/JAVA-4341-Upgrade_spring-cloud-_modules
Java 4341 upgrade spring cloud  modules
2021-04-12 17:43:17 +03:00
freelansam 60b6c6e6b6 Merge branch 'master' into JAVA-3576 2021-04-10 16:21:13 +05:30
Loredana Crusoveanu 036fb5ca71 Merge pull request #10639 from collaboratewithakash/master
Updated a few readme files
2021-04-08 10:40:28 +03:00
collaboratewithakash 6d98814a0a added a new readme file 2021-04-08 00:14:32 +05:30
Amit Bhave 71119f2193 BAEL-3636 Add degrade and system protection rules configurations 2021-04-04 21:49:59 +05:30
Amit Bhave cf7705caee Merge remote-tracking branch 'upstream/master' 2021-04-04 21:35:52 +05:30
sampadawagde 7cbf13db95 JAVA-3576 - Align module names, folder names and artifact id 2021-04-02 22:46:25 +05:30
Krzysztof Woyke f17aec8395 JAVA-3593: Use byte-buddy version inherited from the main pom.xml 2021-03-29 23:11:42 +02:00
mikr 8c4ca7fd8c JAVA-4341 Upgrade spring-cloud-* modules 2021-03-28 23:09:32 +02:00
Krzysztof Woyke a382f77a64 JAVA-3295: Remove redundant java.version property 2021-03-26 12:55:14 +01:00
Krzysztof Woyke df93a6b9e6 JAVA-3295: Use project.build.sourceEncoding and project.reporting.outputEncoding from the main pom.xml 2021-03-24 09:37:43 +01:00
Amit Bhave ce2995c1cd BAEL-3636 Use spaces instead of tabs 2021-03-21 19:23:03 +05:30
Amit Bhave 9efb7c68e6 BAEL-3636 Add sentinel dashboard dependency 2021-03-21 18:57:06 +05:30
Amit Bhave f7b8d67c0b Merge remote-tracking branch 'upstream/master' 2021-03-21 18:51:04 +05:30
mikr 3737e930b9 JAVA-4863 Update Spring cloud version 2021-03-15 23:28:11 +01:00
mikr 43e98cd779 JAVA-4293-remove-spring-security-credentials 2021-02-28 23:13:12 +01:00
Maiklins 65f461b2e8 Java 4293 update dockerizing spring boot app article (#10512)
* JAVA-4293 Fix Dockerize Spring Boot article

* JAVA-4293 Remove authentication / fix pom file

Co-authored-by: mikr <michael.krimgen@ximedes.com>
2021-02-28 20:46:48 +05:30
Amitabh Tiwari c29b355b02 Bael 4804 config update (#10505)
* Removed the configuration annotation

* Removed @confiuration

Co-authored-by: Amitabh Tiwari <Amitabh.Tiwari@maersk.com>
2021-02-19 15:17:31 -08:00
johnA1331 29ad493e56 Update README.md 2021-02-18 04:35:13 +08:00
Amitabh Tiwari 8a2a384dfa BAEL-3595: Initial change for Multipart file upload (#10465)
* BAEL-3595: Initial change for Multipart file upload

* Corrected the name

* BAEL-3595: Added Tests

* Corrected the tests name

* Uncommented the code for live test

Co-authored-by: Amitabh Tiwari <Amitabh.Tiwari@maersk.com>
2021-02-16 23:39:26 -08:00
Amit Bhave 8cbc8d5a3a BAEL-3636 Change package name and format xml according to feedback 2021-02-09 19:18:23 +05:30
Amit Bhave 18d754bda4 BAEL-3636 fix pom dependencies problem 2021-01-26 11:59:20 +05:30
Amit Bhave 8b9ee31750 BAEL-3636 remove duplicate spring web starter dependency 2021-01-26 11:00:58 +05:30
Amit Bhave ccf3708712 Merge remote-tracking branch 'upstream/master' 2021-01-26 10:51:57 +05:30
Gerardo Roza 1b127b9b00 removed Sprng Boot version override, upgraded cloud version and added junit-vintage-engine dependency to avoid issues with existing JUnit4 tests 2021-01-18 12:55:30 -03:00
Amit Bhave 01f5b186a8 BAEL-3636 - introduction to alibaba sentinel 2021-01-02 14:49:45 +05:30
mikr cb7c9406ee JAVA-3498 Fix integration test in spring-cloud-zuul (fix imports - 2) 2020-12-31 12:24:17 +01:00
mikr bef161cc5d JAVA-3498 Fix integration test in spring-cloud-zuul (fix imports) 2020-12-31 12:22:01 +01:00
mikr 47ada8bdca JAVA-3498 Fix integration test in spring-cloud-zuul 2020-12-31 12:19:30 +01: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
johnA1331 9b808b2fde Update README.md 2020-12-30 16:34:08 +08:00
Adrian Maghear 1a63c83f55 [BAEL-4015] fix integration tests 2020-12-29 16:42:52 +01:00
Krzysztof Woyke 515d213c90 Merge remote-tracking branch 'upstream/master' into JAVA-3570 2020-12-22 10:50:48 +01:00
Krzysztof Woyke d7cb1a586f JAVA-3570: Keep spring-cloud-kubernetes on Spring Boot 2.3.3 [cloud] 2020-12-16 21:28:39 +01:00
Krzysztof Woyke 080dd971f8 JAVA-3570: Keep spring-cloud-security on Spring Boot 2.3.3 [cloud] 2020-12-16 21:03:50 +01:00
Krzysztof Woyke 7b0de8a703 JAVA-3570: Keep spring-cloud-ribbon-client on Spring Boot 2.3.3 [cloud] 2020-12-16 21:00:33 +01:00
Adrian Maghear 0c055b7d31 update indentation 2020-12-14 19:24:02 +01:00
Krzysztof Woyke d3770851b0 JAVA-3570: Keep spring-cloud-zookeeper on Spring Boot 2.3.3 [cloud] 2020-12-14 12:05:56 +01:00
Krzysztof Woyke a0ec0f3d5c JAVA-3570: Keep spring-cloud-config on Spring Boot 2.3.3 [cloud] 2020-12-14 12:03:21 +01:00
Krzysztof Woyke b4ccf851d3 JAVA-3570: Keep spring-cloud-zuul on Spring Boot 2.3.3 [cloud] 2020-12-14 11:02:50 +01:00
Krzysztof Woyke 127a377b81 Revert "JAVA-3570: Keep spring-cloud on Spring Boot 2.3.3 [cloud]"
This reverts commit adbd9ecfb9.
2020-12-14 11:00:28 +01:00
Krzysztof Woyke adbd9ecfb9 JAVA-3570: Keep spring-cloud on Spring Boot 2.3.3 [cloud] 2020-12-14 10:23:23 +01:00
Adrian Maghear b6ff723533 add newlines at end of files 2020-11-28 23:44:06 +01:00
Adrian Maghear e67b1f95a8 solve port conflict during integration tests 2020-11-28 23:38:06 +01:00
Adrian Maghear 86137d30db Merge remote-tracking branch 'baeldung/master' into BAEL-4015 2020-11-28 23:01:02 +01:00
Adrian Maghear f3d390b684 initial commit 2020-11-28 14:14:37 +01:00
Loredana b4ae0bfb63 JAVA-3498 rename test to exclude it from build temporarily 2020-11-07 11:57:38 +02:00
Loredana Crusoveanu dc8fe72bb5 Merge pull request #10140 from kwoyke/BAEL-4657
BAEL-4657: Add BasicAuthRequestInterceptor example
2020-10-16 19:10:39 +03:00
Loredana Crusoveanu 55a452b06b Merge pull request #10147 from eugenp/JAVA-1671-v2
remove explicit version overrides JAVA-1671
2020-10-13 16:45:15 +03:00
Amit Pandey 775f790d1d renamed junit test case to manual test case (#10154) 2020-10-12 23:37:44 +05:30
Loredana e4007b9b98 fix test 2020-10-10 14:18:20 +03:00
Loredana 5792db85bd fix unknown version 2020-10-10 13:56:42 +03:00
Loredana 6f4ec4704f fix unknown version 2020-10-10 13:49:25 +03:00
Loredana 2fb06fdcdd remove explicit version overrides JAVA-1671 2020-10-10 13:38:26 +03:00
Loredana Crusoveanu 7f19907f51 Merge pull request #10067 from dupirefr/team/JAVA-1671-spring_cloud_junit_and_surefire_version_upgrade
[JAVA-1671] Upgraded JUnit and Maven Surefire Plugin versions
2020-10-10 13:09:32 +03:00
johnA1331 c1238eec63 Update README.md 2020-10-07 17:23:20 +08:00
johnA1331 962063264a Create README.md 2020-10-07 17:22:49 +08:00
johnA1331 3ebd90bfd7 Update README.md 2020-10-07 17:21:34 +08:00
Krzysztof Woyke d970484275 BAEL-4657: Add BasicAuthRequestInterceptor example 2020-10-07 10:47:15 +02:00
andrebrowne b9dbeb6c58 BAEL-4012 Add Netflix Feign (#10110)
* BAEL-4012 Add Netflix Feign

* BAEL-4012 Cleanup pom
2020-10-02 10:21:18 -07:00