aboutsummaryrefslogtreecommitdiffstats
path: root/saltstack-adapter/saltstack-adapter-installer
diff options
context:
space:
mode:
authorGanesh Chandrasekaran <ganesh.c@samsung.com>2018-07-23 14:27:22 +0900
committerGanesh Chandrasekaran <ganesh.c@samsung.com>2018-07-23 14:27:37 +0900
commit021cae43d3b22dcbd41e7b34ca4215c167714ab4 (patch)
tree7ef08cca0a2a169fc7456c7416e3557969cd8582 /saltstack-adapter/saltstack-adapter-installer
parente70da25135855b88571b19c108089b74181996a6 (diff)
Use ByteStream instead of FileStream
Issue-ID: CCSDK-393 Change-Id: Id004f0bce1768e00f3e326efc204532acdb22546 Signed-off-by: Ganesh Chandrasekaran <ganesh.c@samsung.com>
Diffstat (limited to 'saltstack-adapter/saltstack-adapter-installer')
-rw-r--r--saltstack-adapter/saltstack-adapter-installer/pom.xml40
-rw-r--r--saltstack-adapter/saltstack-adapter-installer/src/assembly/assemble_installer_zip.xml63
-rw-r--r--saltstack-adapter/saltstack-adapter-installer/src/assembly/assemble_mvnrepo_zip.xml38
3 files changed, 78 insertions, 63 deletions
diff --git a/saltstack-adapter/saltstack-adapter-installer/pom.xml b/saltstack-adapter/saltstack-adapter-installer/pom.xml
index b600aed6..db72000f 100644
--- a/saltstack-adapter/saltstack-adapter-installer/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-installer/pom.xml
@@ -22,7 +22,9 @@
============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">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ 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>
@@ -33,12 +35,15 @@
<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>
+ <name>ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId}
+ </name>
<packaging>pom</packaging>
<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>
@@ -79,11 +84,15 @@
</goals>
<phase>package</phase>
<configuration>
- <appendAssemblyId>true</appendAssemblyId>
+ <appendAssemblyId>true</appendAssemblyId>
<attach>false</attach>
- <finalName>stage/${application.name}-${project.version}</finalName>
+ <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>
</configuration>
</execution>
@@ -94,11 +103,14 @@
</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>
</configuration>
</execution>
@@ -116,7 +128,9 @@
<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>
@@ -140,10 +154,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>
diff --git a/saltstack-adapter/saltstack-adapter-installer/src/assembly/assemble_installer_zip.xml b/saltstack-adapter/saltstack-adapter-installer/src/assembly/assemble_installer_zip.xml
index 7d212cbb..d307e4f3 100644
--- a/saltstack-adapter/saltstack-adapter-installer/src/assembly/assemble_installer_zip.xml
+++ b/saltstack-adapter/saltstack-adapter-installer/src/assembly/assemble_installer_zip.xml
@@ -25,38 +25,37 @@
<!-- Defines how we build the .zip file which is our distribution. -->
<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>adapter</id>
- <formats>
- <format>zip</format>
- </formats>
-
- <!-- we want "system" and related files right at the root level
- as this file is suppose to be unzip on top of a karaf
- distro. -->
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>target/stage/</directory>
- <outputDirectory>${application.name}</outputDirectory>
- <fileMode>755</fileMode>
- <includes>
- <include>*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target/stage/</directory>
- <outputDirectory>${application.name}</outputDirectory>
- <fileMode>644</fileMode>
- <excludes>
- <exclude>*.sh</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>adapter</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <!-- we want "system" and related files right at the root level
+ as this file is suppose to be unzip on top of a karaf
+ distro. -->
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>target/stage/</directory>
+ <outputDirectory>${application.name}</outputDirectory>
+ <fileMode>755</fileMode>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target/stage/</directory>
+ <outputDirectory>${application.name}</outputDirectory>
+ <fileMode>644</fileMode>
+ <excludes>
+ <exclude>*.sh</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
</assembly>
diff --git a/saltstack-adapter/saltstack-adapter-installer/src/assembly/assemble_mvnrepo_zip.xml b/saltstack-adapter/saltstack-adapter-installer/src/assembly/assemble_mvnrepo_zip.xml
index 93df6602..1b1bf0b6 100644
--- a/saltstack-adapter/saltstack-adapter-installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/saltstack-adapter/saltstack-adapter-installer/src/assembly/assemble_mvnrepo_zip.xml
@@ -25,26 +25,26 @@
<!-- Defines how we build the .zip file which is our distribution. -->
<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>repo</id>
- <formats>
- <format>zip</format>
- </formats>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>repo</id>
+ <formats>
+ <format>zip</format>
+ </formats>
- <!-- we want "system" and related files right at the root level
- as this file is suppose to be unzip on top of a karaf
- distro. -->
- <includeBaseDirectory>false</includeBaseDirectory>
+ <!-- we want "system" and related files right at the root level
+ as this file is suppose to be unzip on top of a karaf
+ distro. -->
+ <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/assembly/</directory>
- <outputDirectory>.</outputDirectory>
- <excludes>
- </excludes>
- </fileSet>
- </fileSets>
+ <fileSets>
+ <fileSet>
+ <directory>target/assembly/</directory>
+ <outputDirectory>.</outputDirectory>
+ <excludes>
+ </excludes>
+ </fileSet>
+ </fileSets>
</assembly>