diff options
| author | jmisinco | 2015-04-24 12:35:53 +0000 |
|---|---|---|
| committer | jmisinco | 2015-04-24 12:35:53 +0000 |
| commit | 8b3c5ec60fbe9339cd0e71e59c9beefb489cc00b (patch) | |
| tree | ffe0acb742f047e5cecc78247a361efa0cd03e8a /features | |
| parent | e336a127c7645b5e1f076336d35ebbe494208fef (diff) | |
| download | org.eclipse.osee-8b3c5ec60fbe9339cd0e71e59c9beefb489cc00b.tar.gz org.eclipse.osee-8b3c5ec60fbe9339cd0e71e59c9beefb489cc00b.tar.xz org.eclipse.osee-8b3c5ec60fbe9339cd0e71e59c9beefb489cc00b.zip | |
feature: Luna, Java8, Tycho 0.22
Change-Id: I4551f5c5644cf10619c788ca6bfb18597eab550c
Diffstat (limited to 'features')
5 files changed, 7 insertions, 3 deletions
diff --git a/features/org.eclipse.osee.external.feature/feature.xml b/features/org.eclipse.osee.external.feature/feature.xml index c581bd8ee58..6364b182681 100644 --- a/features/org.eclipse.osee.external.feature/feature.xml +++ b/features/org.eclipse.osee.external.feature/feature.xml @@ -24,7 +24,7 @@ <import plugin="org.eclipse.osgi.services"/> <import plugin="org.eclipse.core.runtime"/> <import plugin="javax.xml" version="1.3.4" match="compatible"/> - <import plugin="javax.servlet" version="2.5.0" match="greaterOrEqual"/> + <import plugin="javax.servlet" version="3.0.0" match="equivalent"/> <import plugin="org.apache.xml.resolver" version="1.2.0" match="compatible"/> <import plugin="org.apache.xml.serializer" version="2.7.1" match="compatible"/> <import feature="org.eclipse.nebula.widgets.xviewer.feature" version="0.0.0" match="greaterOrEqual"/> 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 ff085b48f78..f5b22d67fcf 100644 --- a/features/org.eclipse.osee.x.core.external.feature/pom.xml +++ b/features/org.eclipse.osee.x.core.external.feature/pom.xml @@ -26,10 +26,12 @@ <configuration> <excludes> <plugin id="org.apache.xerces" /> + <plugin id="javax.servlet" /> <plugin id="javax.xml" /> <plugin id="org.apache.xml.resolver" /> <plugin id="org.apache.xml.serializer" /> <plugin id="org.json" /> + <plugin id="org.eclipse.persistence.asm" /> <plugin id="org.eclipse.persistence.core" /> <plugin id="org.eclipse.persistence.moxy" /> <plugin id="org.apache.cxf.core.config" /> diff --git a/features/org.eclipse.osee.x.core.feature/feature.xml b/features/org.eclipse.osee.x.core.feature/feature.xml index 32e44580d95..77bc500abb5 100644 --- a/features/org.eclipse.osee.x.core.feature/feature.xml +++ b/features/org.eclipse.osee.x.core.feature/feature.xml @@ -29,7 +29,7 @@ <import plugin="org.apache.commons.codec"/> <import plugin="org.apache.xerces"/> <import plugin="javax.mail.glassfish"/> - <import plugin="javax.servlet" version="2.5.0" match="greaterOrEqual"/> + <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"/> 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 7710ff7ae62..af953924580 100644 --- a/features/org.eclipse.osee.x.server.external.feature/pom.xml +++ b/features/org.eclipse.osee.x.server.external.feature/pom.xml @@ -26,6 +26,8 @@ <configuration> <excludes> <plugin id="org.aopalliance" /> + <plugin id="javax.servlet" /> + <plugin id="com.google.gson" /> </excludes> </configuration> </execution> diff --git a/features/org.eclipse.osee.x.server.feature/feature.xml b/features/org.eclipse.osee.x.server.feature/feature.xml index d4406b1bdbb..06da8f5dec3 100644 --- a/features/org.eclipse.osee.x.server.feature/feature.xml +++ b/features/org.eclipse.osee.x.server.feature/feature.xml @@ -42,7 +42,7 @@ version="0.0.0"/> <requires> - <import plugin="javax.servlet"/> + <import plugin="javax.servlet" version="3.0.0" match="equivalent"/> <import plugin="org.eclipse.osgi"/> <import plugin="org.apache.commons.lang" version="2.6.0" match="greaterOrEqual"/> </requires> |