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

Merge branch 'master' into BAEL-10836

Browse Source
This commit is contained in:
Loredana Crusoveanu
2018-12-27 22:26:35 +02:00
committed by GitHub
parent bba9a99f32 6f93d7f2b1
commit 9a2f8a87a4
381 changed files with 1996 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+12 -4
View File
@@ -380,10 +380,14 @@
<module>core-java-arrays</module>
<module>core-java-collections</module>
<module>core-java-collections-list</module>
<module>core-java-concurrency-basic</module>
<module>core-java-concurrency-collections</module>
<module>core-java-io</module>
<module>core-java-lang-syntax</module>
<module>core-java-lang</module>
<module>core-java-networking</module>
<module>core-java-lang-oop</module>
<module>core-java-networking</module>
<module>core-java-perf</module>
<module>core-java-sun</module>
<module>core-scala</module>
<module>couchbase</module>
@@ -989,7 +993,7 @@
<module>parent-kotlin</module>
<module>core-java</module>
<module>core-java-concurrency</module> <!-- very long running? -->
<module>core-java-concurrency-advanced</module> <!-- very long running? -->
<module>core-kotlin</module> <!-- long running? -->
<module>jenkins/hello-world</module>
@@ -1088,10 +1092,14 @@
<module>core-java-arrays</module>
<module>core-java-collections</module>
<module>core-java-collections-list</module>
<module>core-java-concurrency-basic</module>
<module>core-java-concurrency-collections</module>
<module>core-java-io</module>
<module>core-java-lang-syntax</module>
<module>core-java-lang</module>
<module>core-java-lang-oop</module>
<module>core-java-networking</module>
<module>core-java-perf</module>
<module>core-java-sun</module>
<module>core-scala</module>
<module>couchbase</module>
@@ -1533,7 +1541,7 @@
<module>parent-kotlin</module>
<module>core-java</module>
<module>core-java-concurrency</module> <!-- very long running? -->
<module>core-java-concurrency-advanced</module> <!-- very long running? -->
<module>core-kotlin</module> <!-- long running? -->
<module>jenkins/hello-world</module>
@@ -1606,7 +1614,7 @@
<javax.servlet.jsp-api.version>2.3.1</javax.servlet.jsp-api.version>
<jackson-mapper-asl.version>1.9.13</jackson-mapper-asl.version>
<jstl.version>1.2</jstl.version>
<jackson-databind.version>2.5.0</jackson-databind.version>
<jackson-databind.version>2.9.7</jackson-databind.version>
<commons-fileupload.version>1.3</commons-fileupload.version>
<junit-platform.version>1.2.0</junit-platform.version>
<junit-jupiter.version>5.2.0</junit-jupiter.version>