X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=opendaylight%2Fsulfur%2Fsulfur-alpine%2Fpom.xml;fp=opendaylight%2Fsilicon%2Fsilicon-alpine%2Fpom.xml;h=36a3bc7b06ec48c25399110cd31587cea81df0e0;hp=a353ca9fd27c411d654c4b60ee87e5d6c649631f;hb=b62ae2e4a975ae0531426d7f02a2face4ca12bfc;hpb=8b583df562d47c7d5190f22fe35845fd50820477

diff --git a/opendaylight/silicon/silicon-alpine/pom.xml b/opendaylight/sulfur/sulfur-alpine/pom.xml
similarity index 56%
rename from opendaylight/silicon/silicon-alpine/pom.xml
rename to opendaylight/sulfur/sulfur-alpine/pom.xml
index a353ca9f..36a3bc7b 100644
--- a/opendaylight/silicon/silicon-alpine/pom.xml
+++ b/opendaylight/sulfur/sulfur-alpine/pom.xml
@@ -4,28 +4,23 @@
 
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
-        <artifactId>distribution-odl-silicon</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <artifactId>distribution-odl-sulfur</artifactId>
+        <version>1.4.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>distribution-odl-silicon-docker</artifactId>
+    <artifactId>distribution-odl-sulfur-docker</artifactId>
     <packaging>pom</packaging>
 
-    <name>ccsdk-distribution :: opendaylight :: silicon :: docker</name>
+    <name>ccsdk-distribution :: opendaylight :: sulfur :: docker</name>
     <description>Creates OpenDaylight container</description>
     <organization>
         <name>ONAP</name>
     </organization>
 
     <properties>
-        <image.name>onap/ccsdk-odl-silicon-alpine-image</image.name>
+        <image.name>onap/ccsdk-odl-sulfur-alpine-image</image.name>
         <odl.karaf.artifactId>onap-karaf</odl.karaf.artifactId>
-        <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>
+        <odl.shiro.version>0.15.5</odl.shiro.version>
     </properties>
 
     <build>
@@ -75,7 +70,7 @@
                             <overWriteIfNewer>true</overWriteIfNewer>
                         </configuration>
                     </execution>
-                    <execution>
+                   <!--  <execution>
                         <id>copy-with-alternalte-repo-2</id>
                         <phase>generate-sources</phase>
                         <goals>
@@ -83,7 +78,7 @@
                         </goals>
                         <configuration>
                             <artifactItems>
-                                <artifactItem>
+                                <artifactItem> not yet ready
                                     <groupId>com.highstreet-technologies.aaa</groupId>
                                     <artifactId>aaa-authn-api</artifactId>
                                     <version>${odl.shiro.version}</version>
@@ -91,60 +86,12 @@
                                     <destFileName>aaa-authn-api-${odl.shiro.version}.jar</destFileName>
                                     <excludes>*</excludes>
                                 </artifactItem>
-                                <artifactItem>
-                                    <groupId>com.highstreet-technologies.ops4j.pax.web</groupId>
-                                    <artifactId>pax-web-jetty</artifactId>
-                                    <version>${odl.ops4j.version}</version>
-                                    <outputDirectory>${project.build.directory}/docker-stage/system/org/ops4j/pax/web/pax-web-jetty/${odl.ops4j.version}</outputDirectory>
-                                    <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>
                             <overWriteIfNewer>true</overWriteIfNewer>
                         </configuration>
-                    </execution>
+                    </execution> -->
                 </executions>
             </plugin>
 
@@ -178,26 +125,6 @@
                             </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>