summaryrefslogtreecommitdiffstats
path: root/saltstack-adapter/saltstack-adapter-features
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-features
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-features')
-rw-r--r--saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml6
-rwxr-xr-xsaltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml9
-rw-r--r--saltstack-adapter/saltstack-adapter-features/pom.xml8
-rw-r--r--saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml24
4 files changed, 31 insertions, 16 deletions
diff --git a/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml b/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml
index cf151ca59..d90b39763 100644
--- a/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>
<artifactId>single-feature-parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
- <relativePath />
+ <relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
diff --git a/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml b/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml
index 1b482d053..703949c06 100755
--- a/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>
<artifactId>feature-repo-parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
- <relativePath />
+ <relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
@@ -14,7 +16,8 @@
<version>0.3.0-SNAPSHOT</version>
<packaging>feature</packaging>
- <name>ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId}</name>
+ <name>ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId}
+ </name>
<dependencies>
<dependency>
diff --git a/saltstack-adapter/saltstack-adapter-features/pom.xml b/saltstack-adapter/saltstack-adapter-features/pom.xml
index 6f765c8fb..7f7885991 100644
--- a/saltstack-adapter/saltstack-adapter-features/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-features/pom.xml
@@ -10,8 +10,9 @@
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. ============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>
<artifactId>odlparent-lite</artifactId>
@@ -22,7 +23,8 @@
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>saltstack-adapter-features</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>
diff --git a/saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml b/saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml
index 6eef6d27c..abdcb5e20 100644
--- a/saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml
+++ b/saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml
@@ -24,17 +24,25 @@
-->
-<features name="ccsdk-saltstack-adapter-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+<features xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ name="ccsdk-saltstack-adapter-${project.version}"
+ xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
- <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
-
- <feature name='ccsdk-saltstack-adapter' description="ccsdk-saltstack-adapter" version='${project.version}'>
+ <repository>
+ mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features
+ </repository>
+
+ <feature name='ccsdk-saltstack-adapter'
+ description="ccsdk-saltstack-adapter" version='${project.version}'>
<feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
<feature>sdnc-sli</feature>
- <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle>
- <bundle>mvn:org.onap.ccsdk.sli.adaptors/saltstack-adapter-provider/${project.version}</bundle>
+ <bundle dependency="true">
+ mvn:org.onap.appc/appc-common/${project.version}
+ </bundle>
+ <bundle>
+ mvn:org.onap.ccsdk.sli.adaptors/saltstack-adapter-provider/${project.version}
+ </bundle>
</feature>
</features>