From 613c98d0455da421ef6ca20e94f16f1294a2459d Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 28 Jun 2021 21:35:00 +0200 Subject: [PATCH] Require SCR in yang-{data,parser}-impl We need OSGi with SCR, otherwise we end up without activated services. Make sure we have the appropriate annotation. Change-Id: I5c7e67a531bb7b4e4c48de1872bcfc320557073f Signed-off-by: Robert Varga --- .../yang/data/impl/schema/tree/InMemoryDataTreeFactory.java | 2 ++ .../opendaylight/yangtools/yang/parser/impl/package-info.java | 1 + 2 files changed, 3 insertions(+) diff --git a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeFactory.java b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeFactory.java index 4b98d85639..066d5de8fd 100644 --- a/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeFactory.java +++ b/data/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeFactory.java @@ -42,6 +42,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Deactivate; +import org.osgi.service.component.annotations.RequireServiceComponentRuntime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,6 +52,7 @@ import org.slf4j.LoggerFactory; @MetaInfServices @Singleton @Component(immediate = true) +@RequireServiceComponentRuntime public final class InMemoryDataTreeFactory implements DataTreeFactory { private static final Logger LOG = LoggerFactory.getLogger(InMemoryDataTreeFactory.class); // FIXME: YANGTOOLS-1074: we do not want this name diff --git a/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/package-info.java b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/package-info.java index 7e4a928d7c..acbf539f95 100644 --- a/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/package-info.java +++ b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/package-info.java @@ -9,4 +9,5 @@ * This package holds the 'parser implementation', which really is just glue code holding together the statement * reactor, base RFC6020/RFC7950 support bundles and supported semantic extensions. */ +@org.osgi.service.component.annotations.RequireServiceComponentRuntime package org.opendaylight.yangtools.yang.parser.impl; \ No newline at end of file -- 2.36.6