Add odl-apache-spifly and odl-asm features

This mirrors Karaf's asm and spifly features without requiring the
'specs' dependency baggage.

JIRA: ODLPARENT-296
Change-Id: Ibc97a635f1e4311c307e31fc3fe89a731fb51c9a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/features-odlparent/pom.xml b/features/features-odlparent/pom.xml
index 46a7d61d7f68b1b6507d9232c17a726c13939207..f4b4f33d12869c07439ec217f70bab0872e428ab 100644 (file)
--- a/features/features-odlparent/pom.xml
+++ b/features/features-odlparent/pom.xml
@@ -44,6 +44,19 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-apache-spifly</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-asm</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/features/odl-apache-spifly/pom.xml b/features/odl-apache-spifly/pom.xml
new file mode 100644 (file)
index 0000000..b03a1e9
--- /dev/null
+++ b/features/odl-apache-spifly/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2023 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>template-feature-parent</artifactId>
+        <version>12.0.2-SNAPSHOT</version>
+        <relativePath>../../template-feature-parent</relativePath>
+    </parent>
+
+    <artifactId>odl-apache-spifly</artifactId>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: Apache Aries SPI Fly</name>
+    <description>Apache Aries SPI Fly, a OSGi ServiceLoader Mediator implementation</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-asm</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.aries.spifly</groupId>
+            <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/features/odl-apache-spifly/src/main/feature/template.xml b/features/odl-apache-spifly/src/main/feature/template.xml
new file mode 100644 (file)
index 0000000..100ed87
--- /dev/null
+++ b/features/odl-apache-spifly/src/main/feature/template.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-antlr4">
+    <repository>mvn:org.opendaylight.odlparent/odl-asm/{{versionAsInProject}}/xml/features</repository>
+    <feature name="odl-apache-spifly">
+        <feature>odl-asm</feature>
+        <bundle>mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/{{versionAsInProject}}</bundle>
+    </feature>
+</features>

diff --git a/features/odl-asm/pom.xml b/features/odl-asm/pom.xml
new file mode 100644 (file)
index 0000000..ad0e162
--- /dev/null
+++ b/features/odl-asm/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2023 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>template-feature-parent</artifactId>
+        <version>12.0.2-SNAPSHOT</version>
+        <relativePath>../../template-feature-parent</relativePath>
+    </parent>
+
+    <artifactId>odl-asm</artifactId>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: ASM</name>
+    <description>ASM</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-analysis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-commons</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-tree</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-util</artifactId>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/features/odl-asm/src/main/feature/template.xml b/features/odl-asm/src/main/feature/template.xml
new file mode 100644 (file)
index 0000000..9d5e56d
--- /dev/null
+++ b/features/odl-asm/src/main/feature/template.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-antlr4">
+    <feature name="odl-asm">
+        <bundle>mvn:org.ow2.asm/asm/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.ow2.asm/asm-commons/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.ow2.asm/asm-analysis/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.ow2.asm/asm-tree/{{versionAsInProject}}</bundle>
+        <bundle>mvn:org.ow2.asm/asm-util/{{versionAsInProject}}</bundle>
+    </feature>
+</features>

diff --git a/features/pom.xml b/features/pom.xml
index 57ccab3831c90529373066651ccee8885aae504c..600f455058cb3c56690042bac13087a4b73f67e5 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -39,6 +39,8 @@
         <module>odl-antlr4</module>
         <module>odl-apache-commons-lang3</module>
         <module>odl-apache-commons-text</module>
+        <module>odl-apache-spifly</module>
+        <module>odl-asm</module>
         <module>odl-dropwizard-metrics</module>
         <module>odl-gson</module>
         <module>odl-guava</module>

diff --git a/odlparent-artifacts/pom.xml b/odlparent-artifacts/pom.xml
index 6ec0bf2a4ad4432e68ce8023255c09ca6aa09083..990ecc519df8c8fc506827314fb23c5fc58977f5 100644 (file)
--- a/odlparent-artifacts/pom.xml
+++ b/odlparent-artifacts/pom.xml
@@ -92,6 +92,20 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>odl-apache-spifly</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>odl-asm</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odl-dropwizard-metrics</artifactId>