[493650] Fix order of merged children

Improved after discussion with Laurent Goubet.
A test is added to check that when merging every diff
and resolving conflicts by:
- first reject all target side conflicting diffs
- then accepting all other diffs
yields models to be identical on both sides, no matter
in what order the diffs are accepted/rejected.
The test uses Collections2.permutations,
which appeared in guava 12, so an update of the TP was necessary.

Bug: 493650
Change-Id: Ib790b992184f6038806bf890f7af96ae2c447ca7
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>

8 files changed, 20 insertions, 15 deletions

diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd
index 805d6f509..64b1b837c 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd
@@ -3,7 +3,7 @@ target "Orbit"
 with source, requirements
 
 location "http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/" {
-	com.google.guava [11.0.2,11.0.3)
+	com.google.guava [15.0.0,16.0.0)
 	com.google.gson [2.2.4,3.0.0)
 	org.junit [4,5)
 	org.apache.log4j [1.2.0,1.3.0)
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/helios-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/helios-sdk.target
index 08034aba1..dcde290f5 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/helios-sdk.target
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/helios-sdk.target
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="EMF Compare based on Helios SDK" sequenceNumber="1436775869">
+<target name="EMF Compare based on Helios SDK" sequenceNumber="1464676195">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.guava" version="11.0.2.v201303041551"/>
+      <unit id="com.google.guava" version="15.0.0.v201403281430"/>
+      <unit id="com.google.gson" version="2.2.4.v201311231704"/>
       <unit id="org.junit" version="4.12.0.v201504281640"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="javaewah" version="0.7.9.v201401101600"/>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/indigo-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/indigo-sdk.target
index 337218e5c..897e89cd2 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/indigo-sdk.target
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/indigo-sdk.target
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="EMF Compare based on Indigo SDK" sequenceNumber="1436775868">
+<target name="EMF Compare based on Indigo SDK" sequenceNumber="1464676392">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.guava" version="11.0.2.v201303041551"/>
+      <unit id="com.google.guava" version="15.0.0.v201403281430"/>
+      <unit id="com.google.gson" version="2.2.4.v201311231704"/>
       <unit id="org.junit" version="4.12.0.v201504281640"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="javaewah" version="0.7.9.v201401101600"/>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/juno-4.2-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/juno-4.2-sdk.target
index 95f20658e..717246536 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/juno-4.2-sdk.target
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/juno-4.2-sdk.target
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="EMF Compare based on Juno SDK" sequenceNumber="1436775787">
+<target name="EMF Compare based on Juno SDK" sequenceNumber="1464676985">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.guava" version="11.0.2.v201303041551"/>
+      <unit id="com.google.guava" version="15.0.0.v201403281430"/>
+      <unit id="com.google.gson" version="2.2.4.v201311231704"/>
       <unit id="org.junit" version="4.12.0.v201504281640"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="javaewah" version="0.7.9.v201401101600"/>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/kepler-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/kepler-sdk.target
index 00ecdcd5e..ff480fdd4 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/kepler-sdk.target
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/kepler-sdk.target
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="EMF Compare based on Kepler SDK" sequenceNumber="1436775785">
+<target name="EMF Compare based on Kepler SDK" sequenceNumber="1436775786">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.guava" version="11.0.2.v201303041551"/>
+      <unit id="com.google.guava" version="15.0.0.v201403281430"/>
+      <unit id="com.google.gson" version="2.2.4.v201311231704"/>
       <unit id="org.junit" version="4.12.0.v201504281640"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="javaewah" version="0.7.9.v201401101600"/>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.target
index 2e3ffee1e..fa652802c 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.target
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.target
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="EMF Compare based on Luna SDK" sequenceNumber="1436775784">
+<target name="EMF Compare based on Luna SDK" sequenceNumber="1436775785">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.guava" version="11.0.2.v201303041551"/>
+      <unit id="com.google.guava" version="15.0.0.v201403281430"/>
+      <unit id="com.google.gson" version="2.2.4.v201311231704"/>
       <unit id="org.junit" version="4.12.0.v201504281640"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="javaewah" version="0.7.9.v201401101600"/>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.target
index 1947b925a..d242a2d8e 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.target
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.target
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

 <?pde?>

 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->

-<target name="EMF Compare based on Mars SDK" sequenceNumber="1456735827">

+<target name="EMF Compare based on Mars SDK" sequenceNumber="1456735828">

   <locations>

     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>

       <repository location="http://download.eclipse.org/cbi/updates/license"/>

     </location>

     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

-      <unit id="com.google.guava" version="11.0.2.v201303041551"/>

+      <unit id="com.google.guava" version="15.0.0.v201403281430"/>

       <unit id="com.google.gson" version="2.2.4.v201311231704"/>

       <unit id="org.junit" version="4.12.0.v201504281640"/>

       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>

diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.target
index 2ec41c881..1aefb9531 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.target
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.target
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="EMF Compare based on Neon SDK" sequenceNumber="1459520284">
+<target name="EMF Compare based on Neon SDK" sequenceNumber="1459520285">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
       <repository location="http://download.eclipse.org/cbi/updates/license"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="com.google.guava" version="11.0.2.v201303041551"/>
+      <unit id="com.google.guava" version="15.0.0.v201403281430"/>
       <unit id="com.google.gson" version="2.2.4.v201311231704"/>
       <unit id="org.junit" version="4.12.0.v201504281640"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>