Migrate concepts to bnd-parent

A straightforward migration to use bnd-maven-plugin.

Change-Id: Ie8bb442046b611eeec072a3e4f18eb98f955ef80
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bnd-parent/pom.xml b/bnd-parent/pom.xml
new file mode 100644 (file)
index 0000000..1653265
--- /dev/null
+++ b/bnd-parent/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ 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
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>bnd-parent</artifactId>
+        <version>9.0.12</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.yangtools</groupId>
+    <artifactId>bnd-parent</artifactId>
+    <version>8.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>${project.artifactId}</name>
+    <description>Bundle parent (bnd-based)</description>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yangtools-artifacts</artifactId>
+                <version>8.0.0-SNAPSHOT</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <scm>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/yangtools.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/yangtools.git</developerConnection>
+        <tag>HEAD</tag>
+        <url>https://wiki.opendaylight.org/display/ODL/YANG+Tools</url>
+    </scm>
+</project>

diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml
index 2c97846a475fdd556cd82890672f71bea062e9b1..919cad7a9706a38bb943a7009ec7d1d0f243565d 100644 (file)
--- a/bundle-parent/pom.xml
+++ b/bundle-parent/pom.xml
@@ -21,7 +21,7 @@
     <version>8.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
-    <description>Bundle parent</description>
+    <description>Bundle parent (felix-based)</description>
 
     <dependencyManagement>
         <dependencies>

diff --git a/common/concepts/bnd.bnd b/common/concepts/bnd.bnd
new file mode 100644 (file)
index 0000000..544a02c
--- /dev/null
+++ b/common/concepts/bnd.bnd
@@ -0,0 +1 @@
+Import-Package: org.checkerframework.*;resolution:=optional, *

diff --git a/common/concepts/pom.xml b/common/concepts/pom.xml
index 1648657633621d2b6ea9e869d24666972d4cfac2..e3b738684980274a2daf39945965863ba1b65a84 100644 (file)
--- a/common/concepts/pom.xml
+++ b/common/concepts/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>concepts</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
     <name>${project.artifactId}</name>
     <description>Common concepts</description>
 
@@ -31,6 +31,10 @@
             <artifactId>checker-qual</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>

diff --git a/common/concepts/src/main/java/module-info.java b/common/concepts/src/main/java/module-info.java
index bc99c7d6db4970bed9f013d0ae88ae3995c42c9f..dae5498a8ad6a531c2667b68667c16a26a481058 100644 (file)
--- a/common/concepts/src/main/java/module-info.java
+++ b/common/concepts/src/main/java/module-info.java
@@ -15,4 +15,5 @@ module org.opendaylight.yangtools.concepts {
     requires static transitive org.eclipse.jdt.annotation;
     requires static com.github.spotbugs.annotations;
     requires static org.checkerframework.checker.qual;
+    requires static osgi.annotation;
 }

diff --git a/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/package-info.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/package-info.java
new file mode 100644 (file)
index 0000000..bee8ec2
--- /dev/null
+++ b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/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
+ */
+/**
+ * Concept used widely across OpenDaylight code base.
+ */
+@Export
+package org.opendaylight.yangtools.concepts;
+
+import org.osgi.annotation.bundle.Export;

diff --git a/pom.xml b/pom.xml
index c4b49d3e6b65a8e0b729b1491e563b568c1a1085..80fa8ff2927b27e1fb2fd8ab8d433cb97e6e9276 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,7 @@
         <module>features</module>
 
         <module>benchmarks</module>
+        <module>bnd-parent</module>
         <module>bundle-parent</module>
         <module>codec</module>
         <module>common</module>