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

diff --git a/common/util/bnd.bnd b/common/util/bnd.bnd
new file mode 100644 (file)
index 0000000..544a02c
--- /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 4379e287c85641406b9e95f03784f836a8b6c9a8..62a403f53d8680f0be61928d2a71647833962471 100644 (file)
--- a/common/util/pom.xml
+++ b/common/util/pom.xml
@@ -11,13 +11,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>bundle-parent</artifactId>
+        <artifactId>bnd-parent</artifactId>
         <version>8.0.0-SNAPSHOT</version>
-        <relativePath>../../bundle-parent</relativePath>
+        <relativePath>../../bnd-parent</relativePath>
     </parent>
 
     <artifactId>util</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>${project.artifactId}</name>
     <description>Common utilities</description>
 

diff --git a/common/util/src/main/java/module-info.java b/common/util/src/main/java/module-info.java
index de64f4ef03d0632a59261eb4d79ead3647f50785..b5fdf33e74e0f2b01ad677d8e1d9029ff48f88a8 100644 (file)
--- 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 (file)
index 0000000..8aa9a4c
--- /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 (file)
index 0000000..deb40a1
--- /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 (file)
index 0000000..cecc5fa
--- /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;