From 84ff4e5fd52c064437d0b6dcf43b2223f440b3c5 Mon Sep 17 00:00:00 2001
From: Jan Srnicek <jsrnicek@cisco.com>
Date: Fri, 30 Jun 2017 12:46:56 +0200
Subject: HONEYCOMB-373 - Separate minimal distribution modules to core module

Change-Id: I5278f91ea06f57c84b44a8458ef44469ebd0cf84
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
---
 common/impl-parent/pom.xml                 |  7 ++++
 common/minimal-distribution-parent/pom.xml | 53 ------------------------------
 2 files changed, 7 insertions(+), 53 deletions(-)

(limited to 'common')

diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml
index 65fb573c3..832bb1adf 100644
--- a/common/impl-parent/pom.xml
+++ b/common/impl-parent/pom.xml
@@ -34,6 +34,7 @@
     <guice.config.version>1.2.0</guice.config.version>
     <skinny.logback.version>1.0.8</skinny.logback.version>
     <maven-resources-plugin.version>3.0.2</maven-resources-plugin.version>
+      <jetty.version>9.3.11.v20160721</jetty.version>
   </properties>
 
   <dependencyManagement>
@@ -67,6 +68,12 @@
         <version>${guice.version}</version>
         <scope>test</scope>
       </dependency>
+        <!-- Server -->
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>${jetty.version}</version>
+        </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/common/minimal-distribution-parent/pom.xml b/common/minimal-distribution-parent/pom.xml
index 617509b96..281c88cb4 100644
--- a/common/minimal-distribution-parent/pom.xml
+++ b/common/minimal-distribution-parent/pom.xml
@@ -34,65 +34,12 @@
         <exec.parameters>-Xms32m -Xmx128m -XX:MetaspaceSize=32m -XX:MaxMetaspaceSize=128m</exec.parameters>
         <exec.parameters.minimal>-client -Xms20m -Xmx32m -XX:MetaspaceSize=5m -XX:MaxMetaspaceSize=32m -XX:MaxMetaspaceExpansion=1m -Xss512k -XX:+UseSerialGC -Djava.compiler=NONE -Xverify:none -noverify</exec.parameters.minimal>
 
-        <!-- Jersey versions to run RESTCONF-->
-        <jersey.version>1.19.1</jersey.version>
-        <jetty.version>9.3.11.v20160721</jetty.version>
-        <servlet.version>3.1.0</servlet.version>
-        <!-- Used by mdsal as provided/runtime dependency-->
-        <osgi.core.version>5.0.0</osgi.core.version>
         <!-- Use /dev/urandom instead of /dev/random during tests to speed up execution
             http://stackoverflow.com/questions/137212/how-to-solve-performance-problem-with-java-securerandom
         -->
         <random.seed.file>/dev/./urandom</random.seed.file>
     </properties>
 
-    <dependencyManagement>
-        <dependencies>
-            <!-- Jersey + Jetty for RESTCONF -->
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-server</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>${servlet.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-webapp</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlets</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-server</artifactId>
-                <version>${jersey.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-core</artifactId>
-                <version>${jersey.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-servlet</artifactId>
-                <version>${jersey.version}</version>
-            </dependency>
-            <!-- OSGI Even tough not running in OSGI, dependency needs to be here since some deprecated MD-SAL APIs rely on osgi core -->
-            <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.core</artifactId>
-                <version>${osgi.core.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <!-- Generate executable shell script -->
     <build>
         <pluginManagement>
-- 
cgit 1.2.3-korg