From 4709cfd53b20a8238b8eeb9fe02b406723e27f08 Mon Sep 17 00:00:00 2001 From: Anahide Tchertchian Date: Mon, 15 Feb 2021 10:08:24 +0100 Subject: [PATCH] NXP-29984: remove useless compatWarnOnMerge markers (only one property to define anyway) --- .../nuxeo/ecm/core/io/download/RedirectResolverDescriptor.java | 2 +- .../nuxeo/ecm/automation/io/services/codec/CodecDescriptor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/nuxeo-core-io/src/main/java/org/nuxeo/ecm/core/io/download/RedirectResolverDescriptor.java b/modules/core/nuxeo-core-io/src/main/java/org/nuxeo/ecm/core/io/download/RedirectResolverDescriptor.java index 838d43056b46..a7fcc41eecb0 100644 --- a/modules/core/nuxeo-core-io/src/main/java/org/nuxeo/ecm/core/io/download/RedirectResolverDescriptor.java +++ b/modules/core/nuxeo-core-io/src/main/java/org/nuxeo/ecm/core/io/download/RedirectResolverDescriptor.java @@ -28,7 +28,7 @@ * @author Remi Cattiau */ @XObject("redirectResolver") -@XRegistry(compatWarnOnMerge = true) +@XRegistry public class RedirectResolverDescriptor { @XNode("@class") diff --git a/modules/platform/nuxeo-automation/nuxeo-automation-io/src/main/java/org/nuxeo/ecm/automation/io/services/codec/CodecDescriptor.java b/modules/platform/nuxeo-automation/nuxeo-automation-io/src/main/java/org/nuxeo/ecm/automation/io/services/codec/CodecDescriptor.java index a9b86ebd72a4..91a9a298757a 100644 --- a/modules/platform/nuxeo-automation/nuxeo-automation-io/src/main/java/org/nuxeo/ecm/automation/io/services/codec/CodecDescriptor.java +++ b/modules/platform/nuxeo-automation/nuxeo-automation-io/src/main/java/org/nuxeo/ecm/automation/io/services/codec/CodecDescriptor.java @@ -27,7 +27,7 @@ * @author Bogdan Stefanescu */ @XObject("codec") -@XRegistry(compatWarnOnMerge = true) +@XRegistry public class CodecDescriptor { @XNode("@class")