From 3401732d31a71b39cfeef0069715a643d0505d66 Mon Sep 17 00:00:00 2001 From: Pierre-Charles David Date: Wed, 16 Sep 2026 14:13:54 +0200 Subject: [PATCH 1/7] [releng] Switch to Tycho 5.0.4 Signed-off-by: Pierre-Charles David --- releng/org.eclipse.emf.validation.releng/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releng/org.eclipse.emf.validation.releng/pom.xml b/releng/org.eclipse.emf.validation.releng/pom.xml index b2c8cd2..d0d1045 100644 --- a/releng/org.eclipse.emf.validation.releng/pom.xml +++ b/releng/org.eclipse.emf.validation.releng/pom.xml @@ -12,7 +12,7 @@ - 5.0.3 + 5.0.4 1.5.2 2.9.2 false From 748393687df97064f50a1769c194cdc9bd3dc098 Mon Sep 17 00:00:00 2001 From: Pierre-Charles David Date: Wed, 16 Sep 2026 14:14:56 +0200 Subject: [PATCH 2/7] [releng] Switch to cyclonedx-maven-plugin 2.9.3 Signed-off-by: Pierre-Charles David --- releng/org.eclipse.emf.validation.releng/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releng/org.eclipse.emf.validation.releng/pom.xml b/releng/org.eclipse.emf.validation.releng/pom.xml index d0d1045..6d245e7 100644 --- a/releng/org.eclipse.emf.validation.releng/pom.xml +++ b/releng/org.eclipse.emf.validation.releng/pom.xml @@ -14,7 +14,7 @@ 5.0.4 1.5.2 - 2.9.2 + 2.9.3 false 2024-12 UTF-8 From 50d1abe1f8f20071554208fa313a225ad53bae35 Mon Sep 17 00:00:00 2001 From: Pierre-Charles David Date: Wed, 16 Sep 2026 14:15:49 +0200 Subject: [PATCH 3/7] [releng] Fix 2026-06 target platform Signed-off-by: Pierre-Charles David --- releng/org.eclipse.emf.validation.target/2026-06.target | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/releng/org.eclipse.emf.validation.target/2026-06.target b/releng/org.eclipse.emf.validation.target/2026-06.target index fbe0be9..c806644 100644 --- a/releng/org.eclipse.emf.validation.target/2026-06.target +++ b/releng/org.eclipse.emf.validation.target/2026-06.target @@ -9,18 +9,18 @@ - + - + - + From a2ce908f7231069dbfe54bc537b683af069b55a0 Mon Sep 17 00:00:00 2001 From: Pierre-Charles David Date: Wed, 16 Sep 2026 14:21:12 +0200 Subject: [PATCH 4/7] [releng] Add 2026-09 target platform Signed-off-by: Pierre-Charles David --- .../2026-09.target | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 releng/org.eclipse.emf.validation.target/2026-09.target diff --git a/releng/org.eclipse.emf.validation.target/2026-09.target b/releng/org.eclipse.emf.validation.target/2026-09.target new file mode 100644 index 0000000..5e4b1c8 --- /dev/null +++ b/releng/org.eclipse.emf.validation.target/2026-09.target @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + From 6a36bd39dcb331d8bef712a630e77a94c4f06951 Mon Sep 17 00:00:00 2001 From: Pierre-Charles David Date: Wed, 16 Sep 2026 14:27:07 +0200 Subject: [PATCH 5/7] [releng] Add 2026-12 target platform Also use Java 25 to build abd resolve the target platforms, as this is now required for at least org.eclipse.core.filesystem. Signed-off-by: Pierre-Charles David --- .github/workflows/build.yml | 4 +-- .../org.eclipse.emf.validation.releng/pom.xml | 2 +- .../promotion/pom.xml | 2 +- .../2026-12.target | 26 +++++++++++++++++++ 4 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 releng/org.eclipse.emf.validation.target/2026-12.target diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bf85af6..117f16c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,9 +11,9 @@ jobs: strategy: fail-fast: false matrix: - java: [ 21, 25 ] + java: [ 25 ] os: [ ubuntu-latest, windows-latest, macos-latest ] - target: [ 2024-12, 2026-03, canary ] + target: [ 2024-12, 2026-09, canary ] runs-on: ${{ matrix.os }} name: OS ${{ matrix.os }} Target ${{ matrix.target }} Java ${{ matrix.java }} build and verify steps: diff --git a/releng/org.eclipse.emf.validation.releng/pom.xml b/releng/org.eclipse.emf.validation.releng/pom.xml index 6d245e7..b52bd13 100644 --- a/releng/org.eclipse.emf.validation.releng/pom.xml +++ b/releng/org.eclipse.emf.validation.releng/pom.xml @@ -78,7 +78,7 @@ target-platform-configuration ${tycho.version} - JavaSE-21 + JavaSE-25 diff --git a/releng/org.eclipse.emf.validation.releng/promotion/pom.xml b/releng/org.eclipse.emf.validation.releng/promotion/pom.xml index 56b0011..923b8bc 100644 --- a/releng/org.eclipse.emf.validation.releng/promotion/pom.xml +++ b/releng/org.eclipse.emf.validation.releng/promotion/pom.xml @@ -45,7 +45,7 @@ SPDX-License-Identifier: EPL-2.0 tycho-eclipse-plugin ${tycho.version} - JavaSE-21 + JavaSE-25 org.eclipse.justj.p2 diff --git a/releng/org.eclipse.emf.validation.target/2026-12.target b/releng/org.eclipse.emf.validation.target/2026-12.target new file mode 100644 index 0000000..809a6d2 --- /dev/null +++ b/releng/org.eclipse.emf.validation.target/2026-12.target @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + From cc76c6d270d6d3e8390da45bfb216e88835416ef Mon Sep 17 00:00:00 2001 From: Pierre-Charles David Date: Fri, 25 Sep 2026 17:01:37 +0200 Subject: [PATCH 6/7] Tighten SAX parser configuration Signed-off-by: Pierre-Charles David --- .../src/org/eclipse/emf/validation/util/XmlConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bundles/org.eclipse.emf.validation/src/org/eclipse/emf/validation/util/XmlConfig.java b/bundles/org.eclipse.emf.validation/src/org/eclipse/emf/validation/util/XmlConfig.java index 85e6874..1f474dc 100644 --- a/bundles/org.eclipse.emf.validation/src/org/eclipse/emf/validation/util/XmlConfig.java +++ b/bundles/org.eclipse.emf.validation/src/org/eclipse/emf/validation/util/XmlConfig.java @@ -364,6 +364,7 @@ public static IConfigurationElement load(IConfigurationElement parent, URL url) spf.setValidating(false); try { + spf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true); SAXParser parser = spf.newSAXParser(); ConstraintsContentHandler handler = new ConstraintsContentHandler(parent.getDeclaringExtension(), url); From c0eecd1d49113e347352fc17f9eaed1fca0bc49a Mon Sep 17 00:00:00 2001 From: Pierre-Charles David Date: Fri, 25 Sep 2026 17:02:21 +0200 Subject: [PATCH 7/7] [doc] Fix outdated URLs in the documentation Signed-off-by: Pierre-Charles David --- .../tutorials/oclValidationTutorial.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/org.eclipse.emf.validation.doc/tutorials/oclValidationTutorial.html b/doc/org.eclipse.emf.validation.doc/tutorials/oclValidationTutorial.html index f05bffe..3b609e9 100644 --- a/doc/org.eclipse.emf.validation.doc/tutorials/oclValidationTutorial.html +++ b/doc/org.eclipse.emf.validation.doc/tutorials/oclValidationTutorial.html @@ -53,7 +53,7 @@

References

  • org.eclipse.emf.validation.constraintProviders extension point.
  • org.eclipse.emf.validation.constraintParsers extension point.
    • -
  • OCL 2.0 specification.
    • +
  • OCL 2.0 specification.

    • [back to top]

    @@ -170,7 +170,7 @@

    Specifying a Batch Mode OCL Constraint

    The one exception is the message string, which for OCL constraints can specify the {0} placeholder one or more times to be replaced by the label for the element that was validated (see the - MessageFormat + MessageFormat API for details). Usually, the label will look something like "Writer Isaac Asimov"; this can be customized via the IItemLabelProvider