summaryrefslogtreecommitdiffstats
path: root/aai-parent
diff options
context:
space:
mode:
authorKajur, Harish (vk250x) <vk250x@att.com>2020-02-21 14:34:10 -0500
committerHarish Venkata Kajur <vk250x@att.com>2020-02-25 23:59:33 -0500
commit98749c47bbb5f5ddcc1c4f0690b79c7288f6bdd6 (patch)
treea472ce2edabd497b643917f44785b775fa16e15e /aai-parent
parente654645a50a0d028d8e67ea997f84efe8d28a6a0 (diff)
Enhancements for the aai-common library
Issue-ID: AAI-2806 Change-Id: I2dbb46b897b35136ac1bb802978d3f974af1b307 Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
Diffstat (limited to 'aai-parent')
-rw-r--r--aai-parent/pom.xml159
1 files changed, 141 insertions, 18 deletions
diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml
index 1f44f747..7f4d4a2d 100644
--- a/aai-parent/pom.xml
+++ b/aai-parent/pom.xml
@@ -59,6 +59,7 @@ limitations under the License.
<commons.text.version>1.8</commons.text.version>
<docker.fabric.version>0.31.0</docker.fabric.version>
<dmaap.client.version>1.1.9</dmaap.client.version>
+ <easy.mock.version>4.0.2</easy.mock.version>
<eclipse.persistence.version>2.6.2</eclipse.persistence.version>
<eelf.core.version>1.0.1-oss</eelf.core.version>
<freemarker.version>2.3.29</freemarker.version>
@@ -80,12 +81,24 @@ limitations under the License.
<jopt.simple.version>5.0.4</jopt.simple.version>
<jsonassert.version>1.5.0</jsonassert.version>
<json.patch.version>1.9</json.patch.version>
- <json.path.version>2.4.0</json.path.version>
+ <!--
+ JSONPath has an bug when it tries to parse an expression
+ when nesting reaches three levels so an junit was failing
+ when it was moving to an library of 2.3.0 or above
+ There seems to be no new releases since 2017 so not sure if
+ this library is still active or not
+ We might need to move away from this library but its in the core logic
+ and would take some time to refactor
+ Please don't upgrade to 2.3.0 or above for nexus iq or security scans
+ as it could potentially break our code
+ -->
+ <json.path.version>2.2.0</json.path.version>
<json.version>20190722</json.version>
<junit.version>4.12</junit.version>
<httpclient.version>4.5.10</httpclient.version>
<io.swagger.version>1.5.24</io.swagger.version>
<logback.version>1.2.3</logback.version>
+ <slf4j.version>1.7.25</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<mockito.all.version>1.10.19</mockito.all.version>
<mockito.core.version>2.15.0</mockito.core.version>
@@ -98,11 +111,13 @@ limitations under the License.
<snakeyaml.version>1.25</snakeyaml.version>
<spring.boot.version>1.5.22.RELEASE</spring.boot.version>
+ <javax.servlet.version>3.1.0</javax.servlet.version>
+ <javax.annotation.version>1.2</javax.annotation.version>
<sonar.jacoco.reportPath />
<sonar.jacoco.itReportPath />
<sonar.jacoco.reportMissing.force.zero />
-
+
<!-- we let things pass by default, set custom level for each child project -->
<jacoco.line.coverage.limit>0.00</jacoco.line.coverage.limit>
@@ -114,20 +129,21 @@ limitations under the License.
<sonar.scanner.version>3.7.0.1746</sonar.scanner.version>
- <spring.web.version>4.3.25.RELEASE</spring.web.version>
+ <spring.version>4.3.25.RELEASE</spring.version>
<spring.jms.version>4.3.25.RELEASE</spring.jms.version>
<spring.test.version>4.3.25.RELEASE</spring.test.version>
<spring.security.rsa.version>1.0.8.RELEASE</spring.security.rsa.version>
<json.simple.version>1.1.1</json.simple.version>
<powermock.api.mockito2.version>2.0.4</powermock.api.mockito2.version>
-
+ <aspectj.version>1.9.1</aspectj.version>
+ <logging.analytics.version>1.5.1</logging.analytics.version>
</properties>
<profiles>
<profile>
<id>spring-boot-2-1</id>
<properties>
- <spring.boot.version>2.1.12.RELEASE</spring.boot.version>
+ <spring.boot.version>1.5.22.RELEASE</spring.boot.version>
</properties>
</profile>
</profiles>
@@ -153,6 +169,18 @@ limitations under the License.
<version>${aai.release.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.onap.aai.aai-common</groupId>
+ <artifactId>aai-aaf-auth</artifactId>
+ <version>${aai.release.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onap.aai.aai-common</groupId>
+ <artifactId>aai-els-onap-logging</artifactId>
+ <version>${aai.release.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-annotations</artifactId>
@@ -251,6 +279,12 @@ limitations under the License.
<version>${logback.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>java-hamcrest</artifactId>
@@ -269,10 +303,24 @@ limitations under the License.
<version>${hamcrest.junit.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${javax.servlet.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${javax.annotation.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -340,8 +388,12 @@ limitations under the License.
<version>${mockito.all.version}</version>
</dependency>
- <!-- <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId>
- <version>${mockito.core.version}</version> </dependency> -->
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito.core.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
@@ -424,8 +476,22 @@ limitations under the License.
<dependency>
<groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-cadi-core</artifactId>
+ <version>${aaf.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
<version>${aaf.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>${easy.mock.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -457,6 +523,11 @@ limitations under the License.
<artifactId>json-path</artifactId>
<version>${json.path.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.jayway.jsonpath</groupId>
+ <artifactId>json-path-assert</artifactId>
+ <version>${json.path.version}</version>
+ </dependency>
<dependency>
<groupId>org.javatuples</groupId>
@@ -543,6 +614,46 @@ limitations under the License.
<version>${commons.io.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-oxm</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aspects</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework.security</groupId>
@@ -568,6 +679,12 @@ limitations under the License.
<version>${aai.common.logging.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.onap.logging-analytics</groupId>
+ <artifactId>logging-slf4j</artifactId>
+ <version>${logging.analytics.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.onap.aai</groupId>
<artifactId>rest-client</artifactId>
@@ -586,6 +703,12 @@ limitations under the License.
<version>${io.swagger.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>${aspectj.version}</version>
+ </dependency>
+
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
@@ -688,7 +811,7 @@ limitations under the License.
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>
<configuration>
- <!-- Note: This exclusion list should match <sonar.exclusions> property
+ <!-- Note: This exclusion list should match <sonar.exclusions> property
above -->
<excludes>
<exclude>**/gen/**</exclude>
@@ -698,7 +821,7 @@ limitations under the License.
</excludes>
</configuration>
<executions>
- <!-- Prepares the property pointing to the JaCoCo runtime agent which
+ <!-- Prepares the property pointing to the JaCoCo runtime agent which
is passed as VM argument when Maven the Surefire plugin is executed. -->
<execution>
<id>pre-unit-test</id>
@@ -706,15 +829,15 @@ limitations under the License.
<goal>prepare-agent</goal>
</goals>
<configuration>
- <!-- Sets the path to the file which contains the execution data
+ <!-- Sets the path to the file which contains the execution data
. -->
<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
- <!-- Sets the name of the property containing the settings for JaCoCo
+ <!-- Sets the name of the property containing the settings for JaCoCo
runtime agent. -->
<propertyName>surefireArgLine</propertyName>
</configuration>
</execution>
- <!-- Ensures that the code coverage report for unit tests is created
+ <!-- Ensures that the code coverage report for unit tests is created
after unit tests have been run. -->
<execution>
<id>post-unit-test</id>
@@ -723,7 +846,7 @@ limitations under the License.
<goal>report</goal>
</goals>
<configuration>
- <!-- Sets the path to the file which contains the execution data
+ <!-- Sets the path to the file which contains the execution data
. -->
<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
<!-- Sets the output directory for the code coverage report. -->
@@ -737,15 +860,15 @@ limitations under the License.
<goal>prepare-agent</goal>
</goals>
<configuration>
- <!-- Sets the path to the file which contains the execution data
+ <!-- Sets the path to the file which contains the execution data
. -->
<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
- <!-- Sets the name of the property containing the settings for JaCoCo
+ <!-- Sets the name of the property containing the settings for JaCoCo
runtime agent. -->
<propertyName>failsafeArgLine</propertyName>
</configuration>
</execution>
- <!-- Ensures that the code coverage report for integration tests after
+ <!-- Ensures that the code coverage report for integration tests after
integration tests have been run. -->
<execution>
<id>post-integration-test</id>
@@ -754,7 +877,7 @@ limitations under the License.
<goal>report</goal>
</goals>
<configuration>
- <!-- Sets the path to the file which contains the execution data
+ <!-- Sets the path to the file which contains the execution data
. -->
<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
<!-- Sets the output directory for the code coverage report. -->
@@ -802,7 +925,7 @@ limitations under the License.
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M4</version>
<executions>
- <!-- Ensures that both integration-test and verify goals of the Failsafe
+ <!-- Ensures that both integration-test and verify goals of the Failsafe
Maven plugin are executed. -->
<execution>
<id>integration-tests</id>