diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bf85af6c..117f16ca 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/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 85e68742..1f474dc3 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); diff --git a/doc/org.eclipse.emf.validation.doc/tutorials/oclValidationTutorial.html b/doc/org.eclipse.emf.validation.doc/tutorials/oclValidationTutorial.html index f05bffef..3b609e95 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 @@
org.eclipse.emf.validation.constraintProviders extension point.org.eclipse.emf.validation.constraintParsers extension point.{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
diff --git a/releng/org.eclipse.emf.validation.releng/pom.xml b/releng/org.eclipse.emf.validation.releng/pom.xml
index b2c8cd2c..b52bd132 100644
--- a/releng/org.eclipse.emf.validation.releng/pom.xml
+++ b/releng/org.eclipse.emf.validation.releng/pom.xml
@@ -12,9 +12,9 @@