From eef3f7c477de9033584da18f830694211f1c180f Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@oath.com>
Date: Thu, 23 Nov 2017 08:45:52 +0100
Subject: Add support for downloading from another config server

If a request for a file reference cannot be fulfilled, ask another
config server for the file. Handle connection errors when downloading files.

Fixed bundle issues.
---
 filedistribution/pom.xml | 41 +++++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

(limited to 'filedistribution/pom.xml')

diff --git a/filedistribution/pom.xml b/filedistribution/pom.xml
index 288b641134f..41622792e43 100644
--- a/filedistribution/pom.xml
+++ b/filedistribution/pom.xml
@@ -3,7 +3,19 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
                              http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.yahoo.vespa</groupId>
+        <artifactId>parent</artifactId>
+        <version>6-SNAPSHOT</version>
+   </parent>
+
+    <artifactId>filedistribution</artifactId>
+    <version>6-SNAPSHOT</version>
+    <packaging>container-plugin</packaging>
+    <name>${project.artifactId}</name>
+
     <dependencies>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
@@ -29,6 +41,13 @@
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>config</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.yahoo.vespa</groupId>
+            <artifactId>config-lib</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -40,13 +59,15 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <parent>
-    <groupId>com.yahoo.vespa</groupId>
-    <artifactId>parent</artifactId>
-    <version>6-SNAPSHOT</version>
-  </parent>
-  <artifactId>filedistribution</artifactId>
-  <version>6-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  <name>${project.artifactId}</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.yahoo.vespa</groupId>
+                <artifactId>bundle-plugin</artifactId>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
-- 
cgit v1.2.3