X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=opendaylight%2Fsilicon%2Fsilicon-alpine%2Fpom.xml;h=a353ca9fd27c411d654c4b60ee87e5d6c649631f;hb=915afd39a6265d7f13da81e17fc411367b3c11fa;hp=c2f0a37c58ed16a727af075461a68a9a1cd78b45;hpb=482a20f6d8812da892c1389fea214afe9b8b2194;p=ccsdk%2Fdistribution.git

diff --git a/opendaylight/silicon/silicon-alpine/pom.xml b/opendaylight/silicon/silicon-alpine/pom.xml
index c2f0a37c..a353ca9f 100644
--- a/opendaylight/silicon/silicon-alpine/pom.xml
+++ b/opendaylight/silicon/silicon-alpine/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-odl-silicon</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-odl-silicon-docker</artifactId>
@@ -20,8 +20,12 @@
     <properties>
         <image.name>onap/ccsdk-odl-silicon-alpine-image</image.name>
         <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId>
-        <odl.shiro.version>0.13.3</odl.shiro.version>
-        <odl.ops4j.version>7.3.13</odl.ops4j.version>
+        <odl.shiro.version>0.13.5</odl.shiro.version>
+        <odl.ops4j.version>7.3.16</odl.ops4j.version>
+        <odl.pax.logging.version>2.0.9</odl.pax.logging.version>
+        <patch.pax.logging.version>2.0.14</patch.pax.logging.version>
+        <odl.karaf.framework.version>4.3.2</odl.karaf.framework.version>
+        <odl.netconf.version>1.13.4</odl.netconf.version>
     </properties>
 
     <build>
@@ -79,14 +83,6 @@
                         </goals>
                         <configuration>
                             <artifactItems>
-                                <artifactItem>
-                                    <groupId>com.highstreet-technologies.aaa</groupId>
-                                    <artifactId>aaa-shiro</artifactId>
-                                    <version>${odl.shiro.version}</version>
-                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/aaa/aaa-shiro/${odl.shiro.version}</outputDirectory>
-                                    <destFileName>aaa-shiro-${odl.shiro.version}.jar</destFileName>
-                                    <excludes>*</excludes>
-                                </artifactItem>
                                 <artifactItem>
                                     <groupId>com.highstreet-technologies.aaa</groupId>
                                     <artifactId>aaa-authn-api</artifactId>
@@ -103,6 +99,46 @@
                                     <destFileName>pax-web-jetty-${odl.ops4j.version}.jar</destFileName>
                                     <excludes>*</excludes>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.highstreet-technologies.netconf</groupId>
+                                    <artifactId>netconf-util</artifactId>
+                                    <version>${odl.netconf.version}</version>
+                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/netconf/netconf-util/${odl.netconf.version}</outputDirectory>
+                                    <destFileName>netconf-util-${odl.netconf.version}.jar</destFileName>
+                                    <excludes>*</excludes>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>com.highstreet-technologies.netconf</groupId>
+                                    <artifactId>sal-netconf-connector</artifactId>
+                                    <version>${odl.netconf.version}</version>
+                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/opendaylight/netconf/sal-netconf-connector/${odl.netconf.version}</outputDirectory>
+                                    <destFileName>sal-netconf-connector-${odl.netconf.version}.jar</destFileName>
+                                    <excludes>*</excludes>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.ops4j.pax.logging</groupId>
+                                    <artifactId>pax-logging-log4j2</artifactId>
+                                    <version>${patch.pax.logging.version}</version>
+                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-log4j2/${patch.pax.logging.version}</outputDirectory>
+                                    <destFileName>pax-logging-log4j2-${patch.pax.logging.version}.jar</destFileName>
+                                    <excludes>*</excludes>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.ops4j.pax.logging</groupId>
+                                    <artifactId>pax-logging-logback</artifactId>
+                                    <version>${patch.pax.logging.version}</version>
+                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-logback/${patch.pax.logging.version}</outputDirectory>
+                                    <destFileName>pax-logging-logback-${patch.pax.logging.version}.jar</destFileName>
+                                    <excludes>*</excludes>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.ops4j.pax.logging</groupId>
+                                    <artifactId>pax-logging-api</artifactId>
+                                    <version>${patch.pax.logging.version}</version>
+                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/logging/pax-logging-api/${patch.pax.logging.version}</outputDirectory>
+                                    <destFileName>pax-logging-api-${patch.pax.logging.version}.jar</destFileName>
+                                    <excludes>*</excludes>
+                                </artifactItem>
                             </artifactItems>
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>true</overWriteSnapshots>
@@ -142,6 +178,26 @@
                             </resources>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy-karaf-framework-features</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>framework-${odl.karaf.framework.version}-features.xml</include>
+                                        <include>startup.properties</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>