iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed conflicts

Browse Source
This commit is contained in:
amit2103
2019-11-25 00:24:40 +05:30
parent b022c54e3f 9f25b72ca4
commit b787240f29
327 changed files with 4913 additions and 1361 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+9 -1
View File
@@ -341,6 +341,7 @@
<module>algorithms-miscellaneous-4</module>
<module>algorithms-miscellaneous-5</module>
<module>algorithms-sorting</module>
<module>algorithms-searching</module>
<module>animal-sniffer-mvn-plugin</module>
<module>annotations</module>
<module>antlr</module>
@@ -499,6 +500,8 @@
<module>jackson</module>
<module>jackson-2</module>
<module>jackson-simple</module>
<module>jackson-annotations</module>
<module>jackson-exceptions</module>
<module>java-collections-conversions</module>
<module>java-collections-conversions-2</module>
<module>java-collections-maps</module>
@@ -508,6 +511,7 @@
<!-- <module>java-ee-8-security-api</module> --> <!-- long running -->
<module>java-lite</module>
<module>java-math</module>
<module>java-math-2</module> <!-- Added for BAEL-3506 -->
<module>java-numbers</module>
<module>java-numbers-2</module>
<module>java-rmi</module>
@@ -975,6 +979,7 @@
<module>algorithms-miscellaneous-4</module>
<module>algorithms-miscellaneous-5</module>
<module>algorithms-sorting</module>
<module>algorithms-searching</module>
<module>animal-sniffer-mvn-plugin</module>
<module>annotations</module>
<module>antlr</module>
@@ -1125,6 +1130,8 @@
<module>jackson</module>
<module>jackson-2</module>
<module>jackson-simple</module>
<module>jackson-annotations</module>
<module>jackson-exceptions</module>
<module>java-collections-conversions</module>
<module>java-collections-conversions-2</module>
<module>java-collections-maps</module>
@@ -1134,6 +1141,7 @@
<module>java-ee-8-security-api</module>
<module>java-lite</module>
<module>java-math</module>
<module>java-math-2</module> <!-- Added for BAEL-3506 -->
<module>java-numbers</module>
<module>java-numbers-2</module>
<module>java-rmi</module>
@@ -1447,7 +1455,7 @@
<module>twilio</module>
<module>twitter4j</module>
<module>undertow</module>
<!-- <module>undertow</module> --> <!-- 19.11.2019 - disabling temporarily as it's causing a major issue with the build (TODO: create a jira to fix it) -->
<module>vertx</module>
<module>vertx-and-rxjava</module>