Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Change Beijing Release to 2.1.1
[aaf/authz.git]
/
misc
/
pom.xml
diff --git
a/misc/pom.xml
b/misc/pom.xml
index
26a9545
..
a4945a6
100644
(file)
--- a/
misc/pom.xml
+++ b/
misc/pom.xml
@@
-22,21
+22,21
@@
<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">
<modelVersion>4.0.0</modelVersion>
<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">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.onap.aaf.authz.misc</groupId>
- <artifactId>parent</artifactId>
- <name>AAF Misc Parent</name>
- <version>1.3.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
<parent>
<parent>
-
<groupId>org.onap.oparent
</groupId>
-
<artifactId>o
parent</artifactId>
-
<version>1.1.0
</version>
+
<groupId>org.onap.aaf.authz
</groupId>
+
<artifactId>
parent</artifactId>
+
<version>2.1.1-SNAPSHOT
</version>
</parent>
</parent>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>miscparent</artifactId>
+ <name>AAF Misc Parent</name>
+ <version>2.1.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
<properties>
<!-- SONAR -->
<properties>
<!-- SONAR -->
- <
sonar.skip>true</sonar.skip
>
+ <
!-- <sonar.skip>true</sonar.skip> --
>
<jacoco.version>0.7.7.201606060606</jacoco.version>
<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
<jacoco.version>0.7.7.201606060606</jacoco.version>
<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
@@
-120,6
+120,13
@@
</dependency>
</dependencies>
</dependency>
</dependencies>
+ <modules>
+ <module>env</module>
+ <module>xgen</module>
+ <module>rosetta</module>
+ <module>log4j</module> <!-- note: generates log4j, to avoid Jar conflict -->
+ </modules>
+
<!-- ============================================================== -->
<!-- Define common plugins and make them available for all modules -->
<!-- ============================================================== -->
<!-- ============================================================== -->
<!-- Define common plugins and make them available for all modules -->
<!-- ============================================================== -->
@@
-198,6
+205,12
@@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
<configuration>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
<configuration>
+ <skipTests>false</skipTests>
+ <includes>
+ <include>**/JU*.java</include>
+ </includes>
+ <excludes>
+ </excludes>
</configuration>
</plugin>
</configuration>
</plugin>
@@
-263,12
+276,6
@@
<goal>prepare-agent</goal>
</goals>
<configuration>
<goal>prepare-agent</goal>
</goals>
<configuration>
- <skipTests>false</skipTests>
- <includes>
- <include>**/JU*.java</include>
- </includes>
- <excludes>
- </excludes>
<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
<propertyName>surefireArgLine</propertyName>
</configuration>
<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
<propertyName>surefireArgLine</propertyName>
</configuration>
@@
-312,12
+319,7
@@
</pluginManagement>
</build>
</pluginManagement>
</build>
- <modules>
- <module>env</module>
- <module>xgen</module>
- <module>rosetta</module>
- <module>log4j</module> <!-- note: generates log4j, to avoid Jar conflict -->
- </modules>
+
<dependencyManagement>
<dependencies>
<dependencyManagement>
<dependencies>