Use odl-aaa-jakarta-activation-api

Do not package activation-api, use odlparent-provided feature instead.

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

diff --git a/features/odl-aaa-api/pom.xml b/features/odl-aaa-api/pom.xml
index fecaebfcc9dd3d0149bb2ff1f9f214c4b5bf3bce..749d9fae6fec5958efdd56af3cce3750fb1f23e9 100644 (file)
--- a/features/odl-aaa-api/pom.xml
+++ b/features/odl-aaa-api/pom.xml
@@ -29,6 +29,12 @@
             <artifactId>aaa-authn-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-jakarta-activation-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-servlet-api</artifactId>

diff --git a/features/odl-aaa-api/src/main/feature/feature.xml b/features/odl-aaa-api/src/main/feature/feature.xml
index 04057741265bf13855cac318ead4de50141fdd97..0175940c92a0f1b67301dbc6a0be6f5bab2b8231 100644 (file)
--- a/features/odl-aaa-api/src/main/feature/feature.xml
+++ b/features/odl-aaa-api/src/main/feature/feature.xml
@@ -8,6 +8,7 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-aaa-${project.version}">
     <feature name="odl-aaa-api" version="${project.version}">
+        <feature version="[9,10)">odl-jakarta-activation-api</feature>
         <feature version="[9,10)">odl-servlet-api</feature>
         <feature version="[9,10)">odl-ws-rs-api</feature>
         <feature version="[8,9)">odl-mdsal-binding-base</feature>

diff --git a/features/odl-aaa-encryption-service/pom.xml b/features/odl-aaa-encryption-service/pom.xml
index 1c7284d636e3a67c49c186ab84565002b770a9a4..01756d81e0c99b569602222aae4a8ee99d6c67b6 100644 (file)
--- a/features/odl-aaa-encryption-service/pom.xml
+++ b/features/odl-aaa-encryption-service/pom.xml
@@ -36,6 +36,13 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-jakarta-activation-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
         <!-- MD-SAL -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>

diff --git a/features/odl-aaa-encryption-service/src/main/feature/feature.xml b/features/odl-aaa-encryption-service/src/main/feature/feature.xml
index 899a99b961a8c41727bf013541d3821632c01094..fd1d0a736fc9b19f156706025ce86cab2bb2f0cd 100644 (file)
--- a/features/odl-aaa-encryption-service/src/main/feature/feature.xml
+++ b/features/odl-aaa-encryption-service/src/main/feature/feature.xml
@@ -8,6 +8,7 @@
  -->
 <features name="odl-aaa-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-aaa-encryption-service" version="${project.version}">
+        <feature version="[9,10)">odl-jakarta-activation-api</feature>
         <feature version="[4,5)">odl-mdsal-broker</feature>
         <configfile finalname="etc/opendaylight/datastore/initial/config/aaa-encrypt-service-config.xml">
             mvn:org.opendaylight.aaa/aaa-encrypt-service-impl/${project.version}/xml/config