Skip to content
[Jenkins]Jenkins
log in
Success

Changes

Summary

  1. Remove logging from the EMF Compare core (details)
  2. Remove log4j 1 dependency (details)
  3. Compatibility with newer EGit (details)
  4. Bump version to 3.3.19 (details)
Commit 70d1945b4b5e45d0e8bad09a69df841ae9122f65 by Laurent Goubet
Remove logging from the EMF Compare core

Most of these logs were only start/end information for comparison
phases. This depends on an external logger as the core is standalone.
Log4J 2 does not seem viable for eclipse as it requires an external
configuration file instead of being configurable through API, and we
can't have a global eclipse configuration just for compare. We wish to
remove the dependency towards Log4j 1.

Bug: 578953
Change-Id: Ib421d2f9487f84d8867f936faa0fc068e72e75d3
The file was modified plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/diff/DefaultDiffEngine.java (diff)
The file was modified plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/BatchMerger.java (diff)
The file was modified plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ResourceAttachmentChangeMerger.java (diff)
The file was modified plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/EMFCompare.java (diff)
The file was modified plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/equi/DefaultEquiEngine.java (diff)
The file was modified plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/DefaultMatchEngine.java (diff)
The file was modified plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/req/DefaultReqEngine.java (diff)
The file was modified plugins/org.eclipse.emf.compare/META-INF/MANIFEST.MF (diff)
The file was modified plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/conflict/DefaultConflictDetector.java (diff)
The file was modified plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/conflict/MatchBasedConflictDetector.java (diff)
The file was modified plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java (diff)
Commit 7af9f8ed884c0eb5398c8c2359507d3908af0b07 by Laurent Goubet
Remove log4j 1 dependency

Bug: 578953
Change-Id: If96e128ff2bd9eede2749e81bf06785560461e1c
The file was modified plugins/org.eclipse.emf.compare.uml2/META-INF/MANIFEST.MF (diff)
The file was modified plugins/org.eclipse.emf.compare.egit/META-INF/MANIFEST.MF (diff)
The file was removedplugins/org.eclipse.emf.compare.log4j.fragment/.classpath
The file was modified plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeNonConflictingRunnable.java (diff)
The file was removedplugins/org.eclipse.emf.compare.log4j.fragment/.settings/org.eclipse.jdt.core.prefs
The file was addedorg.eclipse.emf.compare-parent/targetPlatforms/2022-03-sdk.target
The file was modified plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF (diff)
The file was removedplugins/org.eclipse.emf.compare.log4j.fragment/.settings/org.eclipse.jdt.ui.prefs
The file was addedorg.eclipse.emf.compare-parent/targetPlatforms/2022-03-sdk.tpd
The file was modified plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/SynchronizedResourceSet.java (diff)
The file was removedplugins/org.eclipse.emf.compare.log4j.fragment/build.properties
The file was modified plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/LoggingPreferencePage.java (diff)
The file was modified plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/EMFCompareRCPPlugin.java (diff)
The file was modified plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/merge/OpaqueElementBodyChangeMerger.java (diff)
The file was removedplugins/org.eclipse.emf.compare.log4j.fragment/META-INF/MANIFEST.MF
The file was modified plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/DependencyGraphUpdater.java (diff)
The file was addedorg.eclipse.emf.compare-parent/targetPlatforms/extras/2022-03-extras-sdk.target
The file was modified plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/RecursiveModelMerger.java (diff)
The file was modified plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF (diff)
The file was modified plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceDependencyRemoteResolver.java (diff)
The file was modified plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceDependencyLocalResolver.java (diff)
The file was modified plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFModelProvider.java (diff)
The file was removedplugins/org.eclipse.emf.compare.log4j.fragment/.checkstyle
The file was modified plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/preferences/EMFComparePreferences.java (diff)
The file was modified plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/DiagnosticSupport.java (diff)
The file was modified plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeConflictingRunnable.java (diff)
The file was modified org.eclipse.emf.compare-parent/pom.xml (diff)
The file was modified plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ComparisonScopeBuilder.java (diff)
The file was removedplugins/org.eclipse.emf.compare.log4j.fragment/.project
The file was addedorg.eclipse.emf.compare-parent/targetPlatforms/extras/2022-03-extras-sdk.tpd
The file was addedplugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/EMFCompareLogger.java
The file was modified org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd (diff)
The file was removedplugins/org.eclipse.emf.compare.log4j.fragment/src/log4j.properties
The file was modified plugins/org.eclipse.emf.compare.rcp/META-INF/MANIFEST.MF (diff)
The file was modified plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/AbstractResolution.java (diff)
Commit 4ccae0a1edaec9b83c7bbd9de2af2f583f3a3f7a by Laurent Goubet
Compatibility with newer EGit

Change-Id: I62b91974763c0ee650f861dd5b64b9357300c8b3
The file was modified plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/RecursiveModelMerger.java (diff)
Commit ac04f568cfb3bf0ceb06c6a4109a373b47c5c65c by Laurent Goubet
Bump version to 3.3.19

Change-Id: I6307409e09859d75a717620a901c594e0b81f798
The file was modified org.eclipse.emf.compare-parent/test-parent/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.diagram.sirius-feature/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.uml2-feature/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.update/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.diagram.sirius-feature/feature.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/feature.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.update.extras/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare-feature/pom.xml (diff)
The file was modified org.eclipse.emf.compare-parent/bundle-parent/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.egit-feature/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare-feature/feature.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.uml2-feature/feature.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/pom.xml (diff)
The file was modified org.eclipse.emf.compare-parent/feature-parent/pom.xml (diff)
The file was modified org.eclipse.emf.compare-parent/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.diagram.gmf-feature/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.diagram.gmf-feature/feature.xml (diff)
The file was modified plugins/org.eclipse.emf.compare.doc/META-INF/MANIFEST.MF (diff)
The file was modified packaging/org.eclipse.emf.compare.gendoc/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.ide.ui-feature/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml (diff)
The file was modified plugins/org.eclipse.emf.compare.doc/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.egit-feature/feature.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.ide.ui-feature/feature.xml (diff)