Code Review
/
so.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "UT for SDNCNotifyResource"
[so.git]
/
packages
/
pom.xml
diff --git
a/packages/pom.xml
b/packages/pom.xml
index
19d5ed6
..
c298501
100644
(file)
--- a/
packages/pom.xml
+++ b/
packages/pom.xml
@@
-2,12
+2,11
@@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
\r
<modelVersion>4.0.0</modelVersion>
\r
<parent>
\r
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
\r
<modelVersion>4.0.0</modelVersion>
\r
<parent>
\r
- <groupId>org.o
penecom
p.so</groupId>
\r
- <artifactId>so
-parent
</artifactId>
\r
- <version>1.
1
.0-SNAPSHOT</version>
\r
+ <groupId>org.o
na
p.so</groupId>
\r
+ <artifactId>so</artifactId>
\r
+ <version>1.
2
.0-SNAPSHOT</version>
\r
</parent>
\r
\r
</parent>
\r
\r
- <groupId>org.openecomp.so</groupId>
\r
<artifactId>packages</artifactId>
\r
<packaging>pom</packaging>
\r
<name>MSO Packages</name>
\r
<artifactId>packages</artifactId>
\r
<packaging>pom</packaging>
\r
<name>MSO Packages</name>
\r
@@
-26,12
+25,17
@@
</modules>
\r
</profile>
\r
\r
</modules>
\r
</profile>
\r
\r
+ <!-- Those profile are exclusive, choose docker or with-integration-tests -->
\r
<profile>
\r
<id>docker</id>
\r
<modules>
\r
<module>deliveries</module>
\r
<module>docker</module>
\r
</modules>
\r
<profile>
\r
<id>docker</id>
\r
<modules>
\r
<module>deliveries</module>
\r
<module>docker</module>
\r
</modules>
\r
+ <properties>
\r
+ <!-- For this profile we probably don't want to skip the docker push (if deploy goal is specified) -->
\r
+ <docker.skip.push>false</docker.skip.push>
\r
+ </properties>
\r
</profile>
\r
\r
<profile>
\r
</profile>
\r
\r
<profile>
\r
@@
-41,6
+45,10
@@
<module>docker</module>
\r
<module>arquillian-unit-tests</module>
\r
</modules>
\r
<module>docker</module>
\r
<module>arquillian-unit-tests</module>
\r
</modules>
\r
+ <properties>
\r
+ <!-- For this profile we want to skip the docker push (if deploy goal is specified) -->
\r
+ <docker.skip.push>true</docker.skip.push>
\r
+ </properties>
\r
</profile>
\r
\r
</profiles>
\r
</profile>
\r
\r
</profiles>
\r