[BAEL-10866] - Resolved conflicts

2018-12-22 18:58:28 +05:30
parent 78735f582b 5e02becb5e
commit afe4a98944
239 changed files with 3435 additions and 3002 deletions
@@ -429,13 +429,6 @@
        </plugins>
    </build>

-    <repositories>
-        <repository>
-            <id>Apache Staging</id>
-            <url>https://repository.apache.org/content/groups/staging</url>
-        </repository>
-    </repositories>
-
    <properties>
        <storm.version>1.2.2</storm.version>
        <kryo.version>4.0.1</kryo.version>