add odl patches to sdnc

add patches for env var and oauth fix to distribution

Issue-ID: SDNC-1857
Change-Id: Ie90f71910a9d3512e91f64b5eea444e4b1158ced
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 87471e6..df2d2a1 100644 (file)
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -24,6 +24,9 @@
         <sdnc.keystore>org.onap.sdnc.p12</sdnc.keystore>
         <sdnc.keypass><![CDATA[;:G58,7ZhqOSI:7^oZCY[9Dv]]></sdnc.keypass>
         <sdnc.secureport>8443</sdnc.secureport>
+        <!-- versions for odl patches -->
+        <odl.aaa.version>0.20.8</odl.aaa.version>
+        <odl.ops4j.version>8.0.27</odl.ops4j.version>
 
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
@@ -420,6 +423,36 @@
                             </artifactItems>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy-with-alternalte-repo</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>${odl.aaa.version}</version>
+                                    <outputDirectory>${project.build.directory}/docker-stage/patches</outputDirectory>
+                                    <destFileName>aaa-authn-api-${odl.aaa.version}.jar</destFileName>
+                                    <excludes>*</excludes>
+                                </artifactItem>
+                                               <artifactItem>
+                                    <groupId>com.highstreet-technologies.org.ops4j.pax.web</groupId>
+                                    <artifactId>pax-web-jetty</artifactId>
+                                    <version>${odl.ops4j.version}</version>
+                                    <outputDirectory>${project.build.directory}/docker-stage/patches</outputDirectory>
+                                    <destFileName>pax-web-jetty-${odl.ops4j.version}.jar</destFileName>
+                                    <excludes>*</excludes>
+                                               </artifactItem>
+                            </artifactItems>
+                           <!--                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                               <overWriteIfNewer>true</overWriteIfNewer> -->
+                        </configuration>
+                    </execution> 
                 </executions>
             </plugin>
             <plugin>

diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index 4946dfe..6d9e3ac 100755 (executable)
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -39,6 +39,10 @@ RUN sed -i -e "\|featuresRepositories|s|$|,${sdnr.features.repo},${sdnc.features
 # Add odl-netconf-topology to boot repositories
 RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 
+# copy patches
+COPY patches/pax-web-jetty-${odl.ops4j.version}.jar $ODL_HOME/system/org/ops4j/pax/web/pax-web-jetty/${odl.ops4j.version}/
+COPY patches/aaa-authn-api-${odl.aaa.version}.jar $ODL_HOME/system/org/opendaylight/aaa/aaa-authn-api/${odl.aaa.version}/
+
 # Add aaa-app-config.xml Only if AAF is set to true (being passed as an argument in docker-maven-plugin configuration)
 COPY aaa-app-config.xml /tmp/aaa-app-config.xml
 RUN if "${AAF}" ; then \