156f9b6906
BAEL-2800: Moved core-java-collections-map to java-collections-maps-2
2019-04-24 22:53:09 -05:00
e6fe47d6ac
Merge remote-tracking branch 'upstream/master'
2019-04-25 06:37:02 +05:30
cf98eefb62
gitflow-incremental-builder upgrade ( #6811 )
2019-04-24 20:55:46 +03:00
ebde333439
Multi-module Maven Project using Java Modules ( #6766 )
...
* Initial Commit
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update root pom.xml
* Update root pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
* Update pom.xml
2019-04-24 07:49:12 -05:00
b63f8882ea
BAEL-2837 Add sample Set operations in Java ( #6697 )
...
* BAEL-2837: Add sample set operations in Java
* BAEL-2837 add new module core-java-collections-set
* BAEL-2837 Updated readme.md file
* BAEL-2837 Tidy dependencies in pom.xml
* BAEL-2837 tidy white space in pom.xml
* BAEL-2837 Rename unit test class
* BAEL-2837 Removed unused logback-xml
2019-04-22 11:12:56 -06:00
0ae452d0a6
update pom
2019-04-21 17:14:55 +03:00
382216bdb1
[BAEL-2882] Picocli
2019-04-21 13:26:25 +02:00
884f0a7d8a
update pom
2019-04-21 11:39:44 +03:00
d3b1630927
rename config project, formatting
2019-04-21 11:37:57 +03:00
a9f1bb2f69
[BAEL-2073] Java 9 Migration Issues and Resolution
2019-04-21 11:47:01 +05:30
550c59b473
Merge branch 'master' into master
2019-04-20 22:12:33 +03:00
e164ab8af0
Fix the Groovy 2 build ( #6772 )
...
* Fix the name of the artifact
* Add Groovy 2 to build
2019-04-20 10:44:01 -07:00
dda58cddc2
[BAEL-13597] - Added new module : httpclient-simple, updated httpclient with new version and code
2019-04-20 18:59:18 +05:30
9da56d97b6
BAEL-2822 Persisting Maps with Hibernate ( #6692 )
...
* BAEL-2822 Persisting Maps with Hibernate
* BAEL-2822 Move PersistMaps Tutorial to new module
* BAEL-2822 Move PersistMaps Tutorial to new module
* BAEL-2822 Move PersistMaps Tutorial to new module
2019-04-19 22:34:34 -06:00
a249fbaf62
BAEL-2493
2019-04-18 10:03:19 +02:00
275a4acaea
Adding source files for article BAEL-1932 ( #6746 )
2019-04-18 07:43:09 +02:00
581ae8abb0
Merge pull request #6725 from amit2103/BAEL-13887
...
[BAEL-14127] - Moved code to jackson-simple
2019-04-17 21:41:12 +03:00
7b84d6ce6f
Merge branch 'master' into master
2019-04-17 10:59:36 +03:00
8ba93d8dc6
BAEL-2771 string matching - Move to new module ( #6744 )
...
* BAEL-2771 Add String matching example to core-groovy
* Move test to new core-groovy-2 module
2019-04-16 14:21:09 -07:00
5e6a5ae662
Add core-kotlin-io to the root pom
2019-04-16 09:30:26 +03:00
d0a6c5701a
BAEL-2661 - Groovy def keyword
2019-04-14 22:02:14 +03:00
bcca8479d5
[BAEL-14127] - Moved code to jackson-simple
2019-04-14 22:40:48 +05:30
87e2047eb5
Adding source files for the tutorial BAEL-2788 ( #6699 )
...
* Adding source files for the tutorial BAEL-2788
* Made changes to the code for the review comments
2019-04-14 18:55:16 +02:00
fd3e1fbded
Merge pull request #6709 from dkapil/task/BAEL-10891
...
BAEL-10891 Renamed tests to *ManualTest because these tests need a ru…
2019-04-13 21:01:10 +03:00
9df90567d4
BAEL-2464 - lambdas and final local variables ( #6530 )
...
* lambdas and final local variables
* workarounds when using non-final local variables in lambdas
* cleanup
* capturing lambdas refactor
* lambdas and local variables
* added comments to capturing lambdas examples
* lambdas variables moved to core-java-lambdas
* core-java-lambdas module moved in pom
* format
2019-04-12 23:10:46 -06:00
9ff896fe4e
Merge pull request #6652 from SmartyAnsh/master
...
BAEL-2800 - BAEL-2800_Copying_a_HashMap_in_Java - new module added
2019-04-11 22:12:25 -05:00
2841688215
BAEL-10891 Moved projects spring-5-data-reactive and spring-amqp-simple from heavy profiles to default-second and integration-lite-second
2019-04-11 20:55:38 +05:30
998e2b7eeb
BAEL-2800_Copying_a_HashMap_in_Java - module renamed to core-java-collections-map
2019-04-10 16:55:52 +03:00
34c0cbe8e3
Add a code snippet for anonymous classes (BAEL-2833) ( #6690 )
...
* Add a code snippet about anonymous classes (BAEL-2833)
Add a code snippet about anonymous classes (BAEL-2833)
Create module core-java-2 and move 'anonymous' package there
* Adjust the pom of core-java-8-2 module
* Adjust unit test
2019-04-09 23:28:44 -07:00
713972cdf0
Merge pull request #6627 from gmconte/BAEL-617
...
Bael 617: BIRT reporting with Spring Boot
2019-04-09 09:08:07 +03:00
1e562ed97c
BAEL-617: fixed indent spacing of the other module as well
2019-04-08 23:44:16 +01:00
6962247c1c
BAEL-617: fixed indent spacing
2019-04-08 23:42:37 +01:00
afd8fe5c98
BAEL-379 A Guide to jBPM with Java ( #6687 )
...
* BAEL-379 A Guide to jBPM with Java
* BAEL-379 A Guide to jBPM with Java
2019-04-08 08:33:50 -07:00
3bbb2fbc55
[BAEL-13314] - Fix formatting of POMs
2019-04-08 00:12:30 +05:30
c421103724
[BAEL-13378] - Added submodules in integration profiles also
2019-04-07 11:55:35 +05:30
0da4c3b1b9
[BAEL-13378] - Added modules those were not built
2019-04-06 16:57:02 +05:30
8455bfc1d0
BAEL-2800_Copying_a_HashMap_in_Java - space problem fix
2019-04-05 10:48:46 +03:00
e5ee3fd8b8
BAEL-617: moving to innovent solution maven deps and adding project to parent pom for build
2019-04-03 21:47:46 +01:00
4878cc2716
BAEL-2800_Copying_a_HashMap_in_Java new module added
2019-04-03 15:06:33 +03:00
8a9cfe80e9
BAEL-379 A Guide to jBPM with Java ( #6619 )
...
* BAEL-379 A Guide to jBPM with Java
* BAEL-379
* BAEL-379 A Guide to jBPM with Java
* BAEL-379 A Guide to jBPM with Java
* BAEL-379 A Guide to jBPM with Java
* BAEL-379 A Guide to jBPM with Java
2019-04-01 22:07:26 -07:00
27699842f6
[BAEL-13322] - Removed noexception module : Code already present in libraries module
2019-03-31 23:07:34 +05:30
2c3c9964a6
Merge pull request #6564 from michael-pratt/master
...
BAEL-2743: creating new apis and adding new data to existing views
2019-03-30 23:52:28 -05:00
73a58cc3b1
BAEL-2715: Removed spring-5-reactive-netty module
2019-03-27 21:41:07 +03:00
c2db7e8357
BAEL-2715: Removed spring-5-reactive-netty module
2019-03-27 21:38:08 +03:00
a877b0065a
Add jhipster-5 module to parent POM
2019-03-25 06:35:02 -06:00
a34d4f0171
Merge pull request #6569 from alimate/BAEL-2786
...
Teeing Collector
2019-03-23 12:23:29 +02:00
d05ce3ae4d
Merge pull request #6526 from isaolmez/BAEL-2715
...
Bael 2715
2019-03-21 21:02:03 -05:00
18eb32a7db
Introducing the core-java-12 module.
...
It's ignored just like other 9+ versions.
2019-03-22 03:46:02 +04:30
fc82f53cb4
Merge pull request #6472 from antmordel/BAEL-2522
...
Adding XMLGregorianCalendar to LocalDate converters
2019-03-20 21:10:23 -05:00
16fdea7267
BAEL-2721 Moved JsonAliasUnitTest into new module called jackson-2. ( #6555 )
...
* BAEL-2721 Examples of @JsonAlias and Gson's alternate parameter
* BAEL-2721 Update class and method names for JsonAlias and GsonAlternate
* BAEL-2721 move JsonAliasUnitTest into new jackson-2 module
* BAEL-2721 Removed unused dependencies from pom.xml
* BAEL-2721 Tidy up logback.xml
* BAEL-2721 fix url in README.md
2019-03-17 23:56:13 -07:00
227ad26d0b
BAEL-2522 - Commenting module
2019-03-16 22:16:48 +00:00
d5e91a8d34
Revert "BAEL-2522 - Reverting changes"
...
This reverts commit bac1103dcc
2019-03-16 22:15:22 +00:00
9b6a3a0f88
New module core-java-jvm added ( #6539 )
2019-03-15 09:56:19 -07:00
bac1103dcc
BAEL-2522 - Reverting changes
2019-03-15 14:38:26 +00:00
dc72b8b397
Adding source code for the tutorial tracked under BAEL-2759 ( #6533 )
2019-03-15 06:52:27 +01:00
f90dd073cb
BAEL-2522 - Updated parent pom with the new module
2019-03-14 09:32:06 +00:00
b7cc946a32
BAEL-2715: Added code samples for Netty server configuration
2019-03-12 22:35:27 +03:00
2cdae3f8b9
Merge pull request #6517 from eugenp/BAEL-2541-v2
...
add new core-java-os module
2019-03-12 08:33:11 +02:00
63b652270a
add new core-java-os module
2019-03-11 23:02:10 +02:00
12da2b183d
Merge pull request #6514 from dkapil/task/BAEL-10957_2
...
BAEL-10957 Moved jhipster project from heavy profile to default-first…
2019-03-11 21:08:01 +02:00
b10782f89e
Building a web application with Spring Boot and Angular ( #6496 )
...
* Initial Commit
* Delete angularclient folder
* Add spring-boot-angular module to root pom.xml
* Update pom.xml
* Update root pom.xml
* Update root pom.xml
2019-03-11 09:49:16 -05:00
ef9df7f563
BAEL-10957 Moved jhipster project from heavy profile to default-first and integration-lite-first profiles
2019-03-11 19:47:41 +05:30
c69690d22c
Merge branch 'master' of https://github.com/eugenp/tutorials into BAEL-12185
2019-03-09 19:33:26 +05:30
2b8ebe7de2
[BAEL-12185] - Updated JACKSON ANNOTATIONS article
2019-03-03 23:22:38 +05:30
f067f5a0f5
BAEL-10890 Added aggregator poms in several projects, cleaned up main pom.xml
2019-02-28 22:15:51 +05:30
9c12b713a3
BAEL-10995 Fix integration build of spring-data-elasticsearch module
...
-Included project in the main pom.xml
2019-02-27 20:54:15 +05:30
0c5293da99
Merge pull request #6419 from dkapil/task/BAEL-10943
...
BAEL-10943 Removed unnecessary repositories
2019-02-27 09:44:00 +02:00
c35a220258
Merge pull request #6414 from dkapil/task/BAEL-10944
...
BAEL-10944 Fixed failing tests
2019-02-26 23:22:52 +02:00
687c2862b1
BAEL-10943 Removed unnecessary repositories
2019-02-26 20:37:51 +05:30
d6dc3f9941
BAEL-10944 Fixed failing tests
2019-02-25 22:49:29 +05:30
053e7c4e98
BAEL-774 ( #6234 )
...
* BAEL-774
* BAEL 774 : Refactored methods
* BAEL-774 Refactored to new module.
* BAEL 774 - CRs
* BAEL 774 - Moved code back to ratpack module
* Removed modules reactive-modules and ratpack-rxjava
* Refactored packages
2019-02-25 09:55:25 -07:00
b9a2297dfa
Merge pull request #6405 from eugenp/BAEL-10856-v2
...
fix smooks test, add libraries to main pom integration profile
2019-02-24 20:44:54 +02:00
ae575b5045
fix smooks test, add libraries to main pom integration profile
2019-02-24 19:26:57 +02:00
89e39c37cb
[BAEL-12666] - POM Properties Cleanup
2019-02-24 17:02:52 +05:30
a7e3fcdd3e
add libraries to default profile
2019-02-24 08:31:54 +02:00
91028e62b2
for Jenkins
2019-02-17 23:01:46 +04:00
4e8590698d
Merge pull request #6218 from alv21/spring-soap
...
BAEL-2466 Spring soap
2019-02-13 00:00:06 -06:00
47c1eed6bd
BAEL-2129 Added new core-kotlin-2 extension
2019-02-03 23:05:04 +05:30
f9cf8b1a5e
BAEL-2443: Implement JsonView filtering based on Spring security ( #6254 )
...
* BAEL-2443: Implement filtering with @JsonView based on spring security role
* Cleanup test
* Rename tests
* Fix renaming roles after refactoring
2019-02-02 08:54:06 -08:00
4d1c8634fa
Code for BAEL-1381 ( #6214 )
...
* BAEL-1381
* [BAEL-1381]
* [BAEL-1381] New module name
* [BAEL-1381] software-security module
2019-01-30 18:16:26 -08:00
4c1c93e1f6
BAEL-2466 spring-soap module added
2019-01-26 09:14:27 -08:00
04b35f1b68
Merge pull request #6205 from michael-pratt/BAEL-2491
...
BAEL-2491
2019-01-26 10:11:53 +02:00
f2d26dfa38
Move new code under different module
2019-01-23 17:45:07 -07:00
4c7ef02bf3
BAEL-2294 ( #6191 )
...
* BAEL-2294
* BAEL-2294
* live tests...
* formatting
* Live Tests! But not parent pom. Yet.
2019-01-23 09:12:06 -08:00
196c17e612
BAEL-2491: Conditionally enable spring scheduled jobs
2019-01-21 15:14:13 +00:00
b81af290a3
Merge pull request #6114 from rozagerardo/geroza/BAEL-9518_Upgrade-parent-spring-5-to-the-latest-version-2
...
[BAEL-9518] parent-spring-5 | Upgrade parent-spring-5 to the latest version of Spring 5 - part 2
2019-01-12 20:33:37 +02:00
a00fa8fdc9
Merge pull request #6105 from rozagerardo/geroza/BAEL-9518_Upgrade-parent-spring-5-to-the-latest-version
...
[BAEL-9518] parent-spring-5 | Upgrade parent-spring-5 to the latest version of Spring 5
2019-01-12 20:29:50 +02:00
2cb4faddb0
fix core-java test and back to build
2019-01-11 23:03:38 +02:00
dfbff7aa19
Update pom.xml
2019-01-10 21:32:08 +02:00
8c34b3e93b
* removed temporary parent module parent-spring-5
2019-01-10 11:05:18 -02:00
c7ba38ffcd
migrated the following modules using parent-spring-5 to spring 5.1:
...
spring-mvc-simple
spring-security-mvc-custom
spring-security-mvc-login
spring-security-rest
spring-security-rest-basic-auth
spring-static-resources
spring-thymeleaf
2019-01-09 23:54:26 -02:00
288fc3db8a
Update pom.xml
2019-01-10 01:04:16 +02:00
6cd561d91a
Fixed pom.xml
2019-01-09 00:41:57 +05:30
842d8573af
Revert parent pom.xml
2019-01-09 00:38:14 +05:30
c0e36d5b10
BAEL-10925 New module spring-boot-rest
2019-01-09 00:30:54 +05:30
cceb6a022e
spring-boot ehcache example added ( #6012 )
2019-01-05 13:39:43 +01:00
b4ff5c46f0
[BAEL-11402] - Moved articles out of core-java (part 3)
2018-12-30 01:19:12 +05:30
9a2f8a87a4
Merge branch 'master' into BAEL-10836
2018-12-27 22:26:35 +02:00
6f93d7f2b1
Merge pull request #5996 from amit2103/BAEL-10837
...
[BAEL-10837] - Splitted core-java-concurrency module
2018-12-27 20:52:35 +02:00
0a0701c947
new module core-java-perf
2018-12-26 20:42:28 +02:00
45ba2a9387
[BAEL-10837] - Splitted core-java-concurrency module
2018-12-25 21:54:46 +05:30
be54e39e60
Merge branch 'master' into BAEL-10838
2018-12-25 14:25:08 +02:00
7e2f10f497
Merge pull request #5971 from amit2103/BAEL-10839
...
[BAEL-10839] - Create core-java-lang-oop module
2018-12-25 12:14:39 +02:00
8cf3e3f41a
[BAEL-10838] - Created core-java-lang-syntax module
2018-12-24 01:10:15 +05:30
bba9a99f32
[BAEL-10836] - Create core-java-collections-list module
2018-12-23 01:15:24 +05:30
023bf2c5b5
[BAEL-10839] - Create core-java-lang-oop module
2018-12-22 21:02:12 +05:30
afe4a98944
[BAEL-10866] - Resolved conflicts
2018-12-22 18:58:28 +05:30
01293da309
Merge pull request #5953 from eugenp/shedlock
...
moved shedlock code example to module "spring-boot-libraries"
2018-12-21 19:51:05 +01:00
87b23b4d44
Spock ( #5952 )
...
* BAEL-2364: Adds Spring Boot IntegrationTests with Spock Framework
* Adds o.b.boot.controller.rest.WebController as example controller
* Adds one Load Application Context Test
* Adds one WebMvcTest
* updated pom.xml's and README
* fixed module name
2018-12-20 22:54:20 +02:00
3f6f33294b
moved shedlock code example to module "spring-boot-libraries"
2018-12-19 20:04:54 +01:00
997587095a
Merge pull request #5932 from eugenp/BAEL-10808
...
add readmes, remove extra modules
2018-12-16 22:51:31 +02:00
ad03c69e01
BAEL-2100 Custom Lombok Annotation ( #5918 )
2018-12-16 11:50:17 -08:00
78735f582b
[BAEL-10866] - Upgrade jackson version in tutorials repository
2018-12-16 23:57:08 +05:30
c97e97d175
add readmes, remove extra modules
2018-12-16 16:25:49 +02:00
ea25895da1
Fixed conflicts
2018-12-16 16:45:48 +05:30
0f443d3006
Task/bael 10829 4 ( #5925 )
...
* BAEL-10829 Commented out spring-data-elasticsearc
* BAEL-10829 commented out spring-data-elasticsearch project
* Revert "BAEL-10829 Commented out spring-data-elasticsearc"
This reverts commit 84b7b4086435ac25a14841199145cc5d9e5c4beb.
2018-12-16 11:24:35 +02:00
1fc93000b6
Merge pull request #5920 from eugenp/remove-flips
...
remove flips module
2018-12-15 19:33:54 +02:00
ded9338e06
Merge pull request #5919 from eugenp/BAEL-10845-v2
...
small fixes for BAEL-10845
2018-12-15 19:24:24 +02:00
9271f10941
Adding files for the tutorial BAEL-1877: A Guide to Hibernate OGM ( #5909 )
...
* Adding files for the tutorial BAEL-1877: A Guide to Hibernate OGM
* Removing test for MongoDB as there may not be MongoDB running on integration platform.
* Reapplied the standard Java formatter.
* Incorporatd the review comments on the tutorial.
* Commented out the integration test for MongoDB.
* Removed implicit dependencies from pom.xml
2018-12-15 09:10:55 -08:00
432643f115
remove flips module
2018-12-15 18:59:23 +02:00
7ae533c5ee
fix main pom
2018-12-15 18:49:49 +02:00
76e8d10bc3
Merge pull request #5903 from rozagerardo/geroza/BAEL-10845_subtask-part-1_BAEL-10354_migrateparent-boot-to-spring-boot-2.1_part-3
...
[BAEL-10845] | Upgrade set of modules to use boot 2.1 - part 3
2018-12-15 18:26:15 +02:00
8b63e6d7f4
BAEL-10829 Clean up the parent pom of the tutorials project ( #5911 )
...
- Moved jhipster and java-mongodb modules to heavy profiles
2018-12-13 11:23:14 -08:00
25854b89a8
BAEL-10829 Cleanup parent pom.xml ( #5907 )
...
* BAEL-10829 Cleanup parent pom.xml
- Removed geotools module causing build to hang
- Removed -q parameter from travis to see full logs while building
* BAEL-10829 reverting -q flag in travis
* BAEL-10829 Commented restx module due to failing tests
2018-12-13 00:15:02 -08:00
1ad6d9c872
Deleted temporary parent-boot module using spring-boot 2.0.x
2018-12-12 10:26:07 -02:00
36decb42b9
Task/bael 10829 ( #5844 )
...
* BAEL-10829 Clean up the parent pom of the tutorials project
- Cleaned up projects list for default-first and integration-lite-first profiles
* BAEL-10829 Fixing unit test in JGit
* BAEL-10829 Clean up the parent pom of the tutorials project
-Updated modules list for default-second and integration-lite-second profiles
* BAEL-10829 Fixed repository for structurizr libraries and api changes done in StructurizrSimple to incorporate new version
2018-12-10 09:37:46 -08:00
8e18c03c40
Merge pull request #5855 from pandachris/master
...
BAEL-2283
2018-12-09 22:10:50 +02:00
24bc616dd2
test name changes; fixed test assertions; POM modules added
2018-12-09 22:59:58 +07:00
0b0aedc287
BAEL-2174: rename core-java-net module to core-java-networking ( #5837 )
...
* BAEL-2246: add link back to article
* BAEL-2174: rename core-java-net module to core-java-networking
2018-12-08 06:58:16 -08:00
d737e15c6b
[BAEL-10840] - Create a libraries-apache-commons module
2018-12-08 15:29:38 +05:30
0e5df58ec5
Merge pull request #5836 from rozagerardo/geroza/BAEL-10843_subtask-part-1_BAEL-10354_migrateparent-boot-to-spring-boot-2.1_part-1
...
BAEL-10843 | Upgrade set of modules to use boot 2.1 - part 1
2018-12-07 22:21:33 +02:00
dcf28dd166
refactor the spring boot persistence mongodb module ( #5829 )
...
* added example code for BAEL-2366
* moved example code for BAEL-2366
* example code for BAEL-1961
* moved example code into integration test
* updated the test assertions
* refactor the spring boot persistence mongodb module
* remove redundant example code
* declared the spring boot persistence module in the root pom
* fixed issue with non-imported file
2018-12-03 08:03:41 -08:00
6b29e94a40
BAEL-2174 How to use proxies in core java ( #5805 )
...
* move samples from core-java to new core-java-net module
* remove erroneous commit of .vscode dir
2018-12-02 20:23:39 -06:00
6ced126022
created parent-boot-2 copy, and point all projects to that new temporary parent pom
2018-12-01 17:37:34 -02:00
fe7e4f87f2
ignoring long running module
2018-12-01 20:45:56 +02:00
56400babbf
disabling very long running module
2018-12-01 19:40:23 +02:00
90ca342016
disabling very long running module
2018-12-01 19:39:47 +02:00
2fa2254345
ignoring module
2018-12-01 18:49:06 +02:00
5d512da017
adding the jira
2018-12-01 11:23:47 +02:00
7cbd26433d
pom cleanup work
2018-12-01 11:22:23 +02:00
8a48239dec
Update pom.xml
2018-12-01 08:53:41 +02:00
eeb02d95ae
Update pom.xml
2018-11-30 23:20:02 +02:00
6e478c5fed
for BAEL 10834 ( #5816 )
...
* Update pom.xml
* enabling spring-security-react module
2018-11-30 12:57:07 -08:00
a797be29bd
temporarily disabling the module
2018-11-30 18:43:11 +02:00
7be6c2f8de
minor pom cleanup
2018-11-30 13:10:10 +02:00
30bbc946d2
pom cleanup
2018-11-30 12:06:24 +02:00
97fe04aace
reenabling some modules
2018-11-29 23:30:46 +02:00
4fe2f0866f
Merge pull request #5562 from psychsane/master
...
[BAEL-1995] Add new module for restx-demo
2018-11-28 20:44:45 +01:00
866666f3db
Add load-testing-comparison to Build ( #5757 )
...
Issue: bael-46
2018-11-28 10:02:35 -07:00
e9fa7851a5
[BAEL-9712] - Fixed conflicts
2018-11-25 00:18:37 +05:30
eric-martin
macroscopic64
Muhammad Asif Anwar
Alejandro Gervasio
pcoates33
Loredana
dupirefr
Anshul Bansal
maibin
amit2103
Raghav Jha
Krzysztof Majewski
Kumar Chandrakant
Kevin Wittek
Alexander Molochko
Marcos Lopez Gonzalez
Eric Martin
Dhawal Kapil
Andrey Shcherbakov
Gian Mario Contessa
Saurabh Kedia
isaolmez
Michael Pratt
Ali Dehghani
Antonio Moreno
cdjole
the-java-guy
Mikhail Chugunov
psevestre
alv21
Andrea Ligios
Michael Pratt
geroza
Tom Hombergs
dev-chirag
clininger
KevinGilmore
Seun Matt
chrisoberle
Eugen Paraschiv
Josh Cummings