From 49f706eeb312627e09f2c1f9fe34a1fd7b38d030 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 2 Oct 2020 18:57:24 +0200
Subject: [PATCH] Add Scala packaging

This is a straight transplant of odl-scala-2.13 feature from
odlparent-7.0.6.

JIRA: CONTROLLER-1959
Change-Id: I7302b769961df092eaa7dbfbaaa90e723e70e263
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                             |  7 +++
 features/features-controller/pom.xml          |  6 +++
 features/odl-controller-scala/pom.xml         | 46 +++++++++++++++++++
 .../src/main/history/dependencies.xml         |  8 ++++
 features/pom.xml                              |  3 ++
 5 files changed, 70 insertions(+)
 create mode 100644 features/odl-controller-scala/pom.xml
 create mode 100644 features/odl-controller-scala/src/main/history/dependencies.xml

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index cdf6964efd..c5f7bc4e61 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -278,6 +278,13 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-controller-scala</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-mdsal-broker</artifactId>
diff --git a/features/features-controller/pom.xml b/features/features-controller/pom.xml
index 0fe542ccb1..178d0e6b18 100644
--- a/features/features-controller/pom.xml
+++ b/features/features-controller/pom.xml
@@ -35,6 +35,12 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-controller-scala</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
diff --git a/features/odl-controller-scala/pom.xml b/features/odl-controller-scala/pom.xml
new file mode 100644
index 0000000000..1c474fea62
--- /dev/null
+++ b/features/odl-controller-scala/pom.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2016 Red Hat, Inc. 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.controller</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../single-feature-parent</relativePath>
+    </parent>
+
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>odl-controller-scala</artifactId>
+    <packaging>feature</packaging>
+
+    <name>Scala Runtime for OpenDaylight</name>
+
+    <properties>
+        <checkDependencyChange>true</checkDependencyChange>
+        <failOnDependencyChange>true</failOnDependencyChange>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-reflect</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.scala-lang.modules</groupId>
+            <artifactId>scala-java8-compat_2.13</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/features/odl-controller-scala/src/main/history/dependencies.xml b/features/odl-controller-scala/src/main/history/dependencies.xml
new file mode 100644
index 0000000000..9f991cb9c0
--- /dev/null
+++ b/features/odl-controller-scala/src/main/history/dependencies.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-controller-scala">
+    <feature version="0.0.0">
+        <bundle>mvn:org.scala-lang.modules/scala-java8-compat_2.13/0.9.1</bundle>
+        <bundle>mvn:org.scala-lang/scala-library/2.13.3</bundle>
+        <bundle>mvn:org.scala-lang/scala-reflect/2.13.3</bundle>
+    </feature>
+</features>
diff --git a/features/pom.xml b/features/pom.xml
index f5e33eb59f..bd87aab4f4 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -42,6 +42,9 @@
     <module>odl-clustering-test-app</module>
     <module>odl-mdsal-benchmark</module>
 
+    <!-- Scala feature -->
+    <module>odl-controller-scala</module>
+
     <!-- Single features, to be cleaned up -->
     <module>odl-controller-blueprint</module>
     <module>odl-controller-mdsal-common</module>
-- 
2.36.6