Fix conflicts in libraries/pom.xml

2017-09-20 07:05:50 +01:00
parent 28ad804484 90a102ec47
commit ebbffc335d
261 changed files with 4522 additions and 1780 deletions
@@ -46,11 +46,13 @@
        <module>core-java</module>
        <module>core-java-8</module>
        <module>core-java-concurrency</module>
-        <module>couchbase-sdk</module>
+        <module>couchbase</module>

        <module>deltaspike</module>
        <module>dozer</module>

+        <module>ethereumj</module>
+
        <!--<module>ejb</module>-->

        <module>feign</module>
@@ -58,7 +60,7 @@

        <!-- <module>gatling</module> --> <!-- not meant to run as part of the standard build -->

-
+        <module>geotools</module>
        <module>groovy-spock</module>
        <module>gson</module>
        <module>guava</module>