Code Review
/
policy
/
engine.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bound wait time for a component's port
[policy/engine.git]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index
dec4433
..
bfad593
100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-2,7
+2,8
@@
============LICENSE_START=======================================================
ONAP Policy Engine
================================================================================
============LICENSE_START=======================================================
ONAP Policy Engine
================================================================================
- Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ Modifications Copyright (C) 2019 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@
-17,19
+18,17
@@
limitations under the License.
============LICENSE_END=========================================================
-->
limitations under the License.
============LICENSE_END=========================================================
-->
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.policy.parent</groupId>
<artifactId>integration</artifactId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.policy.parent</groupId>
<artifactId>integration</artifactId>
- <version>2.
0.0
</version>
+ <version>2.
1.0-SNAPSHOT
</version>
<relativePath />
</parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
<relativePath />
</parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.
3.1
-SNAPSHOT</version>
+ <version>1.
4.0
-SNAPSHOT</version>
<packaging>pom</packaging>
<name>policy-engine</name>
<description>The ONAP Policy Engine main pom</description>
<packaging>pom</packaging>
<name>policy-engine</name>
<description>The ONAP Policy Engine main pom</description>
@@
-53,21
+52,15
@@
<sonar.jacoco.itReportPath>${project.basedir}/../target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
<sonar.jacoco.itReportPath>${project.basedir}/../target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
- <!-- Shared between policy/* project repositories - same version -->
- <h2.version>1.4.186</h2.version>
-
- <!-- Shared between policy/* project repositories - different version -->
-
<!-- Project common dependency versions -->
<springframework.version>4.3.18.RELEASE</springframework.version>
<jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version>
<!-- Project common dependency versions -->
<springframework.version>4.3.18.RELEASE</springframework.version>
<jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version>
- <httpclient.version>4.5.5</httpclient.version>
<jackson.version>2.9.4</jackson.version>
<commons.fileupload.version>1.3.3</commons.fileupload.version>
<commons.compress.version>1.18</commons.compress.version>
<jackson.version>2.9.4</jackson.version>
<commons.fileupload.version>1.3.3</commons.fileupload.version>
<commons.compress.version>1.18</commons.compress.version>
- <elasticsearch.version>6.
3.0
</elasticsearch.version>
- <version.policy.common>1.
3.1
</version.policy.common>
- <version.policy.
drools-application>1.3.1</version.policy.drools-application
>
+ <elasticsearch.version>6.
4.3
</elasticsearch.version>
+ <version.policy.common>1.
4.0-SNAPSHOT
</version.policy.common>
+ <version.policy.
models>2.0.0-SNAPSHOT</version.policy.models
>
</properties>
<modules>
<module>PolicyEngineUtils</module>
</properties>
<modules>
<module>PolicyEngineUtils</module>
@@
-105,16
+98,6
@@
</plugin>
</plugins>
</reporting>
</plugin>
</plugins>
</reporting>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>${h2.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
@@
-153,13
+136,11
@@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
- <version>1.7.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
- <version>1.7.3</version>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->