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
Merge "Fix unit test failure in ONAP-PDP-REST"
[policy/engine.git]
/
packages
/
base
/
pom.xml
diff --git
a/packages/base/pom.xml
b/packages/base/pom.xml
index
c9d0401
..
b8b8771
100755
(executable)
--- a/
packages/base/pom.xml
+++ b/
packages/base/pom.xml
@@
-18,15
+18,14
@@
============LICENSE_END=========================================================
-->
============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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>packages</artifactId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>packages</artifactId>
- <version>1.
2.1
-SNAPSHOT</version>
+ <version>1.
6.0
-SNAPSHOT</version>
</parent>
<artifactId>base</artifactId>
</parent>
<artifactId>base</artifactId>
@@
-118,14
+117,14
@@
<artifactItem>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat</artifactId>
<artifactItem>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat</artifactId>
- <version>
8.0.50
</version>
+ <version>
9.0.16
</version>
<type>tar.gz</type>
<!--
Please note that if you change this version, you must
update the docker-install.sh script to ensure the right
file name is installed.
-->
<type>tar.gz</type>
<!--
Please note that if you change this version, you must
update the docker-install.sh script to ensure the right
file name is installed.
-->
- <destFileName>apache-tomcat-
8.0.50
.tar.gz</destFileName>
+ <destFileName>apache-tomcat-
9.0.16
.tar.gz</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</artifactItem>
</artifactItems>
</configuration>
@@
-221,7
+220,7
@@
<executable>/bin/bash</executable>
<arguments>
<argument>-c</argument>
<executable>/bin/bash</executable>
<arguments>
<argument>-c</argument>
- <argument>mkdir -p target ; echo -e 'version="${project.version}"\ndescription="Open ONAP Policy Engine"\nbuildTag="'"${BUILD_TAG}"'"\ncommit="'"${GIT_COMMIT}"'"\ntimestamp="${maven.build.timestamp}"'
>
target/build.info</argument>
+ <argument>mkdir -p target ; echo -e 'version="${project.version}"\ndescription="Open ONAP Policy Engine"\nbuildTag="'"${BUILD_TAG}"'"\ncommit="'"${GIT_COMMIT}"'"\ntimestamp="${maven.build.timestamp}"'
>
target/build.info</argument>
</arguments>
</configuration>
</execution>
</arguments>
</configuration>
</execution>