From 6650310405447e2cf6ef779f3c489294719c4d73 Mon Sep 17 00:00:00 2001
From: jmisinco
Date: Fri, 15 May 2015 09:44:27 -0700
Subject: feature: Mars

Change-Id: Iad26c57040c98e9455e67b7caa94da6da27e2ab5
---
 features/org.eclipse.osee.external.feature/pom.xml         |  2 ++
 features/org.eclipse.osee.x.core.external.feature/pom.xml  |  9 +++++++++
 features/org.eclipse.osee.x.core.feature/feature.xml       |  2 +-
 .../org.eclipse.osee.x.server.external.feature/feature.xml | 14 +++++++-------
 .../org.eclipse.osee.x.server.external.feature/pom.xml     |  7 +++++++
 5 files changed, 26 insertions(+), 8 deletions(-)

(limited to 'features')

diff --git a/features/org.eclipse.osee.external.feature/pom.xml b/features/org.eclipse.osee.external.feature/pom.xml
index 8273c382d43..2659331193b 100644
--- a/features/org.eclipse.osee.external.feature/pom.xml
+++ b/features/org.eclipse.osee.external.feature/pom.xml
@@ -37,6 +37,8 @@
 								<plugin id="net.jini" />
 								<plugin id="org.json" />
 								<plugin id="org.apache.cxf.core.config" />
+								<plugin id="ch.qos.logback.slf4j" />
+								<plugin id="javax.ws.rs" />
 							</excludes>
 						</configuration>
 					</execution>
diff --git a/features/org.eclipse.osee.x.core.external.feature/pom.xml b/features/org.eclipse.osee.x.core.external.feature/pom.xml
index c2d3fb0c049..6011bcb3a9d 100644
--- a/features/org.eclipse.osee.x.core.external.feature/pom.xml
+++ b/features/org.eclipse.osee.x.core.external.feature/pom.xml
@@ -27,6 +27,7 @@
 							<excludes>
 								<plugin id="org.apache.xerces" />
 								<plugin id="javax.servlet" />
+								<plugin id="javax.ws.rs" />
 								<plugin id="javax.xml" />
 								<plugin id="org.apache.xml.resolver" />
 								<plugin id="org.apache.xml.serializer" />
@@ -36,6 +37,14 @@
 								<plugin id="org.eclipse.persistence.moxy" />
 								<plugin id="org.apache.cxf.core.config" />
 								<plugin id="org.eclipse.oss.ajax" />
+								<plugin id="org.eclipse.jetty.continuation" />
+								<plugin id="org.eclipse.jetty.http" />
+								<plugin id="org.eclipse.jetty.io" />
+								<plugin id="org.eclipse.jetty.security" />
+								<plugin id="org.eclipse.jetty.server" />
+								<plugin id="org.eclipse.jetty.servlet" />
+								<plugin id="org.eclipse.jetty.util" />
+								<plugin id="ch.qos.logback.slf4j" />
 							</excludes>
 						</configuration>
 					</execution>
diff --git a/features/org.eclipse.osee.x.core.feature/feature.xml b/features/org.eclipse.osee.x.core.feature/feature.xml
index f48da6a73f5..bc1a6055e3c 100644
--- a/features/org.eclipse.osee.x.core.feature/feature.xml
+++ b/features/org.eclipse.osee.x.core.feature/feature.xml
@@ -32,7 +32,7 @@
       <import plugin="javax.servlet" version="3.0.0" match="equivalent"/>
       <import plugin="javax.ws.rs" version="2.0.0" match="greaterOrEqual"/>
       <import plugin="com.google.guava" version="11.0.0" match="greaterOrEqual"/>
-      <import plugin="org.junit"/>
+      <import plugin="org.junit" version="4.11.0" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.osee.x.server.external.feature/feature.xml b/features/org.eclipse.osee.x.server.external.feature/feature.xml
index 188efc3b3c1..0ecc123c56f 100644
--- a/features/org.eclipse.osee.x.server.external.feature/feature.xml
+++ b/features/org.eclipse.osee.x.server.external.feature/feature.xml
@@ -33,13 +33,13 @@
       <import plugin="org.eclipse.equinox.app"/>
       <import plugin="org.eclipse.equinox.security"/>
       <import plugin="org.eclipse.equinox.common"/>
-      <import plugin="org.eclipse.jetty.continuation" version="8.1.10" match="compatible"/>
-      <import plugin="org.eclipse.jetty.http" version="8.1.10" match="compatible"/>
-      <import plugin="org.eclipse.jetty.io" version="8.1.10" match="compatible"/>
-      <import plugin="org.eclipse.jetty.security" version="8.1.10" match="compatible"/>
-      <import plugin="org.eclipse.jetty.server" version="8.1.10" match="compatible"/>
-      <import plugin="org.eclipse.jetty.servlet" version="8.1.10" match="compatible"/>
-      <import plugin="org.eclipse.jetty.util" version="8.1.10" match="compatible"/>
+      <import plugin="org.eclipse.jetty.continuation"/>
+      <import plugin="org.eclipse.jetty.http"/>
+      <import plugin="org.eclipse.jetty.io"/>
+      <import plugin="org.eclipse.jetty.security"/>
+      <import plugin="org.eclipse.jetty.server"/>
+      <import plugin="org.eclipse.jetty.servlet"/>
+      <import plugin="org.eclipse.jetty.util"/>
       <import plugin="com.google.guava" version="11.0.0" match="greaterOrEqual"/>
       <import plugin="com.google.gson" version="2.1.0" match="greaterOrEqual"/>
       <import plugin="org.apache.commons.dbcp" version="1.4.0" match="compatible"/>
diff --git a/features/org.eclipse.osee.x.server.external.feature/pom.xml b/features/org.eclipse.osee.x.server.external.feature/pom.xml
index cd0ff8c5d41..6904fe7ca61 100644
--- a/features/org.eclipse.osee.x.server.external.feature/pom.xml
+++ b/features/org.eclipse.osee.x.server.external.feature/pom.xml
@@ -28,6 +28,13 @@
 								<plugin id="org.aopalliance" />
 								<plugin id="javax.servlet" />
 								<plugin id="com.google.gson" />
+								<plugin id="org.eclipse.jetty.continuation" />
+								<plugin id="org.eclipse.jetty.http" />
+								<plugin id="org.eclipse.jetty.io" />
+								<plugin id="org.eclipse.jetty.security" />
+								<plugin id="org.eclipse.jetty.server" />
+								<plugin id="org.eclipse.jetty.servlet" />
+								<plugin id="org.eclipse.jetty.util" />
 							</excludes>
 						</configuration>
 					</execution>
-- 
cgit v1.2.3