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
Include all modules in AAF parent
[aaf/authz.git]
/
auth
/
pom.xml
diff --git
a/auth/pom.xml
b/auth/pom.xml
index
7be3406
..
d96928d
100644
(file)
--- a/
auth/pom.xml
+++ b/
auth/pom.xml
@@
-23,27
+23,32
@@
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>
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.auth</groupId>
- <artifactId>parent</artifactId>
+ <parent>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>authparent</artifactId>
<version>2.1.0-SNAPSHOT</version>
<name>AAF Auth Parent</name>
<packaging>pom</packaging>
<version>2.1.0-SNAPSHOT</version>
<name>AAF Auth Parent</name>
<packaging>pom</packaging>
+
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.interfaceVersion>2.10-SNAPSHOT</project.interfaceVersion>
- <project.miscVersion>1.3.0-SNAPSHOT</project.miscVersion>
- <project.cadiVersion>1.5.0-SNAPSHOT</project.cadiVersion>
+ <project.interfaceVersion>2.1.0-SNAPSHOT</project.interfaceVersion>
<!-- >project.jettyVersion>9.3.22.v20171030</project.jettyVersion -->
<project.jettyVersion>9.4.8.v20171121</project.jettyVersion>
<powermock.version>1.5.1</powermock.version>
<!-- >project.jettyVersion>9.3.22.v20171030</project.jettyVersion -->
<project.jettyVersion>9.4.8.v20171121</project.jettyVersion>
<powermock.version>1.5.1</powermock.version>
- <project.
conf_dir>/opt/app/osaaf/etc</project.conf
_dir>
+ <project.
ext_root_dir>/opt/app/osaaf</project.ext_root
_dir>
<!-- SONAR -->
<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>
<!-- Default Sonar configuration -->
<!-- SONAR -->
<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>
<!-- Default Sonar configuration -->
- <sonar.jacoco.reportPath
>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath
>
- <sonar.jacoco.itReportPath
>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath
>
+ <sonar.jacoco.reportPath
s>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths
>
+ <sonar.jacoco.itReportPath
s>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths
>
<!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
<sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
<sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
<nexusproxy>https://nexus.onap.org</nexusproxy>
@@
-106,7
+111,7
@@
<artifactId>maven-deploy-plugin</artifactId>
<version>2.6</version>
<configuration>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.6</version>
<configuration>
- <skip>
tru
e</skip>
+ <skip>
fals
e</skip>
</configuration>
</plugin>
</configuration>
</plugin>
@@
-131,7
+136,7
@@
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.17</version>
<configuration>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.17</version>
<configuration>
- <skipTests>f
la
se</skipTests>
+ <skipTests>f
al
se</skipTests>
</configuration>
<executions>
<execution>
</configuration>
<executions>
<execution>
@@
-160,9
+165,10
@@
<configuration>
<programs/> <!-- this set in projects that have programs -->
<assembleDirectory>../aaf_${project.version}</assembleDirectory>
<configuration>
<programs/> <!-- this set in projects that have programs -->
<assembleDirectory>../aaf_${project.version}</assembleDirectory>
- <copyConfigurationDirectory>
fals
e</copyConfigurationDirectory>
+ <copyConfigurationDirectory>
tru
e</copyConfigurationDirectory>
<configurationDirectory>etc</configurationDirectory>
<repositoryName>lib</repositoryName>
<configurationDirectory>etc</configurationDirectory>
<repositoryName>lib</repositoryName>
+ <includeConfigurationDirectoryInClasspath>false</includeConfigurationDirectoryInClasspath>
<repositoryLayout>flat</repositoryLayout>
</configuration>
</plugin>
<repositoryLayout>flat</repositoryLayout>
</configuration>
</plugin>
@@
-376,45
+382,45
@@
<dependencyManagement>
<dependencies>
<dependency>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.onap.aaf.authz
.misc
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-misc-env</artifactId>
<artifactId>aaf-misc-env</artifactId>
- <version>${project.
miscV
ersion}</version>
+ <version>${project.
v
ersion}</version>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.misc
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-misc-log4j</artifactId>
<artifactId>aaf-misc-log4j</artifactId>
- <version>${project.
miscV
ersion}</version>
+ <version>${project.
v
ersion}</version>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.misc
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-misc-rosetta</artifactId>
<artifactId>aaf-misc-rosetta</artifactId>
- <version>${project.
miscV
ersion}</version>
+ <version>${project.
v
ersion}</version>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.misc
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-misc-xgen</artifactId>
<artifactId>aaf-misc-xgen</artifactId>
- <version>${project.
miscV
ersion}</version>
+ <version>${project.
v
ersion}</version>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.cadi
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-core</artifactId>
<artifactId>aaf-cadi-core</artifactId>
- <version>${project.
cadiV
ersion}</version>
+ <version>${project.
v
ersion}</version>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.cadi
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-client</artifactId>
<artifactId>aaf-cadi-client</artifactId>
- <version>${project.
cadiV
ersion}</version>
+ <version>${project.
v
ersion}</version>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.cadi
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
<artifactId>aaf-cadi-aaf</artifactId>
- <version>${project.
cadiV
ersion}</version>
+ <version>${project.
v
ersion}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cassandra</groupId>
<exclusions>
<exclusion>
<groupId>org.apache.cassandra</groupId>
@@
-424,45
+430,45
@@
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.auth
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-client</artifactId>
<artifactId>aaf-auth-client</artifactId>
- <version>${project.
interfaceV
ersion}</version>
+ <version>${project.
v
ersion}</version>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.auth
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>aaf-auth-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.auth
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-cass</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>aaf-auth-cass</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.auth
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-cmd</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>aaf-auth-cmd</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.auth
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-oauth</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>aaf-auth-oauth</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.auth
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-deforg</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>aaf-auth-deforg</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>
2.5
</version>
+ <artifactId>
javax.
servlet-api</artifactId>
+ <version>
3.0.1
</version>
</dependency>
<dependency>
</dependency>
<dependency>