From 2cc9bb0cf2e3445bf16091b827084a16c540f46c Mon Sep 17 00:00:00 2001 From: Pete Edwards Date: Mon, 18 Dec 2023 16:41:17 +0000 Subject: [PATCH 1/5] Maintain RDFa support This flag is not ready for deprecation as it is used by 3rd party plugins. It would be good to set up an alternative mechanism for providing this support before this is deprecated. See https://github.com/eclipse-rdf4j/rdf4j/issues/4779 for details. --- .../java/org/eclipse/rdf4j/rio/helpers/RDFaParserSettings.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaParserSettings.java b/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaParserSettings.java index 14d913b3f7e..1ede9f2f74d 100644 --- a/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaParserSettings.java +++ b/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaParserSettings.java @@ -26,7 +26,6 @@ public class RDFaParserSettings { *

* Defaults to {@link RDFaVersion#RDFA_1_0}. */ - @Deprecated(since = "4.3.0", forRemoval = true) public static final RioSetting RDFA_COMPATIBILITY = new RioSettingImpl<>( "org.eclipse.rdf4j.rio.rdfa.version", "RDFa Version Compatibility", RDFaVersion.RDFA_1_0); From 787846cf71395e2b30df392a59396b5982f67562 Mon Sep 17 00:00:00 2001 From: Pete Edwards Date: Mon, 18 Dec 2023 16:54:18 +0000 Subject: [PATCH 2/5] Undo deprecation --- .../src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaVersion.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaVersion.java b/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaVersion.java index e2d8855479f..69b6a55483e 100644 --- a/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaVersion.java +++ b/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaVersion.java @@ -15,7 +15,6 @@ * * @author Peter Ansell */ -@Deprecated(since = "4.3.0", forRemoval = true) public enum RDFaVersion { /** From a7f062f79307fc9c4deee16575f09cc1246e9b51 Mon Sep 17 00:00:00 2001 From: Pete Edwards Date: Mon, 15 Jan 2024 15:36:59 +0000 Subject: [PATCH 3/5] Update core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaParserSettings.java --- .../java/org/eclipse/rdf4j/rio/helpers/RDFaParserSettings.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaParserSettings.java b/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaParserSettings.java index 1ede9f2f74d..93064e65429 100644 --- a/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaParserSettings.java +++ b/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaParserSettings.java @@ -23,6 +23,8 @@ public class RDFaParserSettings { /** * Boolean setting for parser to determine the RDFa version to use when processing the document. + * Note that although these settings are not used within RDF4J, they are in use by external plugins. + * @see https://github.com/eclipse-rdf4j/rdf4j/issues/4779 *

* Defaults to {@link RDFaVersion#RDFA_1_0}. */ From 57102d1418529f11c505f5327d1889af9594f9fb Mon Sep 17 00:00:00 2001 From: Pete Edwards Date: Mon, 15 Jan 2024 15:37:05 +0000 Subject: [PATCH 4/5] Update core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaVersion.java --- .../main/java/org/eclipse/rdf4j/rio/helpers/RDFaVersion.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaVersion.java b/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaVersion.java index 69b6a55483e..74a3d3db49e 100644 --- a/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaVersion.java +++ b/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaVersion.java @@ -12,6 +12,8 @@ /** * Enumeration for tracking versions of the RDFa specification to specify processing capabilities of RDFa modules. + * Note that although these settings are not used within RDF4J, they are in use by external plugins. + * @see https://github.com/eclipse-rdf4j/rdf4j/issues/4779 * * @author Peter Ansell */ From 4f2f5c4d9fa09682f2540a0f9276d64804034f85 Mon Sep 17 00:00:00 2001 From: Pete Edwards Date: Mon, 22 Jan 2024 09:27:39 +0000 Subject: [PATCH 5/5] Run mvn process-resources to fix formatting --- .../rdf4j/rio/helpers/RDFaParserSettings.java | 12 +++++++----- .../org/eclipse/rdf4j/rio/helpers/RDFaVersion.java | 8 +++++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaParserSettings.java b/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaParserSettings.java index 93064e65429..ce3d2499199 100644 --- a/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaParserSettings.java +++ b/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaParserSettings.java @@ -22,11 +22,13 @@ public class RDFaParserSettings { /** - * Boolean setting for parser to determine the RDFa version to use when processing the document. - * Note that although these settings are not used within RDF4J, they are in use by external plugins. - * @see https://github.com/eclipse-rdf4j/rdf4j/issues/4779 - *

- * Defaults to {@link RDFaVersion#RDFA_1_0}. + * Boolean setting for parser to determine the RDFa version to use when processing the document. Note that although + * these settings are not used within RDF4J, they are in use by external plugins. + * + * @see https://github.com/eclipse-rdf4j/rdf4j/issues/4779 + *

+ * Defaults to {@link RDFaVersion#RDFA_1_0}. */ public static final RioSetting RDFA_COMPATIBILITY = new RioSettingImpl<>( "org.eclipse.rdf4j.rio.rdfa.version", "RDFa Version Compatibility", RDFaVersion.RDFA_1_0); diff --git a/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaVersion.java b/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaVersion.java index 74a3d3db49e..48f7ebeea02 100644 --- a/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaVersion.java +++ b/core/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/RDFaVersion.java @@ -11,9 +11,11 @@ package org.eclipse.rdf4j.rio.helpers; /** - * Enumeration for tracking versions of the RDFa specification to specify processing capabilities of RDFa modules. - * Note that although these settings are not used within RDF4J, they are in use by external plugins. - * @see https://github.com/eclipse-rdf4j/rdf4j/issues/4779 + * Enumeration for tracking versions of the RDFa specification to specify processing capabilities of RDFa modules. Note + * that although these settings are not used within RDF4J, they are in use by external plugins. + * + * @see https://github.com/eclipse-rdf4j/rdf4j/issues/4779 * * @author Peter Ansell */