Commit Graph
1885 Commits
Author SHA1 Message Date
Josh Cummings 45264da0d8 Merge pull request #8861 from kwoyke/JAVA-959
JAVA-959: Standardize packages in spring-katharsis and other modules
2020-03-14 22:38:21 -06:00
Eric Martin df19fb20f6 Merge pull request #8851 from albanoj2/BAEL-3871
BAEL-3871: Added tests for duplicate HTTP controller methods
2020-03-14 19:12:32 -05:00
Justin Albano eb09207569 BAEL-3871: Corrected name of test to include "UnitTest" 2020-03-14 18:09:00 -04:00
Cavero Barca 63d9335b09 Remove FQCN for StringUtils and let private functions when possible 2020-03-14 23:06:54 +01:00
Eric Martin 28d707bac8 Merge pull request #8831 from SmartyAnsh/BAEL-3874-OCR-with-Tesseract
BAEL-3874-ocr_with_tesseract
2020-03-14 15:39:38 -05:00
Josh Cummings 915ace693e Merge pull request #8850 from dupirefr/team/JAVA-137-maven_jxr_plugin_version_update
[JAVA-137] Updated Maven JXR Plugin version from 2.3 to 3.0.0
2020-03-14 12:13:00 -06:00
Josh Cummings fb11464797 Merge pull request #8827 from dupirefr/team/JAVA-136-maven_pmd_plugin_version_update
[JAVA-136] Updated Maven PMD Plugin version from 3.8 to 3.13.0
2020-03-14 12:12:11 -06: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
dupirefr a642b6c317 [JAVA-137] Updated Maven JXR Plugin version from 2.3 to 3.0.0 2020-03-13 18:11:48 +01:00
dupirefr 386cd75373 [JAVA-136] Updated Maven PMD Plugin version from 3.8 to 3.13.0 2020-03-13 18:11:28 +01: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
Cavero Barca 5badedf7e3 Upgrade Guava version 2020-03-13 00:35:43 +01:00
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