Skip to content
[Jenkins]Jenkins
log in
Success

Changes

Summary

  1. Remove references to the old databinding API (details)
  2. Bump EMF Compare to 3.3.21 (details)
  3. Bump tp to 2022-12 (details)
  4. Fall back to hamcrest.library 1.3.0 (details)
  5. mockito's "any" matcher no longer accepts null values (details)
  6. Relax egit dependency (details)
Commit 9852983c602f885ddcf7ed932d85096112d19ce0 by Laurent Goubet
Remove references to the old databinding API

Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>
The file was modified plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/FiltersPreferencePage.java (diff)
The file was modified plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/impl/InteractiveUIContent.java (diff)
The file was modified plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/ui/match/DefaultMatchEngineConfiguratorUI.java (diff)
Commit 1e6a25a2bb208e41f094c7a3b5c21258ea4ca45f by Laurent Goubet
Bump EMF Compare to 3.3.21

Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>
The file was modified org.eclipse.emf.compare-parent/test-parent/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.ide.ui-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.ide.ui-feature/feature.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.ide.ui.e4-feature/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/feature.xml (diff)
The file was modified packaging/org.eclipse.emf.compare-feature/feature.xml (diff)
The file was modified org.eclipse.emf.compare-parent/feature-parent/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.ide.ui.e4-feature/feature.xml (diff)
The file was modified plugins/org.eclipse.emf.compare.doc/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.egit-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.egit-feature/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.rcp.ui-feature/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.gendoc/pom.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.uml2-feature/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare-feature/pom.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.diagram.sirius-feature/feature.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.update/pom.xml (diff)
The file was modified packaging/org.eclipse.emf.compare.uml2-feature/feature.xml (diff)
Commit 1a5d2f110ee1d41fc1d57f3996db45a3ee8223af by Laurent Goubet
Bump tp to 2022-12

Switch to up-to-date mockito and hamcrest, and solve incompatibilities
The file was modified plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/resolver/RemoteMonitoredProxyCreationListenerTest.java (diff)
The file was removedorg.eclipse.emf.compare-parent/targetPlatforms/2022-09-sdk.tpd
The file was modified plugins/org.eclipse.emf.compare.ide.tests/META-INF/MANIFEST.MF (diff)
The file was modified plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF (diff)
The file was modified plugins/org.eclipse.emf.compare.uml2.tests/META-INF/MANIFEST.MF (diff)
The file was removedorg.eclipse.emf.compare-parent/targetPlatforms/2022-09-sdk.target
The file was modified plugins/org.eclipse.emf.compare.ide.tests/src/org/eclipse/emf/compare/ide/utils/tests/ResourceUtil_BinaryIdentical2Test.java (diff)
The file was addedorg.eclipse.emf.compare-parent/targetPlatforms/extras/2022-12-extras-sdk.tpd
The file was modified plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/mergeresolution/MergeResolutionManagerTest.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.tests/META-INF/MANIFEST.MF (diff)
The file was modified plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/AbstractMergeRunnableTest.java (diff)
The file was modified plugins/org.eclipse.emf.compare.diagram.ide.ui.sirius.tests/META-INF/MANIFEST.MF (diff)
The file was modified plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/RevisionedURIConverterTest.java (diff)
The file was modified plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/resolver/CachingImplicitDependenciesTest.java (diff)
The file was addedorg.eclipse.emf.compare-parent/targetPlatforms/2022-12-sdk.tpd
The file was modified plugins/org.eclipse.emf.compare.egit.ui/META-INF/MANIFEST.MF (diff)
The file was modified plugins/org.eclipse.emf.compare.diagram.ide.ui.tests/META-INF/MANIFEST.MF (diff)
The file was removedorg.eclipse.emf.compare-parent/targetPlatforms/extras/2022-09-extras-sdk.tpd
The file was modified Jenkinsfile (diff)
The file was modified plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/resolver/LocalMonitoredProxyCreationListenerTest.java (diff)
The file was removedorg.eclipse.emf.compare-parent/targetPlatforms/extras/2022-09-extras-sdk.target
The file was modified plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffRelationshipComputerTest.java (diff)
The file was addedorg.eclipse.emf.compare-parent/targetPlatforms/2022-12-sdk.target
The file was modified plugins/org.eclipse.emf.compare.ide.tests/src/org/eclipse/emf/compare/ide/utils/tests/ResourceUtil_BinaryIdentical3Test.java (diff)
The file was addedorg.eclipse.emf.compare-parent/targetPlatforms/extras/2022-12-extras-sdk.target
The file was modified org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd (diff)
The file was modified plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/resolver/RenameDetectorTest.java (diff)
The file was modified plugins/org.eclipse.emf.compare.diagram.sirius.tests/META-INF/MANIFEST.MF (diff)
The file was modified plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/resolver/DependencyGraphUpdaterTest.java (diff)
Commit fd182f38e5963a16afdc65103947b2507de4dfe1 by Laurent Goubet
Fall back to hamcrest.library 1.3.0

Junit 4.8 and beyond depend on and reexport hamcrest 1.3.0. Using
hamcrest 2.2.0 is not possible in a JUnit 4 environment due to the
LinkageError it causes.
The file was modified plugins/org.eclipse.emf.compare.ide.ui.tests/META-INF/MANIFEST.MF (diff)
The file was modified org.eclipse.emf.compare-parent/targetPlatforms/2022-12-sdk.target (diff)
The file was modified plugins/org.eclipse.emf.compare.uml2.tests/META-INF/MANIFEST.MF (diff)
The file was modified org.eclipse.emf.compare-parent/targetPlatforms/extras/2022-12-extras-sdk.target (diff)
The file was modified org.eclipse.emf.compare-parent/targetPlatforms/fragments/orbit.tpd (diff)
The file was modified plugins/org.eclipse.emf.compare.ide.tests/META-INF/MANIFEST.MF (diff)
The file was modified plugins/org.eclipse.emf.compare.tests/META-INF/MANIFEST.MF (diff)
Commit b72bb6ff88cab2f6c19bd7db73deedce401b7f87 by Laurent Goubet
mockito's "any" matcher no longer accepts null values
The file was modified plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/RevisionedURIConverterTest.java (diff)
The file was modified plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/resolver/CachingImplicitDependenciesTest.java (diff)
The file was modified plugins/org.eclipse.emf.compare.egit.ui/META-INF/MANIFEST.MF (diff)