From: Michael Dürre <michael.duerre@highstreet-technologies.com>
Date: Tue, 26 Mar 2024 12:36:10 +0000 (+0100)
Subject: removed duplicated odl patch
X-Git-Tag: 2.6.1~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=19eadd8f2b80b9813d2426398ea2022a77f34515;p=sdnc%2Foam.git

removed duplicated odl patch

removed aaa authn patch overwrite from ccsdk

Issue-ID: SDNC-1839
Change-Id: Id6194166b2a81ff34727a035759a31ed4d06eef1
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
(cherry picked from commit b288a302100fb4f843cc494b73c0c3ec4be4a413)
---

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 75e3152c..12f6bdd3 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -30,7 +30,6 @@
 
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks>
-        <odl.shiro.version>0.17.11</odl.shiro.version>
 
         <!-- SDNR Features Boot -->
         <sdnr.features.boot>ccsdk-features-all</sdnr.features.boot>
@@ -398,28 +397,6 @@
                             </artifactItems>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>copy-with-alternalte-repo-2</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>com.highstreet-technologies.aaa</groupId>
-                                    <artifactId>aaa-authn-api</artifactId>
-                                    <version>0.17.8</version>
-                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-authn-api/${odl.shiro.version}</outputDirectory>
-                                    <destFileName>aaa-authn-api-${odl.shiro.version}.jar</destFileName>
-                                    <excludes>*</excludes>
-                                </artifactItem>
-                            </artifactItems>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                            <overWriteIfNewer>true</overWriteIfNewer>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
             <plugin>