X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=92844e9f48da1b26186799fafa4880717a854d09;hb=9f774daf0c3e317c9542c9fe4108772006b267a9;hp=e50dd7d4fe3e3e2b631f238b83cdbddbad540052;hpb=46b5b531eada52e963f9ca196473a6c1bd8cbf37;p=policy%2Fengine.git
diff --git a/pom.xml b/pom.xml
index e50dd7d4f..92844e9f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
============LICENSE_START=======================================================
ONAP Policy Engine
================================================================================
- Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
Modifications Copyright (C) 2019 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +24,7 @@
org.onap.policy.parent
integration
- 3.1.0-SNAPSHOT
+ 3.1.1-SNAPSHOT
org.onap.policy.engine
@@ -35,8 +35,6 @@
The ONAP Policy Engine main pom
- 1.8
- 1.8
UTF-8
UTF-8
@@ -46,12 +44,8 @@
content/repositories/snapshots/
content/repositories/staging/
-
-
- ${project.basedir}/../target/code-coverage/jacoco-ut.exec
- ${project.basedir}/../target/code-coverage/jacoco-it.exec
- reuseReports
+
+ ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
4.3.24.RELEASE
@@ -60,8 +54,8 @@
1.3.3
1.18
6.8.2
- 1.6.0-SNAPSHOT
- 2.2.0-SNAPSHOT
+ 1.6.2-SNAPSHOT
+ 2.2.1-SNAPSHOT
PolicyEngineUtils
@@ -109,12 +103,6 @@
javax.servlet
javax.servlet-api
-
-
- xml-apis
- xml-apis
- 1.3.03
-
com.fasterxml.jackson.core
@@ -146,7 +134,7 @@
org.powermock
- powermock-api-mockito
+ powermock-api-mockito2
test
@@ -163,7 +151,7 @@
org.easymock
easymock
- 3.1
+ 4.1
test
@@ -174,32 +162,6 @@
-
- org.jacoco
- jacoco-maven-plugin
-
-
- pre-unit-test
-
- prepare-agent
-
-
- ${sonar.jacoco.reportPath}
- true
-
-
-
- post-unit-test
- test
-
- report
-
-
- ${sonar.jacoco.reportPath}
-
-
-
-
org.apache.maven.plugins
maven-deploy-plugin
@@ -221,8 +183,7 @@
maven-compiler-plugin
${project.encoding}
-
- ${project.target.version}
+ ${java.version}
@@ -268,46 +229,6 @@
-
- org.jacoco
- jacoco-maven-plugin
- ${jacoco.version}
-
-
-
- **/gen/**
- **/generated-sources/**
- **/yang-gen/**
- **/pax/**
-
-
-
-
-
- pre-unit-test
-
- prepare-agent
-
-
- ${sonar.jacoco.reportPath}
-
-
-
-
- post-unit-test
- test
-
- report
-
-
- ${sonar.jacoco.reportPath}
-
-
-
-
org.eclipse.m2e
lifecycle-mapping