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 <robert.varga@pantheon.tech>

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 4b98d856393808740a4a877a0f27af8c472d1efc..066d5de8fd120dced0bcb6281861ac98657b6480 100644 (file)
--- 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 7e4a928d7c4ec5313561aa9219a285db7170c26f..acbf539f9588158a08af9f7a2c342b249b51d871 100644 (file)
--- 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