Code Review
/
ccsdk
/
parent.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Roll master version for Istanbul
[ccsdk/parent.git]
/
odlparent
/
setup
/
pom.xml
diff --git
a/odlparent/setup/pom.xml
b/odlparent/setup/pom.xml
index
c2a519a
..
af05808
100755
(executable)
--- a/
odlparent/setup/pom.xml
+++ b/
odlparent/setup/pom.xml
@@
-5,12
+5,12
@@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-aggregator</artifactId>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-aggregator</artifactId>
- <version>
1.5
.0-SNAPSHOT</version>
+ <version>
2.2
.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>setup</artifactId>
</parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>setup</artifactId>
- <version>
1.5
.0-SNAPSHOT</version>
+ <version>
2.2
.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
<packaging>pom</packaging>
<name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@
-44,6
+44,7
@@
<filters>
<filter>${basedir}/src/main/properties/binding-parent.properties</filter>
</filters>
<filters>
<filter>${basedir}/src/main/properties/binding-parent.properties</filter>
</filters>
+ <encoding>UTF-8</encoding>
</configuration>
</execution>
<execution>
</configuration>
</execution>
<execution>
@@
-67,6
+68,7
@@
<filters>
<filter>${basedir}/src/main/properties/bundle-parent.properties</filter>
</filters>
<filters>
<filter>${basedir}/src/main/properties/bundle-parent.properties</filter>
</filters>
+ <encoding>UTF-8</encoding>
</configuration>
</execution>
<execution>
</configuration>
</execution>
<execution>
@@
-90,6
+92,7
@@
<filters>
<filter>${basedir}/src/main/properties/feature-repo-parent.properties</filter>
</filters>
<filters>
<filter>${basedir}/src/main/properties/feature-repo-parent.properties</filter>
</filters>
+ <encoding>UTF-8</encoding>
</configuration>
</execution>
<execution>
</configuration>
</execution>
<execution>
@@
-113,6
+116,7
@@
<filters>
<filter>${basedir}/src/main/properties/karaf4-parent.properties</filter>
</filters>
<filters>
<filter>${basedir}/src/main/properties/karaf4-parent.properties</filter>
</filters>
+ <encoding>UTF-8</encoding>
</configuration>
</execution>
<execution>
</configuration>
</execution>
<execution>
@@
-136,6
+140,7
@@
<filters>
<filter>${basedir}/src/main/properties/mdsal-it-parent.properties</filter>
</filters>
<filters>
<filter>${basedir}/src/main/properties/mdsal-it-parent.properties</filter>
</filters>
+ <encoding>UTF-8</encoding>
</configuration>
</execution>
<execution>
</configuration>
</execution>
<execution>
@@
-159,6
+164,7
@@
<filters>
<filter>${basedir}/src/main/properties/odlparent.properties</filter>
</filters>
<filters>
<filter>${basedir}/src/main/properties/odlparent.properties</filter>
</filters>
+ <encoding>UTF-8</encoding>
</configuration>
</execution>
<execution>
</configuration>
</execution>
<execution>
@@
-182,6
+188,7
@@
<filters>
<filter>${basedir}/src/main/properties/odlparent-lite.properties</filter>
</filters>
<filters>
<filter>${basedir}/src/main/properties/odlparent-lite.properties</filter>
</filters>
+ <encoding>UTF-8</encoding>
</configuration>
</execution>
<execution>
</configuration>
</execution>
<execution>
@@
-205,6
+212,7
@@
<filters>
<filter>${basedir}/src/main/properties/single-feature-parent.properties</filter>
</filters>
<filters>
<filter>${basedir}/src/main/properties/single-feature-parent.properties</filter>
</filters>
+ <encoding>UTF-8</encoding>
</configuration>
</execution>
</executions>
</configuration>
</execution>
</executions>