diff options
| author | Roberto E. Escobar | 2013-06-18 01:06:45 +0000 |
|---|---|---|
| committer | Roberto E. Escobar | 2013-06-26 22:19:13 +0000 |
| commit | 40587061c4457256bfccc3187410aae64ae05cc4 (patch) | |
| tree | 64aedb32b617c23ed081c27de30f8a427ff23ad3 /features/org.eclipse.osee.framework.ui.feature | |
| parent | 6e2fa637f5f2869a5d271b4644c32655744fdbbe (diff) | |
| download | org.eclipse.osee-40587061c4457256bfccc3187410aae64ae05cc4.tar.gz org.eclipse.osee-40587061c4457256bfccc3187410aae64ae05cc4.tar.xz org.eclipse.osee-40587061c4457256bfccc3187410aae64ae05cc4.zip | |
feature[ats_0B926]: Upgrade to Eclipse 4.3
Remove EMF compare use
Update tests for junit 4.11.0
Update launch configs
Update google guava version ranges
Fix server demo data deployment
Change-Id: I388aafb3caaaf0791a01978a4ee49acb07decebe
Diffstat (limited to 'features/org.eclipse.osee.framework.ui.feature')
| -rw-r--r-- | features/org.eclipse.osee.framework.ui.feature/feature.xml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/features/org.eclipse.osee.framework.ui.feature/feature.xml b/features/org.eclipse.osee.framework.ui.feature/feature.xml index 1496574bbfb..7406f77e326 100644 --- a/features/org.eclipse.osee.framework.ui.feature/feature.xml +++ b/features/org.eclipse.osee.framework.ui.feature/feature.xml @@ -73,13 +73,10 @@ <import plugin="org.eclipse.xtext"/> <import plugin="org.eclipse.core.commands"/> <import plugin="org.eclipse.core.jobs"/> - <import plugin="org.eclipse.emf.compare.diff"/> - <import plugin="org.eclipse.emf.compare.ui"/> <import plugin="org.eclipse.osee.framework.core.dsl.integration"/> <import plugin="org.eclipse.swt"/> <import plugin="org.eclipse.osgi"/> - <import plugin="com.google.guava" version="10.0.1.v201203051515" match="perfect"/> - <import plugin="com.google.guava" version="12.0.0" match="greaterOrEqual"/> + <import plugin="com.google.guava" version="11.0.0" match="greaterOrEqual"/> <import plugin="org.eclipse.jdt.core"/> </requires> |