From: Robert Varga Date: Tue, 8 Feb 2022 13:38:45 +0000 (+0100) Subject: Migrate common/util to bnd-parent X-Git-Tag: v8.0.0~47 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=yangtools.git;a=commitdiff_plain;h=3114b4e7caf7621137cd1225123eeed6c7937695 Migrate common/util to bnd-parent We have a better-integrated parent, use that instead of the old felix plugin. Also add a bit of documentation. Change-Id: Id400abd10892fd350f3f50119f5247d09f6e5fe4 Signed-off-by: Robert Varga --- diff --git a/common/util/bnd.bnd b/common/util/bnd.bnd new file mode 100644 index 0000000000..544a02c9c4 --- /dev/null +++ b/common/util/bnd.bnd @@ -0,0 +1 @@ +Import-Package: org.checkerframework.*;resolution:=optional, * diff --git a/common/util/pom.xml b/common/util/pom.xml index 4379e287c8..62a403f53d 100644 --- a/common/util/pom.xml +++ b/common/util/pom.xml @@ -11,13 +11,13 @@ 4.0.0 org.opendaylight.yangtools - bundle-parent + bnd-parent 8.0.0-SNAPSHOT - ../../bundle-parent + ../../bnd-parent util - bundle + jar ${project.artifactId} Common utilities diff --git a/common/util/src/main/java/module-info.java b/common/util/src/main/java/module-info.java index de64f4ef03..b5fdf33e74 100644 --- a/common/util/src/main/java/module-info.java +++ b/common/util/src/main/java/module-info.java @@ -24,4 +24,5 @@ module org.opendaylight.yangtools.util { requires static org.checkerframework.checker.qual; requires static org.gaul.modernizer_maven_annotations; requires static org.immutables.value.annotations; + requires static org.osgi.annotation.bundle; } diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/package-info.java b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/package-info.java new file mode 100644 index 0000000000..8aa9a4c69c --- /dev/null +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/package-info.java @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2022 PANTHEON.tech, s.r.o. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +/** + * Utility classes for dealing with asynchronous and concurrent tasks. + */ +@Export +package org.opendaylight.yangtools.util.concurrent; + +import org.osgi.annotation.bundle.Export; diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/package-info.java b/common/util/src/main/java/org/opendaylight/yangtools/util/package-info.java new file mode 100644 index 0000000000..deb40a1e25 --- /dev/null +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/package-info.java @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2022 PANTHEON.tech, s.r.o. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +/** + * Various utility classes. + */ +@Export +package org.opendaylight.yangtools.util; + +import org.osgi.annotation.bundle.Export; diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/xml/package-info.java b/common/util/src/main/java/org/opendaylight/yangtools/util/xml/package-info.java new file mode 100644 index 0000000000..cecc5faf28 --- /dev/null +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/xml/package-info.java @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2022 PANTHEON.tech, s.r.o. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +/** + * Utility classes for dealing with XML documents. + */ +@Export +package org.opendaylight.yangtools.util.xml; + +import org.osgi.annotation.bundle.Export;