From c1254b42793bb724593e0f6b0aba693fcfc54ca8 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@oath.com>
Date: Tue, 4 Sep 2018 15:39:42 +0200
Subject: Export searchcore config

Export searchcore config and include it in model-evaluation.
Not needed by other modules, and if it were it should probably move
to searchlib.
---
 model-evaluation/pom.xml                                           | 1 -
 searchcore/pom.xml                                                 | 3 ++-
 .../src/main/java/com/yahoo/vespa/config/search/package-info.java  | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 searchcore/src/main/java/com/yahoo/vespa/config/search/package-info.java

diff --git a/model-evaluation/pom.xml b/model-evaluation/pom.xml
index 0b6a5d08155..328d475c501 100644
--- a/model-evaluation/pom.xml
+++ b/model-evaluation/pom.xml
@@ -42,7 +42,6 @@
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>searchcore</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
diff --git a/searchcore/pom.xml b/searchcore/pom.xml
index 3b43bf1205e..002ba1f508f 100644
--- a/searchcore/pom.xml
+++ b/searchcore/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -11,8 +12,8 @@
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <artifactId>searchcore</artifactId>
-  <version>6-SNAPSHOT</version>
   <packaging>jar</packaging>
+  <version>6-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <dependencies>
     <dependency>
diff --git a/searchcore/src/main/java/com/yahoo/vespa/config/search/package-info.java b/searchcore/src/main/java/com/yahoo/vespa/config/search/package-info.java
new file mode 100644
index 00000000000..0e739ec238c
--- /dev/null
+++ b/searchcore/src/main/java/com/yahoo/vespa/config/search/package-info.java
@@ -0,0 +1,7 @@
+// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+@ExportPackage
+package com.yahoo.vespa.config.search;
+
+import com.yahoo.osgi.annotation.ExportPackage;
+
-- 
cgit v1.2.3