From 569cc84d80473a58d805f80693db5590dafc90ce Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Wed, 25 Sep 2019 15:21:48 +0200
Subject: Sort properties lexically, and group according to type.

---
 parent/pom.xml | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'parent')

diff --git a/parent/pom.xml b/parent/pom.xml
index 7efe36e73f7..0404249571f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -766,11 +766,9 @@
         <apache.httpclient.version>4.4.1</apache.httpclient.version>
         <apache.httpcore.version>4.4.1</apache.httpcore.version>
         <asm.version>7.0</asm.version>
-        <aws.sdk.version>1.11.542</aws.sdk.version>
-        <jna.version>4.5.2</jna.version>
-        <tensorflow.version>1.12.0</tensorflow.version>
-        <!-- Athenz dependencies. Make sure these dependencies matches those in Vespa's internal repositories -->
+        <!-- Athenz dependencies. Make sure these dependencies match those in Vespa's internal repositories -->
         <athenz.version>1.8.29</athenz.version>
+        <aws.sdk.version>1.11.542</aws.sdk.version>
         <commons-lang.version>2.6</commons-lang.version>
         <!-- WARNING: If you change curator version, you also need to update
                  zkfacade/src/main/java/org/apache/curator/**/package-info.java
@@ -779,16 +777,20 @@
                      xargs perl -pi -e 's/major = [0-9]+, minor = [0-9]+, micro = [0-9]+/major = 2, minor = 9, micro = 1/g'
         -->
         <curator.version>2.9.1</curator.version>
-        <maven-shade-plugin.version>3.2.1</maven-shade-plugin.version>
-        <maven-plugin-tools.version>3.6.0</maven-plugin-tools.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <test.hide>true</test.hide>
-        <doclint>all</doclint>
-        <surefire.version>2.22.0</surefire.version>
+        <jna.version>4.5.2</jna.version>
         <junit.version>5.4.2</junit.version>
+        <maven-plugin-tools.version>3.6.0</maven-plugin-tools.version>
+        <maven-shade-plugin.version>3.2.1</maven-shade-plugin.version>
         <prometheus.client.version>0.6.0</prometheus.client.version>
         <protobuf.version>3.7.0</protobuf.version>
+        <surefire.version>2.22.0</surefire.version>
+        <tensorflow.version>1.12.0</tensorflow.version>
+
+        <doclint>all</doclint>
+        <test.hide>true</test.hide>
+
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
 
 </project>
-- 
cgit v1.2.3