Bump versions in policy/engine master

[policy/engine.git] / packages / base / pom.xml

diff --git a/packages/base/pom.xml b/packages/base/pom.xml
index 9f24c60..b8b8771 100755 (executable)
--- a/packages/base/pom.xml
+++ b/packages/base/pom.xml
@@ -7,9 +7,9 @@
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

-  
+

        http://www.apache.org/licenses/LICENSE-2.0
        http://www.apache.org/licenses/LICENSE-2.0

-  
+

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.


@@ -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.1.0-SNAPSHOT</version>
+               <version>1.6.0-SNAPSHOT</version>

        </parent>
 
        <artifactId>base</artifactId>
        </parent>
 
        <artifactId>base</artifactId>


@@ -118,9 +117,14 @@
                                                                <artifactItem>
                                                                        <groupId>org.apache.tomcat</groupId>
                                                                        <artifactId>tomcat</artifactId>
                                                                <artifactItem>
                                                                        <groupId>org.apache.tomcat</groupId>
                                                                        <artifactId>tomcat</artifactId>

-                                                                       <version>8.0.23</version>
+                                                                       <version>9.0.16</version>

                                                                        <type>tar.gz</type>
                                                                        <type>tar.gz</type>

-                                                                       <destFileName>apache-tomcat-8.0.23.tar.gz</destFileName>
+                                                                       <!--
+                                                                       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-9.0.16.tar.gz</destFileName>

                                                                </artifactItem>
                                                        </artifactItems>
                                                </configuration>
                                                                </artifactItem>
                                                        </artifactItems>
                                                </configuration>


@@ -168,7 +172,7 @@
                                                                </artifactItem>
                                                        </artifactItems>
                                                </configuration>
                                                                </artifactItem>
                                                        </artifactItems>
                                                </configuration>

-                                       </execution>                    
+                                       </execution>

                                </executions>
                        </plugin>
                        <plugin>
                                </executions>
                        </plugin>
                        <plugin>


@@ -190,7 +194,7 @@
                        </plugin>
                </plugins>
        </build>
                        </plugin>
                </plugins>
        </build>

-       
+

        <profiles>
                <profile>
                        <id>unix_pe_version</id>
        <profiles>
                <profile>
                        <id>unix_pe_version</id>


@@ -201,28 +205,28 @@
                        </activation>
                        <build>
                                <plugins>
                        </activation>
                        <build>
                                <plugins>

-                                       <plugin>
-                                               <groupId>org.codehaus.mojo</groupId>
-                                               <artifactId>exec-maven-plugin</artifactId>
-                                               <version>1.5.0</version>
-                                               <executions>
-                                                       <execution>
-                                                               <id>create-version-file</id>
-                                                               <goals>
-                                                                       <goal>exec</goal>
-                                                               </goals>
-                                                               <phase>prepare-package</phase>
-                                                               <configuration>
-                                                                       <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>
-                                                                       </arguments>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>1.5.0</version>
+                        <executions>
+                            <execution>
+                                <id>create-version-file</id>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <phase>prepare-package</phase>
+                                <configuration>
+                                    <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}"' &gt;target/build.info</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>

                        </build>
                </profile>
        </profiles>
                        </build>
                </profile>
        </profiles>