From 4c281cda7abbd418acd6a2f77eeb268041029c90 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 9 Aug 2021 11:48:02 +0200
Subject: [PATCH] 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>
---
 features/odl-aaa-api/pom.xml                               | 6 ++++++
 features/odl-aaa-api/src/main/feature/feature.xml          | 1 +
 features/odl-aaa-encryption-service/pom.xml                | 7 +++++++
 .../src/main/feature/feature.xml                           | 1 +
 4 files changed, 15 insertions(+)

diff --git a/features/odl-aaa-api/pom.xml b/features/odl-aaa-api/pom.xml
index fecaebfcc..749d9fae6 100644
--- 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 040577412..0175940c9 100644
--- 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 1c7284d63..01756d81e 100644
--- 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 899a99b96..fd1d0a736 100644
--- 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
-- 
2.36.6