From 6ce7c1776e790a5fe1e45f9a0412f363564dd665 Mon Sep 17 00:00:00 2001 From: Pierre-Charles David Date: Sun, 3 May 2026 13:23:34 +0200 Subject: [PATCH 1/2] [tests] Fix custom assertions Signed-off-by: Pierre-Charles David --- .../src/org/eclipse/emf/transaction/tests/AbstractTest.java | 2 +- .../src/org/eclipse/emf/workspace/tests/AbstractTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/org.eclipse.emf.transaction.tests/src/org/eclipse/emf/transaction/tests/AbstractTest.java b/tests/org.eclipse.emf.transaction.tests/src/org/eclipse/emf/transaction/tests/AbstractTest.java index 5c7ec69..6269cca 100644 --- a/tests/org.eclipse.emf.transaction.tests/src/org/eclipse/emf/transaction/tests/AbstractTest.java +++ b/tests/org.eclipse.emf.transaction.tests/src/org/eclipse/emf/transaction/tests/AbstractTest.java @@ -335,7 +335,7 @@ protected void assertFound(String name) { * @see #find(Object, String) */ protected void assertFound(Object start, String name) { - assertNotNull(find(testResource, name), "Did not find " + name); // FIXME: use start instead of testResource + assertNotNull(find(start, name), "Did not find " + name); } /** diff --git a/tests/org.eclipse.emf.workspace.tests/src/org/eclipse/emf/workspace/tests/AbstractTest.java b/tests/org.eclipse.emf.workspace.tests/src/org/eclipse/emf/workspace/tests/AbstractTest.java index 19a471c..8c5489f 100644 --- a/tests/org.eclipse.emf.workspace.tests/src/org/eclipse/emf/workspace/tests/AbstractTest.java +++ b/tests/org.eclipse.emf.workspace.tests/src/org/eclipse/emf/workspace/tests/AbstractTest.java @@ -334,7 +334,7 @@ protected void assertFound(String name) { * @see #find(Object, String) */ protected void assertFound(Object start, String name) { - assertNotNull(find(testResource, name), "Did not find " + name); // FIXME: use start! + assertNotNull(find(start, name), "Did not find " + name); } /** @@ -360,7 +360,7 @@ protected void assertNotFound(String name) { * @see #find(Object, String) */ protected void assertNotFound(Object start, String name) { - assertNull(find(testResource, name), "Found " + name); // FIXME: use start! + assertNull(find(start, name), "Found " + name); } /** From f7f343d078c9ff5e4df899633966aad51f5efa65 Mon Sep 17 00:00:00 2001 From: Pierre-Charles David Date: Sun, 3 May 2026 13:30:14 +0200 Subject: [PATCH 2/2] [releng] Bump version to 1.14.3 Signed-off-by: Pierre-Charles David --- .../org.eclipse.emf.transaction.ui/pom.xml | 2 +- bundles/org.eclipse.emf.transaction/pom.xml | 2 +- bundles/org.eclipse.emf.workspace.ui/pom.xml | 2 +- bundles/org.eclipse.emf.workspace/pom.xml | 2 +- doc/org.eclipse.emf.transaction.doc/pom.xml | 2 +- doc/org.eclipse.emf.workspace.doc/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.emf.workspace-feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- pom.xml | 2 +- .../pom.xml | 4 +-- .../category.xml | 26 +++++++++---------- .../pom.xml | 2 +- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.eclipse.emf.transaction.tests/pom.xml | 4 +-- .../META-INF/MANIFEST.MF | 2 +- tests/org.eclipse.emf.workspace.tests/pom.xml | 4 +-- 36 files changed, 51 insertions(+), 51 deletions(-) diff --git a/bundles/org.eclipse.emf.transaction.ui/pom.xml b/bundles/org.eclipse.emf.transaction.ui/pom.xml index 9c71fdb..cfd1cff 100644 --- a/bundles/org.eclipse.emf.transaction.ui/pom.xml +++ b/bundles/org.eclipse.emf.transaction.ui/pom.xml @@ -5,7 +5,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml org.eclipse.emf.transaction.plugins diff --git a/bundles/org.eclipse.emf.transaction/pom.xml b/bundles/org.eclipse.emf.transaction/pom.xml index 0634f2b..97cb491 100644 --- a/bundles/org.eclipse.emf.transaction/pom.xml +++ b/bundles/org.eclipse.emf.transaction/pom.xml @@ -5,7 +5,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml org.eclipse.emf.transaction.plugins diff --git a/bundles/org.eclipse.emf.workspace.ui/pom.xml b/bundles/org.eclipse.emf.workspace.ui/pom.xml index 33bca77..c25f791 100644 --- a/bundles/org.eclipse.emf.workspace.ui/pom.xml +++ b/bundles/org.eclipse.emf.workspace.ui/pom.xml @@ -5,7 +5,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml org.eclipse.emf.transaction.plugins diff --git a/bundles/org.eclipse.emf.workspace/pom.xml b/bundles/org.eclipse.emf.workspace/pom.xml index 39ee07e..5e9d1f2 100644 --- a/bundles/org.eclipse.emf.workspace/pom.xml +++ b/bundles/org.eclipse.emf.workspace/pom.xml @@ -5,7 +5,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml org.eclipse.emf.transaction.plugins diff --git a/doc/org.eclipse.emf.transaction.doc/pom.xml b/doc/org.eclipse.emf.transaction.doc/pom.xml index 82954ec..80b747f 100644 --- a/doc/org.eclipse.emf.transaction.doc/pom.xml +++ b/doc/org.eclipse.emf.transaction.doc/pom.xml @@ -5,7 +5,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml org.eclipse.emf.transaction.plugins diff --git a/doc/org.eclipse.emf.workspace.doc/pom.xml b/doc/org.eclipse.emf.workspace.doc/pom.xml index 751ef41..ddb0f9b 100644 --- a/doc/org.eclipse.emf.workspace.doc/pom.xml +++ b/doc/org.eclipse.emf.workspace.doc/pom.xml @@ -5,7 +5,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml org.eclipse.emf.transaction.plugins diff --git a/examples/org.eclipse.emf.transaction.examples/pom.xml b/examples/org.eclipse.emf.transaction.examples/pom.xml index 7579130..a6ce7ae 100644 --- a/examples/org.eclipse.emf.transaction.examples/pom.xml +++ b/examples/org.eclipse.emf.transaction.examples/pom.xml @@ -5,7 +5,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml org.eclipse.emf.transaction.plugins diff --git a/examples/org.eclipse.emf.workspace.examples.library.editor/pom.xml b/examples/org.eclipse.emf.workspace.examples.library.editor/pom.xml index 4210b9d..e5fbe72 100644 --- a/examples/org.eclipse.emf.workspace.examples.library.editor/pom.xml +++ b/examples/org.eclipse.emf.workspace.examples.library.editor/pom.xml @@ -5,7 +5,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml org.eclipse.emf.transaction.plugins diff --git a/examples/org.eclipse.emf.workspace.examples/pom.xml b/examples/org.eclipse.emf.workspace.examples/pom.xml index 54b451b..370ce11 100644 --- a/examples/org.eclipse.emf.workspace.examples/pom.xml +++ b/examples/org.eclipse.emf.workspace.examples/pom.xml @@ -5,7 +5,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml org.eclipse.emf.transaction.plugins diff --git a/features/org.eclipse.emf.transaction-feature/feature.xml b/features/org.eclipse.emf.transaction-feature/feature.xml index 70b76e6..76a32f6 100644 --- a/features/org.eclipse.emf.transaction-feature/feature.xml +++ b/features/org.eclipse.emf.transaction-feature/feature.xml @@ -14,7 +14,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml org.eclipse.emf.transaction.features diff --git a/features/org.eclipse.emf.transaction.doc-feature/feature.xml b/features/org.eclipse.emf.transaction.doc-feature/feature.xml index 641a738..17df723 100644 --- a/features/org.eclipse.emf.transaction.doc-feature/feature.xml +++ b/features/org.eclipse.emf.transaction.doc-feature/feature.xml @@ -15,7 +15,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml org.eclipse.emf.transaction.features diff --git a/features/org.eclipse.emf.transaction.examples-feature/feature.xml b/features/org.eclipse.emf.transaction.examples-feature/feature.xml index 9ad5909..64bfcfb 100644 --- a/features/org.eclipse.emf.transaction.examples-feature/feature.xml +++ b/features/org.eclipse.emf.transaction.examples-feature/feature.xml @@ -16,7 +16,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml org.eclipse.emf.transaction.features diff --git a/features/org.eclipse.emf.transaction.master-feature/feature.xml b/features/org.eclipse.emf.transaction.master-feature/feature.xml index 6719e1d..8323a48 100644 --- a/features/org.eclipse.emf.transaction.master-feature/feature.xml +++ b/features/org.eclipse.emf.transaction.master-feature/feature.xml @@ -15,7 +15,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml org.eclipse.emf.transaction.features diff --git a/features/org.eclipse.emf.transaction.sdk-feature/feature.xml b/features/org.eclipse.emf.transaction.sdk-feature/feature.xml index b8bc9c7..1f9ddec 100644 --- a/features/org.eclipse.emf.transaction.sdk-feature/feature.xml +++ b/features/org.eclipse.emf.transaction.sdk-feature/feature.xml @@ -15,7 +15,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml org.eclipse.emf.transaction.features diff --git a/features/org.eclipse.emf.transaction.tests-feature/feature.xml b/features/org.eclipse.emf.transaction.tests-feature/feature.xml index e6a820e..9f22e33 100644 --- a/features/org.eclipse.emf.transaction.tests-feature/feature.xml +++ b/features/org.eclipse.emf.transaction.tests-feature/feature.xml @@ -15,7 +15,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml org.eclipse.emf.transaction.features diff --git a/features/org.eclipse.emf.workspace-feature/feature.xml b/features/org.eclipse.emf.workspace-feature/feature.xml index 041f110..a5104e9 100644 --- a/features/org.eclipse.emf.workspace-feature/feature.xml +++ b/features/org.eclipse.emf.workspace-feature/feature.xml @@ -15,7 +15,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml org.eclipse.emf.transaction.features diff --git a/features/org.eclipse.emf.workspace.doc-feature/feature.xml b/features/org.eclipse.emf.workspace.doc-feature/feature.xml index 8d96714..51de699 100644 --- a/features/org.eclipse.emf.workspace.doc-feature/feature.xml +++ b/features/org.eclipse.emf.workspace.doc-feature/feature.xml @@ -15,7 +15,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml org.eclipse.emf.transaction.features diff --git a/features/org.eclipse.emf.workspace.examples-feature/feature.xml b/features/org.eclipse.emf.workspace.examples-feature/feature.xml index 8dfb97a..905703f 100644 --- a/features/org.eclipse.emf.workspace.examples-feature/feature.xml +++ b/features/org.eclipse.emf.workspace.examples-feature/feature.xml @@ -15,7 +15,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml org.eclipse.emf.transaction.features diff --git a/pom.xml b/pom.xml index f77b6ca..8da8517 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.top - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT pom diff --git a/releng/org.eclipse.emf.transaction.releng/pom.xml b/releng/org.eclipse.emf.transaction.releng/pom.xml index ff6494f..690456c 100644 --- a/releng/org.eclipse.emf.transaction.releng/pom.xml +++ b/releng/org.eclipse.emf.transaction.releng/pom.xml @@ -6,7 +6,7 @@ 4.0.0 org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT pom @@ -87,7 +87,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.target - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ${platform} diff --git a/releng/org.eclipse.emf.transaction.repository/category.xml b/releng/org.eclipse.emf.transaction.repository/category.xml index c62c597..0cef2a2 100644 --- a/releng/org.eclipse.emf.transaction.repository/category.xml +++ b/releng/org.eclipse.emf.transaction.repository/category.xml @@ -1,42 +1,42 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/releng/org.eclipse.emf.transaction.repository/pom.xml b/releng/org.eclipse.emf.transaction.repository/pom.xml index 0f0bdd5..4599a7b 100644 --- a/releng/org.eclipse.emf.transaction.repository/pom.xml +++ b/releng/org.eclipse.emf.transaction.repository/pom.xml @@ -6,7 +6,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml org.eclipse.emf.transaction.repository diff --git a/releng/org.eclipse.emf.transaction.target/pom.xml b/releng/org.eclipse.emf.transaction.target/pom.xml index a6e1ae9..3d7ac36 100644 --- a/releng/org.eclipse.emf.transaction.target/pom.xml +++ b/releng/org.eclipse.emf.transaction.target/pom.xml @@ -6,7 +6,7 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml pom diff --git a/tests/org.eclipse.emf.transaction.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.transaction.tests/META-INF/MANIFEST.MF index b82967f..b873c54 100644 --- a/tests/org.eclipse.emf.transaction.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.emf.transaction.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EMF-TX JUnit Test Plug-in Bundle-SymbolicName: org.eclipse.emf.transaction.tests; singleton:=true -Bundle-Version: 1.11.0.qualifier +Bundle-Version: 1.12.0.qualifier Bundle-Vendor: Eclipse.org Bundle-Localization: plugin Require-Bundle: org.eclipse.emf.transaction;bundle-version="1.9.0", diff --git a/tests/org.eclipse.emf.transaction.tests/pom.xml b/tests/org.eclipse.emf.transaction.tests/pom.xml index 1b4175b..fcad5ab 100644 --- a/tests/org.eclipse.emf.transaction.tests/pom.xml +++ b/tests/org.eclipse.emf.transaction.tests/pom.xml @@ -6,12 +6,12 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml org.eclipse.emf.transaction.plugins org.eclipse.emf.transaction.tests - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT eclipse-test-plugin diff --git a/tests/org.eclipse.emf.workspace.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.workspace.tests/META-INF/MANIFEST.MF index 43bfb0b..18f2d7e 100644 --- a/tests/org.eclipse.emf.workspace.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.emf.workspace.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EMF Workbench Tests Plug-in Bundle-SymbolicName: org.eclipse.emf.workspace.tests;singleton:=true -Bundle-Version: 1.11.0.qualifier +Bundle-Version: 1.12.0.qualifier Bundle-Vendor: Eclipse.org Bundle-Localization: plugin Require-Bundle: junit-jupiter-api;bundle-version="5.11.3", diff --git a/tests/org.eclipse.emf.workspace.tests/pom.xml b/tests/org.eclipse.emf.workspace.tests/pom.xml index bdb945f..ad57ba5 100644 --- a/tests/org.eclipse.emf.workspace.tests/pom.xml +++ b/tests/org.eclipse.emf.workspace.tests/pom.xml @@ -5,11 +5,11 @@ org.eclipse.emf.transaction org.eclipse.emf.transaction.releng - 1.14.2-SNAPSHOT + 1.14.3-SNAPSHOT ../../releng/org.eclipse.emf.transaction.releng/pom.xml org.eclipse.emf.transaction.plugins org.eclipse.emf.workspace.tests - 1.11.0-SNAPSHOT + 1.12.0-SNAPSHOT eclipse-test-plugin