Code Review
/
ccsdk
/
sli
/
adaptors.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Code changes for OpenDaylight Neon
[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
011bcf0
..
639e308
100644
(file)
--- a/
saltstack-adapter/saltstack-adapter-installer/pom.xml
+++ b/
saltstack-adapter/saltstack-adapter-installer/pom.xml
@@
-22,19
+22,17
@@
============LICENSE_END=========================================================
-->
============LICENSE_END=========================================================
-->
-<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">
+<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>odlparent-lite</artifactId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.
1.1
-SNAPSHOT</version>
+ <version>1.
4.0
-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>saltstack-adapter-installer</artifactId>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>saltstack-adapter-installer</artifactId>
- <version>0.
3.1
-SNAPSHOT</version>
+ <version>0.
6.0
-SNAPSHOT</version>
<name>ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId}
</name>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId}
</name>
<packaging>pom</packaging>
@@
-66,11
+64,6
@@
<version>${project.version}</version>
</dependency>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
- <version>7.0</version>
- </dependency>
</dependencies>
<build>
<plugins>
</dependencies>
<build>
<plugins>
@@
-85,7
+78,7
@@
<phase>package</phase>
<configuration>
<appendAssemblyId>true</appendAssemblyId>
<phase>package</phase>
<configuration>
<appendAssemblyId>true</appendAssemblyId>
- <attach>
fals
e</attach>
+ <attach>
tru
e</attach>
<finalName>
stage/${application.name}-${project.version}
</finalName>
<finalName>
stage/${application.name}-${project.version}
</finalName>
@@
-94,6
+87,7
@@
src/assembly/assemble_mvnrepo_zip.xml
</descriptor>
</descriptors>
src/assembly/assemble_mvnrepo_zip.xml
</descriptor>
</descriptors>
+ <appendAssemblyId>true</appendAssemblyId>
</configuration>
</execution>
<execution>
</configuration>
</execution>
<execution>
@@
-112,6
+106,7
@@
src/assembly/assemble_installer_zip.xml
</descriptor>
</descriptors>
src/assembly/assemble_installer_zip.xml
</descriptor>
</descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
</executions>
</configuration>
</execution>
</executions>