Release version 2.6.0 SDNC oam artifacts

[sdnc/oam.git] / installation / sdnc / pom.xml

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 896565c..649f57d 100644 (file)
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>installation</artifactId>
-        <version>2.5.2-SNAPSHOT</version>
+        <version>2.6.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>installation-sdnc</artifactId>
@@ -30,6 +30,7 @@
 
         <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>
@@ -38,19 +39,30 @@
             mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.features.version}/xml/features,\
             mvn:org.onap.ccsdk.features.sdnr.northbound/sdnr-northbound-all/${ccsdk.features.version}/xml/features,\
             mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features,\
-            mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-oauth/${ccsdk.features.version}/xml/features,\
             mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager/${ccsdk.features.version}/xml/features,\
             mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager-base/${ccsdk.features.version}/xml/features
         </sdnr.features.repo>
 
         <!-- SDNC Features Boot -->
-        <sdnc.features.boot>sdnc-northbound-all</sdnc.features.boot>
+        <sdnc.features.boot>sdnc-northbound-all,odl-restconf-nb-bierman02-</sdnc.features.boot>
+<!--       <sdnc.features.repo>
+            mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features, \
+            mvn:org.onap.ccsdk.odl-legacy.netconf/odl-restconf-nb-bierman02/${ccsdk.bierman.api.version}/xml/features
+        </sdnc.features.repo>-->
         <sdnc.features.repo>
             mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features
         </sdnc.features.repo>
     </properties>
 
     <dependencies>
+       <!-- Biermann RESTCONF northbound API -->
+<!--   <dependency>
+            <groupId>org.onap.ccsdk.odl-legacy.netconf</groupId>
+           <artifactId>restconf-nb-bierman02-installer</artifactId>
+           <version>${ccsdk.bierman.api.version}</version>
+           <type>zip</type>
+           <classifier>repo</classifier>
+       </dependency>-->
         <dependency>
             <groupId>org.onap.sdnc.northbound</groupId>
             <artifactId>generic-resource-api-installer</artifactId>
@@ -388,6 +400,28 @@
                             </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>