Cleanup for version bumping

- Bump versions to reflect minimal BREE change
- Fix as many warnings as possible
- Make sure our @since reflect the correct versions

Change-Id: Ifb30b655f17ef2420ea5ca69c528910bd51e7649

4 files changed, 25 insertions, 25 deletions

diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ExtensionMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ExtensionMergeTest.java
index 750ebfcf6..76cad4282 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ExtensionMergeTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ExtensionMergeTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2012, 2013 Obeo.

+ * Copyright (c) 2012, 2014 Obeo.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -11,12 +11,12 @@
 package org.eclipse.emf.compare.tests.merge;

 

 import static com.google.common.base.Predicates.and;

-import static junit.framework.Assert.assertEquals;

-import static junit.framework.Assert.assertNotNull;

-import static junit.framework.Assert.assertSame;

-import static junit.framework.Assert.assertTrue;

 import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedAttribute;

 import static org.eclipse.emf.compare.utils.EMFComparePredicates.fromSide;

+import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertNotNull;

+import static org.junit.Assert.assertSame;

+import static org.junit.Assert.assertTrue;

 

 import com.google.common.collect.Iterators;

 

diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java
index 93ad35bca..fb653cbe2 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2012, 2013 Obeo.

+ * Copyright (c) 2012, 2014 Obeo.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -10,12 +10,12 @@
  *******************************************************************************/

 package org.eclipse.emf.compare.tests.merge;

 

-import static junit.framework.Assert.assertEquals;

-import static junit.framework.Assert.assertFalse;

-import static junit.framework.Assert.assertNotNull;

-import static junit.framework.Assert.assertNull;

-import static junit.framework.Assert.assertSame;

-import static junit.framework.Assert.assertTrue;

+import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertFalse;

+import static org.junit.Assert.assertNotNull;

+import static org.junit.Assert.assertNull;

+import static org.junit.Assert.assertSame;

+import static org.junit.Assert.assertTrue;

 

 import java.io.IOException;

 import java.util.Iterator;

diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java
index ac7ddd79c..d73baba3b 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2012, 2013 Obeo.

+ * Copyright (c) 2012, 2014 Obeo.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -11,12 +11,6 @@
 package org.eclipse.emf.compare.tests.merge;

 

 import static com.google.common.base.Predicates.and;

-import static junit.framework.Assert.assertEquals;

-import static junit.framework.Assert.assertFalse;

-import static junit.framework.Assert.assertNotNull;

-import static junit.framework.Assert.assertNull;

-import static junit.framework.Assert.assertSame;

-import static junit.framework.Assert.assertTrue;

 import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToAttribute;

 import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToReference;

 import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedAttribute;

@@ -26,6 +20,12 @@ import static org.eclipse.emf.compare.utils.EMFComparePredicates.movedInAttribut
 import static org.eclipse.emf.compare.utils.EMFComparePredicates.movedInReference;

 import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromAttribute;

 import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromReference;

+import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertFalse;

+import static org.junit.Assert.assertNotNull;

+import static org.junit.Assert.assertNull;

+import static org.junit.Assert.assertSame;

+import static org.junit.Assert.assertTrue;

 

 import com.google.common.collect.Iterators;

 

diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MultipleMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MultipleMergeTest.java
index 539b01612..9a67eab3a 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MultipleMergeTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MultipleMergeTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2012, 2013 Obeo.

+ * Copyright (c) 2012, 2014 Obeo.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -11,11 +11,6 @@
 package org.eclipse.emf.compare.tests.merge;

 

 import static com.google.common.base.Predicates.and;

-import static junit.framework.Assert.assertEquals;

-import static junit.framework.Assert.assertNotNull;

-import static junit.framework.Assert.assertNull;

-import static junit.framework.Assert.assertSame;

-import static junit.framework.Assert.assertTrue;

 import static org.eclipse.emf.compare.utils.EMFComparePredicates.added;

 import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToReference;

 import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedReference;

@@ -23,6 +18,11 @@ import static org.eclipse.emf.compare.utils.EMFComparePredicates.fromSide;
 import static org.eclipse.emf.compare.utils.EMFComparePredicates.moved;

 import static org.eclipse.emf.compare.utils.EMFComparePredicates.removed;

 import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromReference;

+import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertNotNull;

+import static org.junit.Assert.assertNull;

+import static org.junit.Assert.assertSame;

+import static org.junit.Assert.assertTrue;

 

 import com.google.common.collect.ImmutableList;

 import com.google.common.collect.Iterators;