Remove log4j 1 dependency

Bug: 578953
Change-Id: If96e128ff2bd9eede2749e81bf06785560461e1c

2 files changed, 1 insertions, 18 deletions

diff --git a/plugins/org.eclipse.emf.compare.uml2/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.uml2/META-INF/MANIFEST.MF
index 9af717a59..bd33b1258 100644
--- a/plugins/org.eclipse.emf.compare.uml2/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.uml2/META-INF/MANIFEST.MF
@@ -16,8 +16,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.emf.compare.uml2.internal.UMLComparePlugin
 Import-Package: com.google.common.base;version="[27.0.0,30.2.0)",
  com.google.common.collect;version="[27.0.0,30.2.0)",
- com.google.common.primitives;version="[27.0.0,30.2.0)",
- org.apache.log4j;version="1.2.15"
+ com.google.common.primitives;version="[27.0.0,30.2.0)"
 Export-Package: org.eclipse.emf.compare.uml2.internal;
   x-friends:="org.eclipse.emf.compare.uml2.edit,
    org.eclipse.emf.compare.uml2.rcp,
diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/merge/OpaqueElementBodyChangeMerger.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/merge/OpaqueElementBodyChangeMerger.java
index b1231bc8e..a9558afa3 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/merge/OpaqueElementBodyChangeMerger.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/merge/OpaqueElementBodyChangeMerger.java
@@ -26,7 +26,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
 import org.eclipse.emf.compare.AttributeChange;
 import org.eclipse.emf.compare.Comparison;
 import org.eclipse.emf.compare.Diff;
@@ -55,9 +54,6 @@ import org.eclipse.emf.ecore.EObject;
  */
 public class OpaqueElementBodyChangeMerger extends AttributeChangeMerger {
 
-	/** The logger. */
-	private static final Logger LOGGER = Logger.getLogger(OpaqueElementBodyChangeMerger.class);
-
 	@Override
 	public boolean isMergerFor(Diff target) {
 		return isOrRefinesOpaqueElementBodyChange(target);
@@ -148,12 +144,6 @@ public class OpaqueElementBodyChangeMerger extends AttributeChangeMerger {
 				return;
 			}
 
-			if (LOGGER.isDebugEnabled()) {
-				int refinedElementCount = bodyChange.getRefinedBy().size();
-				LOGGER.debug("accept(Diff, boolean) - " + refinedElementCount //$NON-NLS-1$
-						+ " refined diffs to merge for diff " + diff.hashCode()); //$NON-NLS-1$
-			}
-
 			switch (bodyChange.getKind()) {
 				case ADD:
 					acceptRefiningDiffs(bodyChange, rightToLeft);
@@ -189,12 +179,6 @@ public class OpaqueElementBodyChangeMerger extends AttributeChangeMerger {
 				return;
 			}
 
-			if (LOGGER.isDebugEnabled()) {
-				int refinedElementCount = bodyChange.getRefinedBy().size();
-				LOGGER.debug("Reject(Diff, boolean)" + refinedElementCount //$NON-NLS-1$
-						+ " refined diffs to merge for diff " + diff.hashCode()); //$NON-NLS-1$
-			}
-
 			switch (bodyChange.getKind()) {
 				case ADD:
 					rejectRefiningDiffs(bodyChange, rightToLeft);