Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2015-05-15 16:44:27 +0000
committerAngel Avila2015-09-12 00:43:19 +0000
commit6650310405447e2cf6ef779f3c489294719c4d73 (patch)
tree243ec184914151f0fa0c59ddeeeb6049b4f2e79e /features
parentbb7addad283583a104c409c0ba3121bbe3d6a74c (diff)
downloadorg.eclipse.osee-6650310405447e2cf6ef779f3c489294719c4d73.tar.gz
org.eclipse.osee-6650310405447e2cf6ef779f3c489294719c4d73.tar.xz
org.eclipse.osee-6650310405447e2cf6ef779f3c489294719c4d73.zip
feature: Mars
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.osee.external.feature/pom.xml2
-rw-r--r--features/org.eclipse.osee.x.core.external.feature/pom.xml9
-rw-r--r--features/org.eclipse.osee.x.core.feature/feature.xml2
-rw-r--r--features/org.eclipse.osee.x.server.external.feature/feature.xml14
-rw-r--r--features/org.eclipse.osee.x.server.external.feature/pom.xml7
5 files changed, 26 insertions, 8 deletions
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>

Back to the top