 mike b
|
9d11370afc
|
[bael-3646] trying to resolve merge conflict.
|
2020-03-25 20:23:05 -04:00 |
|
|
mike b
|
c4ba08d9e5
|
[BAEL-3646] remove unused import
|
2020-03-24 20:02:23 -04:00 |
|
|
mike b
|
a7cb075f7d
|
[BAEL-3646] Addressing broken PR
|
2020-03-24 19:57:00 -04:00 |
|
|
mike b
|
51ad7ac413
|
[BAEL-3646] addressing pr issues
|
2020-03-24 10:36:56 -04:00 |
|
|
mike b
|
f953196ddf
|
[BAEL-3646] Fixing tests per review comments
|
2020-03-19 20:15:52 -04:00 |
|
|
mike b
|
e58683f48b
|
[BAEL-3646] Addressing PR comments
|
2020-03-17 10:06:34 -04:00 |
|
|
mike b
|
2c0cf3e2e0
|
[BAEL-3646] Conditional Flow in Spring Batch
|
2020-03-15 14:14:46 -04:00 |
|
 Eric Martin
|
e7946b6558
|
Merge pull request #8874 from eugenp/BAEL-3583
BAEL-3583: Added the core-java-security-2 module
|
2020-03-13 22:53:56 -05:00 |
|
|
eric-martin
|
b0ad30b803
|
BAEL-3583: Added the core-java-security-2 module
|
2020-03-13 22:50:25 -05:00 |
|
|
Eric Martin
|
fa70cdafd6
|
Merge pull request #8511 from eelhazati/master
BAEL-3583: JAAS
|
2020-03-13 22:32:44 -05:00 |
|
 Eric Martin
|
202eaeda27
|
Update pom.xml
|
2020-03-13 22:29:04 -05:00 |
|
|
Eric Martin
|
43dd461ca8
|
Merge branch 'master' into master
|
2020-03-13 22:25:15 -05:00 |
|
|
Eric Martin
|
257dbb7132
|
Merge pull request #8873 from wugangca/BAEL-3737-build-fix
Bael 3737 build fix
|
2020-03-13 22:03:48 -05:00 |
|
 Gang Wu
|
5aa207a2e1
|
Fix integration build by comment out the MySQL settings.
|
2020-03-13 20:31:43 -06:00 |
|
|
Gang Wu
|
7da495a37a
|
Merge branch 'master' of https://github.com/eugenp/tutorials
|
2020-03-13 20:21:27 -06:00 |
|
 Dhawal Kapil
|
92f61cec99
|
Merge pull request #8870 from shubhi22/BAEL-3298-spring-batch-retry
Bael 3298 Changing Date to LocalDateTime to resolve the timezone related build issue
|
2020-03-13 13:14:27 +05:30 |
|
|
Dhawal Kapil
|
3714dd404f
|
Merge pull request #8871 from kwoyke/JAVA-966-fix
JAVA-966: Use randomly generated and available port
|
2020-03-13 13:04:15 +05:30 |
|
 Krzysiek
|
48dc1f0db0
|
JAVA-966: Use randomly generated and available port
|
2020-03-12 20:28:11 +01:00 |
|
 Shubhra
|
83c9c5470a
|
BAEL-3298 Resolving merge conflict
|
2020-03-13 00:34:04 +05:30 |
|
|
Shubhra
|
30322eca9e
|
BAEL-3298 Some merge changes
|
2020-03-13 00:21:20 +05:30 |
|
|
Shubhra
|
e452367c12
|
Merge remote-tracking branch 'origin/BAEL-3298-spring-batch-retry' into BAEL-3298-spring-batch-retry
# Conflicts:
# spring-batch/xml/retryOutput.xml
|
2020-03-13 00:08:24 +05:30 |
|
|
Shubhra
|
65c76344c7
|
BAEL-3298 Updating Date to LocalDateTime to avoid timezone related issues
|
2020-03-13 00:06:57 +05:30 |
|
 eelhazati
|
8a84fe8389
|
Remove tabs
|
2020-03-12 19:34:24 +01:00 |
|
|
Dhawal Kapil
|
8b6adc0904
|
Merge pull request #8868 from sampada07/JAVA-965
JAVA-965 : Fixed failing CustomUserDetailsServiceIntegrationTest
|
2020-03-12 23:33:06 +05:30 |
|
 sampadawagde
|
abf20dad42
|
JAVA-965 : Fixed failing CustomUserDetailsServiceIntegrationTest
|
2020-03-12 22:02:00 +05:30 |
|
 Greg
|
a73eddb9ca
|
Merge pull request #8824 from glmartin/master
Move of BeanDefinitionOverrideException Code
|
2020-03-12 11:22:45 -04:00 |
|
 Greg Martin
|
a597cb28ae
|
Removed maven wrappers
|
2020-03-12 11:11:32 -04:00 |
|
 Josh Cummings
|
b5123d8e99
|
Merge pull request #8829 from dupirefr/team/JAVA-139-maven_compiler_plugin_version_update
[JAVA-139] Updated Maven Compiler Plugin version from 3.7.0 to 3.8.1
|
2020-03-12 08:38:07 -06:00 |
|
|
Dhawal Kapil
|
15c90a734a
|
Merge pull request #8867 from alimate/BAEL-3869
Solving the Mongo Test Issue
|
2020-03-12 19:54:00 +05:30 |
|
 Ali Dehghani
|
a0df759482
|
Forcing MongoDB to Listen to a Random Port
|
2020-03-12 16:44:29 +03:30 |
|