Merge branch 'develop' into feature/cocoa_pods_options

pom.xml

@@ -15,14 +15,7 @@
     </parent>
 
     <dependencies>
-
-        <!--Android store upload library-->
-        <dependency>
-            <groupId>com.google.apis</groupId>
-            <artifactId>google-api-services-androidpublisher</artifactId>
-            <version>v3-rev24-1.25.0</version>
-        </dependency>
-
+        <!-- Spring boot -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
@@ -32,21 +25,17 @@
             <artifactId>spring-web</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.8.10</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
         </dependency>
+        <!-- Unit testing -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
             <version>5.0.0-M4</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
         <!-- For reading YAML files -->
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
@@ -59,13 +48,18 @@
         <artifactId>spring-boot-starter-freemarker</artifactId>
         <version>1.5.7.RELEASE</version>
         </dependency>
-
         <!-- plist reading and writing PLists -->
         <dependency>
             <groupId>com.googlecode.plist</groupId>
             <artifactId>dd-plist</artifactId>
             <version>1.20</version>
         </dependency>
+        <!--Android store upload library-->
+        <dependency>
+            <groupId>com.google.apis</groupId>
+            <artifactId>google-api-services-androidpublisher</artifactId>
+            <version>v3-rev24-1.25.0</version>
+        </dependency>
     </dependencies>
 
     <repositories>
@@ -140,7 +134,6 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <source>1.6</source>
-
                     <target>1.6</target>
                 </configuration>
             </plugin>