From f07ea2d3f979a635e0039923bae13f9b2910f102 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@verizonmedia.com>
Date: Thu, 4 Apr 2019 12:51:18 +0200
Subject: Order dependencies on scope

Also change scope of 'annotations' to provided.
---
 service-monitor/pom.xml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'service-monitor/pom.xml')

diff --git a/service-monitor/pom.xml b/service-monitor/pom.xml
index 0826826f433..338f0331f9d 100644
--- a/service-monitor/pom.xml
+++ b/service-monitor/pom.xml
@@ -16,6 +16,16 @@
     <description>Service monitor component for hosted vespa.</description>
 
     <dependencies>
+        <!-- compile scope -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5</version>
+            <!-- This is necessary to get 4.4's HostnameVerifier API of SSLConnectionSocketFactory::new -->
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- provided scope -->
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>config</artifactId>
@@ -68,6 +78,7 @@
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>annotations</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
@@ -97,13 +108,8 @@
             <artifactId>jackson-databind</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5</version>
-            <!-- This is necessary to get 4.4's HostnameVerifier API of SSLConnectionSocketFactory::new -->
-            <scope>compile</scope>
-        </dependency>
+
+        <!-- test scope -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-- 
cgit v1.2.3