Roll to initial Honolulu release version

[ccsdk/sli/adaptors.git] / saltstack-adapter / saltstack-adapter-installer / pom.xml

diff --git a/saltstack-adapter/saltstack-adapter-installer/pom.xml b/saltstack-adapter/saltstack-adapter-installer/pom.xml
index b600aed..46cb2dc 100644 (file)
--- a/saltstack-adapter/saltstack-adapter-installer/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-installer/pom.xml
@@ -22,51 +22,44 @@
 
   ============LICENSE_END=========================================================
   -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
+
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
     <artifactId>saltstack-adapter-installer</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <name>ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId}</name>
+    <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
+
+    <name>ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId}
+    </name>
+
     <properties>
         <application.name>ccsdk-saltstack-adapter</application.name>
         <features.boot>${application.name}</features.boot>
-        <features.repositories>mvn:org.onap.ccsdk.sli.adaptors/${features.boot}/${project.version}/xml/features</features.repositories>
+        <features.repositories>
+            mvn:org.onap.ccsdk.sli.adaptors/${features.boot}/${project.version}/xml/features
+        </features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
+
     <dependencies>
-        <dependency>
-            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-            <artifactId>${application.name}</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>saltstack-adapter-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>7.0</version>
-        </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -79,12 +72,17 @@
                         </goals>
                         <phase>package</phase>
                         <configuration>
-                               <appendAssemblyId>true</appendAssemblyId>
-                            <attach>false</attach>
-                            <finalName>stage/${application.name}-${project.version}</finalName>
+                            <appendAssemblyId>true</appendAssemblyId>
+                            <attach>true</attach>
+                            <finalName>
+                                stage/${application.name}-${project.version}
+                            </finalName>
                             <descriptors>
-                                <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                                <descriptor>
+                                    src/assembly/assemble_mvnrepo_zip.xml
+                                </descriptor>
                             </descriptors>
+                            <appendAssemblyId>true</appendAssemblyId>
                         </configuration>
                     </execution>
                     <execution>
@@ -94,12 +92,16 @@
                         </goals>
                         <phase>package</phase>
                         <configuration>
-                               <appendAssemblyId>false</appendAssemblyId>
+                            <appendAssemblyId>false</appendAssemblyId>
                             <attach>true</attach>
-                            <finalName>${application.name}-${project.version}</finalName>
+                            <finalName>${application.name}-${project.version}
+                            </finalName>
                             <descriptors>
-                                <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
+                                <descriptor>
+                                    src/assembly/assemble_installer_zip.xml
+                                </descriptor>
                             </descriptors>
+                            <appendAssemblyId>false</appendAssemblyId>
                         </configuration>
                     </execution>
                 </executions>
@@ -116,14 +118,16 @@
                         <phase>prepare-package</phase>
                         <configuration>
                             <transitive>false</transitive>
-                            <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+                            <outputDirectory>
+                                ${project.build.directory}/assembly/system
+                            </outputDirectory>
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>true</overWriteSnapshots>
                             <overWriteIfNewer>true</overWriteIfNewer>
                             <useRepositoryLayout>true</useRepositoryLayout>
                             <addParentPoms>false</addParentPoms>
                             <copyPom>false</copyPom>
-                            <excludeGroupIds>org.opendaylight</excludeGroupIds>
+                            <includeGroupIds>org.onap.ccsdk.sli.adaptors</includeGroupIds>
                             <scope>provided</scope>
                         </configuration>
                     </execution>
@@ -140,10 +144,12 @@
                         <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
-                            <outputDirectory>${basedir}/target/stage</outputDirectory>
+                            <outputDirectory>${basedir}/target/stage
+                            </outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>src/main/resources/scripts</directory>
+                                    <directory>src/main/resources/scripts
+                                    </directory>
                                     <includes>
                                         <include>install-feature.sh</include>
                                     </includes>