Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-common/liquidnet-common-base/pom.xml

@@ -48,8 +48,8 @@
             <artifactId>geodesy</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.gavaghan</groupId>
-            <artifactId>geodesy</artifactId>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
         </dependency>
     </dependencies>
 

liquidnet-bus-common/liquidnet-common-service-base/pom.xml

@@ -29,12 +29,6 @@
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-web</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-common-swagger</artifactId>

liquidnet-bus-common/liquidnet-common-web/pom.xml

@@ -11,12 +11,13 @@
 	<artifactId>liquidnet-common-web</artifactId>
 	<dependencies>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-service-base</artifactId>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
     </dependencies>