Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Brun2011-01-20 10:31:15 +0000
committerCedric Brun2011-01-20 10:31:15 +0000
commit87f5fb2d007f4a7e10cbcd1688834e0da2367b65 (patch)
tree9ab854333a32c482f9b11d632656f235e0b5174b
parent1bcf586878069417648e10c1869875327db930f8 (diff)
downloadorg.eclipse.emf.compare-87f5fb2d007f4a7e10cbcd1688834e0da2367b65.tar.gz
org.eclipse.emf.compare-87f5fb2d007f4a7e10cbcd1688834e0da2367b65.tar.xz
org.eclipse.emf.compare-87f5fb2d007f4a7e10cbcd1688834e0da2367b65.zip
Bumping version numbers for the 1.1.2 release
-rw-r--r--packaging/org.eclipse.emf.compare.diff.edit.nl1/META-INF/MANIFEST.MF2
-rw-r--r--packaging/org.eclipse.emf.compare.diff.nl1/META-INF/MANIFEST.MF2
-rw-r--r--packaging/org.eclipse.emf.compare.match.nl1/META-INF/MANIFEST.MF2
-rw-r--r--packaging/org.eclipse.emf.compare.nl1/META-INF/MANIFEST.MF2
-rw-r--r--packaging/org.eclipse.emf.compare.ui.nl1/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.diff.edit/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.diff/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.doc/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.epatch.tests/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.epatch/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.examples.addressbook/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.examples.diff.extension/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.examples.export.library/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.examples.export.xslt/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.examples/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.match/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.mpatch.apply.generic/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.mpatch.apply/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.mpatch.binding/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.mpatch.common/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.mpatch.doc/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.mpatch.edit/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.mpatch.editor/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch.edit/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch.generic/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.mpatch.example/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.mpatch.generalize/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.mpatch.grouping/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.mpatch.test.eachonce/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.mpatch.test/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.mpatch.transform/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.mpatch/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.team.subversive/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/unit/diff/ThreeWayDiffTest.java11
-rw-r--r--plugins/org.eclipse.emf.compare.ui.capabilities/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF2
39 files changed, 47 insertions, 40 deletions
diff --git a/packaging/org.eclipse.emf.compare.diff.edit.nl1/META-INF/MANIFEST.MF b/packaging/org.eclipse.emf.compare.diff.edit.nl1/META-INF/MANIFEST.MF
index 4ec6e7a0b..6ad881b4a 100644
--- a/packaging/org.eclipse.emf.compare.diff.edit.nl1/META-INF/MANIFEST.MF
+++ b/packaging/org.eclipse.emf.compare.diff.edit.nl1/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: EMF Compare diff.edit internationalized messages
Bundle-SymbolicName: org.eclipse.emf.compare.diff.edit.nl1
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.emf.compare.diff.edit;bundle-version="0.9.0"
Bundle-Vendor: Eclipse.org
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/packaging/org.eclipse.emf.compare.diff.nl1/META-INF/MANIFEST.MF b/packaging/org.eclipse.emf.compare.diff.nl1/META-INF/MANIFEST.MF
index 684cc8f7a..5be295ed0 100644
--- a/packaging/org.eclipse.emf.compare.diff.nl1/META-INF/MANIFEST.MF
+++ b/packaging/org.eclipse.emf.compare.diff.nl1/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: EMF Compare diff internationalized messages
Bundle-SymbolicName: org.eclipse.emf.compare.diff.nl1
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.emf.compare.diff;bundle-version="0.9.0"
Bundle-Vendor: Eclipse.org
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/packaging/org.eclipse.emf.compare.match.nl1/META-INF/MANIFEST.MF b/packaging/org.eclipse.emf.compare.match.nl1/META-INF/MANIFEST.MF
index 6cfb6d16b..e1c73cebe 100644
--- a/packaging/org.eclipse.emf.compare.match.nl1/META-INF/MANIFEST.MF
+++ b/packaging/org.eclipse.emf.compare.match.nl1/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: EMF Compare match internationalized messages
Bundle-SymbolicName: org.eclipse.emf.compare.match.nl1
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.emf.compare.match;bundle-version="0.9.0"
Bundle-Vendor: Eclipse.org
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/packaging/org.eclipse.emf.compare.nl1/META-INF/MANIFEST.MF b/packaging/org.eclipse.emf.compare.nl1/META-INF/MANIFEST.MF
index ac3b84b8e..bacab1104 100644
--- a/packaging/org.eclipse.emf.compare.nl1/META-INF/MANIFEST.MF
+++ b/packaging/org.eclipse.emf.compare.nl1/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: EMF Compare core internationalized messages
Bundle-SymbolicName: org.eclipse.emf.compare.nl1
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.emf.compare;bundle-version="0.9.0"
Bundle-Vendor: Eclipse.org
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/packaging/org.eclipse.emf.compare.ui.nl1/META-INF/MANIFEST.MF b/packaging/org.eclipse.emf.compare.ui.nl1/META-INF/MANIFEST.MF
index a70285f7d..f54322822 100644
--- a/packaging/org.eclipse.emf.compare.ui.nl1/META-INF/MANIFEST.MF
+++ b/packaging/org.eclipse.emf.compare.ui.nl1/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: EMF Compare UI internationalized messages
Bundle-SymbolicName: org.eclipse.emf.compare.ui.nl1
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Fragment-Host: org.eclipse.emf.compare.ui;bundle-version="0.9.0"
Bundle-Vendor: Eclipse.org
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.emf.compare.diff.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.diff.edit/META-INF/MANIFEST.MF
index 4d9fa9456..441c505b7 100644
--- a/plugins/org.eclipse.emf.compare.diff.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.diff.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.compare.diff.edit; singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.compare.diff.provider.DiffEditPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.compare.diff/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.diff/META-INF/MANIFEST.MF
index b97a5eca2..fc4bd4823 100644
--- a/plugins/org.eclipse.emf.compare.diff/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.diff/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.compare.diff; singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.compare.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.doc/META-INF/MANIFEST.MF
index 09e35c696..a809ea03f 100644
--- a/plugins/org.eclipse.emf.compare.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.compare.doc; singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.emf.compare.epatch.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.epatch.tests/META-INF/MANIFEST.MF
index 638020988..24f547d51 100644
--- a/plugins/org.eclipse.emf.compare.epatch.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.epatch.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.compare.epatch.tests
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.compare.epatch;bundle-version="0.9.0",
org.eclipse.emf.compare.diff;bundle-version="0.9.0",
diff --git a/plugins/org.eclipse.emf.compare.epatch/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.epatch/META-INF/MANIFEST.MF
index 3926c6ae4..2714800ec 100644
--- a/plugins/org.eclipse.emf.compare.epatch/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.epatch/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.compare.epatch;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.3.0",
org.eclipse.emf.compare.diff;bundle-version="0.9.0",
diff --git a/plugins/org.eclipse.emf.compare.examples.addressbook/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.examples.addressbook/META-INF/MANIFEST.MF
index 46f6961cc..372e36284 100644
--- a/plugins/org.eclipse.emf.compare.examples.addressbook/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.examples.addressbook/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.compare.examples.addressbook; singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.compare.examples.addressbook.addressbook.provider.AddressbookEditPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.compare.examples.diff.extension/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.examples.diff.extension/META-INF/MANIFEST.MF
index 1ab39028d..ccdf3ddb4 100644
--- a/plugins/org.eclipse.emf.compare.examples.diff.extension/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.examples.diff.extension/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.compare.examples.diff.extension;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.compare.examples.export.library/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.examples.export.library/META-INF/MANIFEST.MF
index 4a7e77f47..31ba788d0 100644
--- a/plugins/org.eclipse.emf.compare.examples.export.library/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.examples.export.library/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.compare.examples.export.library; singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.compare.examples.export.library.provider.LibraryEditPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.compare.examples.export.xslt/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.examples.export.xslt/META-INF/MANIFEST.MF
index a439d9605..1395c44a2 100644
--- a/plugins/org.eclipse.emf.compare.examples.export.xslt/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.examples.export.xslt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Export differences Examples for EMF Compare
Bundle-SymbolicName: org.eclipse.emf.compare.examples.export.xslt;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-Activator: org.eclipse.emf.compare.examples.export.xslt.XSLTExportPlugin
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.emf.compare.examples/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.examples/META-INF/MANIFEST.MF
index 634250418..892c11404 100644
--- a/plugins/org.eclipse.emf.compare.examples/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.examples/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.compare.examples
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.emf.compare.match/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.match/META-INF/MANIFEST.MF
index de43d1880..2e8a97359 100644
--- a/plugins/org.eclipse.emf.compare.match/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.match/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.compare.match; singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.compare.mpatch.apply.generic/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.mpatch.apply.generic/META-INF/MANIFEST.MF
index 36fd05d2f..258f5fce1 100644
--- a/plugins/org.eclipse.emf.compare.mpatch.apply.generic/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.mpatch.apply.generic/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Generic MPatch Applier
Bundle-SymbolicName: org.eclipse.emf.compare.mpatch.apply.generic;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-Activator: org.eclipse.emf.compare.mpatch.apply.generic.GenericApplyActivator
Require-Bundle: org.eclipse.emf.compare.mpatch.apply
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.compare.mpatch.apply/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.mpatch.apply/META-INF/MANIFEST.MF
index aed1ca21c..dae487996 100644
--- a/plugins/org.eclipse.emf.compare.mpatch.apply/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.mpatch.apply/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: MPatch Application Plugin
Bundle-SymbolicName: org.eclipse.emf.compare.mpatch.apply;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-Activator: org.eclipse.emf.compare.mpatch.apply.ApplyActivator
Require-Bundle: org.eclipse.compare,
org.eclipse.ui.ide,
diff --git a/plugins/org.eclipse.emf.compare.mpatch.binding/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.mpatch.binding/META-INF/MANIFEST.MF
index 5103dfeeb..baea5214f 100644
--- a/plugins/org.eclipse.emf.compare.mpatch.binding/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.mpatch.binding/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Binding for applied MPatches
Bundle-SymbolicName: org.eclipse.emf.compare.mpatch.binding;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.compare.mpatch.edit;visibility:=reexport,
org.eclipse.emf.ecore.editor,
diff --git a/plugins/org.eclipse.emf.compare.mpatch.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.mpatch.common/META-INF/MANIFEST.MF
index 244c8be84..6123a91d8 100644
--- a/plugins/org.eclipse.emf.compare.mpatch.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.mpatch.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Commonly used fragments for MPatches
Bundle-SymbolicName: org.eclipse.emf.compare.mpatch.common;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.resources;visibility:=reexport,
org.eclipse.core.runtime;visibility:=reexport,
diff --git a/plugins/org.eclipse.emf.compare.mpatch.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.mpatch.doc/META-INF/MANIFEST.MF
index aff7b6fed..dd6c95728 100644
--- a/plugins/org.eclipse.emf.compare.mpatch.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.mpatch.doc/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Documentation of the MPatch Framework
Bundle-SymbolicName: org.eclipse.emf.compare.mpatch.doc;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-Vendor: Technical University of Denmark
diff --git a/plugins/org.eclipse.emf.compare.mpatch.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.mpatch.edit/META-INF/MANIFEST.MF
index 11e099093..4246f2382 100644
--- a/plugins/org.eclipse.emf.compare.mpatch.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.mpatch.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: MPatch editing support
Bundle-SymbolicName: org.eclipse.emf.compare.mpatch.edit;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.compare.mpatch.provider.MPatchEditPlugin$Implementation
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.compare.mpatch.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.mpatch.editor/META-INF/MANIFEST.MF
index 510295090..672f471bc 100644
--- a/plugins/org.eclipse.emf.compare.mpatch.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.mpatch.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: MPatch Editor
Bundle-SymbolicName: org.eclipse.emf.compare.mpatch.editor;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.compare.mpatch.presentation.MPatchEditorPlugin$Implementation
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch.edit/META-INF/MANIFEST.MF
index 032fe6365..a9341cd47 100644
--- a/plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.compare.mpatch.emfdiff2mpatch.edit;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.compare.mpatch.EditPlugin$Implementation
Bundle-Vendor: Technical University of Denmark
diff --git a/plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch.generic/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch.generic/META-INF/MANIFEST.MF
index 559b10667..bdc69028f 100644
--- a/plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch.generic/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch.generic/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Generic emfdiff2mpatch creators
Bundle-SymbolicName: org.eclipse.emf.compare.mpatch.emfdiff2mpatch.generic;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-Activator: org.eclipse.emf.compare.mpatch.emfdiff2mpatch.generic.Activator
Require-Bundle: org.eclipse.emf.compare.mpatch.common,
org.eclipse.emf.ecore.edit,
diff --git a/plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch/META-INF/MANIFEST.MF
index f85a42638..8ec6c9ccc 100644
--- a/plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.mpatch.emfdiff2mpatch/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Emfdiff to MPatch Transformation
Bundle-SymbolicName: org.eclipse.emf.compare.mpatch.emfdiff2mpatch;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Require-Bundle: org.eclipse.emf.ecore.xmi,
org.eclipse.emf.compare.mpatch.common,
org.eclipse.emf.compare.diff,
diff --git a/plugins/org.eclipse.emf.compare.mpatch.example/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.mpatch.example/META-INF/MANIFEST.MF
index 5858e571a..c2c9fcc93 100644
--- a/plugins/org.eclipse.emf.compare.mpatch.example/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.mpatch.example/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: MPatch Example Models
Bundle-SymbolicName: org.eclipse.emf.compare.mpatch.example
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-Vendor: Technical University of Denmark
diff --git a/plugins/org.eclipse.emf.compare.mpatch.generalize/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.mpatch.generalize/META-INF/MANIFEST.MF
index 5c0a2cc78..1ca8d1028 100644
--- a/plugins/org.eclipse.emf.compare.mpatch.generalize/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.mpatch.generalize/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Generalize MPatches
Bundle-SymbolicName: org.eclipse.emf.compare.mpatch.generalize;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-Activator: org.eclipse.emf.compare.mpatch.generalize.GeneralizeActivator
Require-Bundle: org.eclipse.emf.compare.mpatch.common,
org.eclipse.emf.compare.mpatch.emfdiff2mpatch.generic
diff --git a/plugins/org.eclipse.emf.compare.mpatch.grouping/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.mpatch.grouping/META-INF/MANIFEST.MF
index bb2fae276..ea22b2c2c 100644
--- a/plugins/org.eclipse.emf.compare.mpatch.grouping/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.mpatch.grouping/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Restructuring MPatches
Bundle-SymbolicName: org.eclipse.emf.compare.mpatch.grouping;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-Activator: org.eclipse.emf.compare.mpatch.grouping.GroupingActivator
Require-Bundle: org.eclipse.emf.ecore.xmi,
org.eclipse.emf.compare.mpatch.common
diff --git a/plugins/org.eclipse.emf.compare.mpatch.test.eachonce/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.mpatch.test.eachonce/META-INF/MANIFEST.MF
index c0ccf6ea1..f1f2d9db9 100644
--- a/plugins/org.eclipse.emf.compare.mpatch.test.eachonce/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.mpatch.test.eachonce/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Test meta model for MPatches
Bundle-SymbolicName: org.eclipse.emf.compare.mpatch.test.eachonce;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-ClassPath: .
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.emf.compare.mpatch.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.mpatch.test/META-INF/MANIFEST.MF
index 9c9f7dd02..e3521867d 100644
--- a/plugins/org.eclipse.emf.compare.mpatch.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.mpatch.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: MPatch Tests
Bundle-SymbolicName: org.eclipse.emf.compare.mpatch.test
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Require-Bundle: org.eclipse.emf.compare.mpatch.emfdiff2mpatch,
org.eclipse.emf.compare.mpatch.transform,
org.junit4,
diff --git a/plugins/org.eclipse.emf.compare.mpatch.transform/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.mpatch.transform/META-INF/MANIFEST.MF
index c36274931..d1e852f46 100644
--- a/plugins/org.eclipse.emf.compare.mpatch.transform/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.mpatch.transform/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Miscellaneous MPatch Transformations
Bundle-SymbolicName: org.eclipse.emf.compare.mpatch.transform;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-Activator: org.eclipse.emf.compare.mpatch.transform.TransformActivator
Require-Bundle: org.eclipse.emf.ecore.xmi,
org.eclipse.emf.compare.mpatch.common,
diff --git a/plugins/org.eclipse.emf.compare.mpatch/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.mpatch/META-INF/MANIFEST.MF
index f6d1666ac..0b4b2b60a 100644
--- a/plugins/org.eclipse.emf.compare.mpatch/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.mpatch/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: MPatch
Bundle-SymbolicName: org.eclipse.emf.compare.mpatch;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Technical University of Denmark
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.emf.compare.team.subversive/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.team.subversive/META-INF/MANIFEST.MF
index 37f2af3af..e72ac0919 100644
--- a/plugins/org.eclipse.emf.compare.team.subversive/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.team.subversive/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.compare.team.subversive;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-Activator: org.eclipse.emf.compare.team.subversive.EMFCompareSVNPlugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.compare.ui,
diff --git a/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF
index 752258ba8..421097704 100644
--- a/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.compare.tests;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.emf.compare.tests,
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/unit/diff/ThreeWayDiffTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/unit/diff/ThreeWayDiffTest.java
index 5f9000328..ae323e808 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/unit/diff/ThreeWayDiffTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/unit/diff/ThreeWayDiffTest.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.emf.compare.tests.unit.diff;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -29,6 +30,7 @@ import org.eclipse.emf.compare.match.metamodel.MatchModel;
import org.eclipse.emf.compare.match.service.MatchService;
import org.eclipse.emf.compare.tests.util.EcoreModelUtils;
import org.eclipse.emf.compare.util.EFactory;
+import org.eclipse.emf.compare.util.ModelUtils;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -58,7 +60,7 @@ public class ThreeWayDiffTest extends TestCase {
* @throws FactoryException
* Thrown if the comparison fails somehow.
*/
- public void test3WayDiffDifferentModelsLocalChange() throws FactoryException {
+ public void test3WayDiffDifferentModelsLocalChange() throws Exception {
final int writerCount = 3;
final int bookPerWriterCount = 5;
final long seed = System.nanoTime();
@@ -303,8 +305,10 @@ public class ThreeWayDiffTest extends TestCase {
* failures, we expect to find a RemoteRemoveModelElement and a RemoteUpdateAttribute in the result.
* Externalized here to avoid copy/pasting within the two tests making use of it.
* </p>
+ *
+ * @throws IOException
*/
- private void internalTest3WayDistinctModelsLocalChange() {
+ private void internalTest3WayDistinctModelsLocalChange() throws IOException {
internalModifyModel(testResource2.getContents().get(0));
MatchModel match = null;
@@ -331,6 +335,9 @@ public class ThreeWayDiffTest extends TestCase {
}
}
+ String v1 = ModelUtils.serialize(testResource1.getContents().get(0));
+ String v2 = ModelUtils.serialize(testResource2.getContents().get(0));
+
// We're expecting two changes, one of which being an addition
assertEquals("Unexpected count of differences.", 2, elementCount);
assertEquals("Unexpected count of additions in the DiffModel.", 1, additionCount);
diff --git a/plugins/org.eclipse.emf.compare.ui.capabilities/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.ui.capabilities/META-INF/MANIFEST.MF
index f0a177173..0f964ff55 100644
--- a/plugins/org.eclipse.emf.compare.ui.capabilities/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.ui.capabilities/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.compare.ui.capabilities;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui
diff --git a/plugins/org.eclipse.emf.compare.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.ui/META-INF/MANIFEST.MF
index fd5266970..68ff66049 100644
--- a/plugins/org.eclipse.emf.compare.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.compare.ui;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-ClassPath: .
Bundle-Localization: plugin
Bundle-Activator: org.eclipse.emf.compare.ui.EMFCompareUIPlugin
diff --git a/plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF
index 96f35a2d4..207d39161 100644
--- a/plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.compare;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.compare.EMFComparePlugin
Bundle-Localization: plugin

Back to the top