From 5570dd1a84a3d3aa59302bbf937b9d6b82c3daa9 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Fri, 7 May 2021 16:08:44 -0400
Subject: [PATCH] Fix versions for Aluminum SR3

Fix versions of odl-shiro and for CCSDK versions (use released versions
instead of snapshots)

Issue-ID: CCSDK-3285
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: If4b61284749660ce49522f6af58bf3d25c728412
---
 odlsli/odlsli-alpine/pom.xml                  | 10 +++++-----
 opendaylight/aluminum/aluminum-alpine/pom.xml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 662788d2..f092ce05 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -25,7 +25,7 @@
 
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-	    <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
+	<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
 
         <docker.verbose>true</docker.verbose>
 
@@ -38,12 +38,12 @@
             ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all
         </ccsdk.odl.features>
         <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra>
-	    <ccsdk.features.version>1.1.5-SNAPSHOT</ccsdk.features.version>
-        <ccsdk.sli.version>1.2.3-SNAPSHOT</ccsdk.sli.version>
-	    <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
+        <ccsdk.features.version>1.1.5</ccsdk.features.version>
+        <ccsdk.sli.version>1.2.3</ccsdk.sli.version>
+        <ccsdk.sli.core.version>${ccsdk.sli.version}</ccsdk.sli.core.version>
         <ccsdk.sli.adaptors.version>${ccsdk.sli.version}</ccsdk.sli.adaptors.version>
         <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version>
-	    <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version>
+	<ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version>
         <ccsdk.oran.a1adapter.version>1.1.5-SNAPSHOT</ccsdk.oran.a1adapter.version>
         <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks>
     </properties>
diff --git a/opendaylight/aluminum/aluminum-alpine/pom.xml b/opendaylight/aluminum/aluminum-alpine/pom.xml
index 19b76a06..bea2cf6b 100644
--- a/opendaylight/aluminum/aluminum-alpine/pom.xml
+++ b/opendaylight/aluminum/aluminum-alpine/pom.xml
@@ -20,7 +20,7 @@
     <properties>
         <image.name>onap/ccsdk-odl-aluminum-alpine-image</image.name>
         <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId>
-        <odl.shiro.version>0.12.1</odl.shiro.version>
+        <odl.shiro.version>0.12.3</odl.shiro.version>
     </properties>
 
     <build>
-- 
2.16.6