Merge "Update version of Apache Tomcat dependency as per security scan"

diff --git a/INFO.yaml b/INFO.yaml
index acfde8d..7055bff 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -49,6 +49,16 @@ committers:
       company: 'IBM'
       id: 'brindasanthm'
       timezone: 'America/New_York'
+    - name: 'Kevin Smokowski'
+      email: 'ks6305@att.com'
+      company: 'ATT'
+      id: 'nullop'
+      timezone: 'America/New_York'
+    - name: 'Kapil Singal'
+      email: 'kaggarwal@in.ibm.com'
+      company: 'IBM'
+      id: 'kasingal'
+      timezone: 'America/New_York'
 repositories:
     - ccsdk/parent
 tsc:
@@ -63,3 +73,9 @@ tsc:
         - type: 'Addition'
           name: 'Brinda Santh Muthuramalingam'
           link: 'https://lists.onap.org/g/onap-tsc/message/5208'
+        - type: 'Addition'
+          name: 'Kevin Smokowski'
+          link: 'https://lists.onap.org/g/onap-tsc/message/5635'
+        - type: 'Addition'
+          name: 'Kapil Singal'
+          link: 'https://lists.onap.org/g/onap-tsc/message/5635'

diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
index 054f031..d53f0de 100644 (file)
--- a/dependencies-bom/pom.xml
+++ b/dependencies-bom/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>dependencies-bom</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <distributionManagement>

diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml
index 25a99f2..6a8df33 100644 (file)
--- a/dependencies-odl-bom/pom.xml
+++ b/dependencies-odl-bom/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>dependencies-odl-bom</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <distributionManagement>

diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 89765f1..f481590 100644 (file)
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -15,7 +15,7 @@
 
        <groupId>org.onap.ccsdk.parent</groupId>
        <artifactId>binding-parent</artifactId>
-       <version>1.5.0-SNAPSHOT</version>
+       <version>1.5.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -196,7 +196,7 @@
                        <dependency>
                                <groupId>org.onap.ccsdk.parent</groupId>
                                <artifactId>dependencies-odl-bom</artifactId>
-                               <version>1.5.0-SNAPSHOT</version>
+                               <version>1.5.1-SNAPSHOT</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>

diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 4cd953c..6b8c905 100644 (file)
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -15,7 +15,7 @@
 
        <groupId>org.onap.ccsdk.parent</groupId>
        <artifactId>bundle-parent</artifactId>
-       <version>1.5.0-SNAPSHOT</version>
+       <version>1.5.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -196,7 +196,7 @@
                        <dependency>
                                <groupId>org.onap.ccsdk.parent</groupId>
                                <artifactId>dependencies-odl-bom</artifactId>
-                               <version>1.5.0-SNAPSHOT</version>
+                               <version>1.5.1-SNAPSHOT</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>

diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml
index 296ac78..ab77364 100644 (file)
--- a/odlparent/client-parent/pom.xml
+++ b/odlparent/client-parent/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>client-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>

diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index a825f35..f9249ac 100644 (file)
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -15,7 +15,7 @@
 
        <groupId>org.onap.ccsdk.parent</groupId>
        <artifactId>feature-repo-parent</artifactId>
-       <version>1.5.0-SNAPSHOT</version>
+       <version>1.5.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -196,7 +196,7 @@
                        <dependency>
                                <groupId>org.onap.ccsdk.parent</groupId>
                                <artifactId>dependencies-odl-bom</artifactId>
-                               <version>1.5.0-SNAPSHOT</version>
+                               <version>1.5.1-SNAPSHOT</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>

diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index 9509c97..57e7cc3 100644 (file)
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -15,7 +15,7 @@
 
        <groupId>org.onap.ccsdk.parent</groupId>
        <artifactId>karaf4-parent</artifactId>
-       <version>1.5.0-SNAPSHOT</version>
+       <version>1.5.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -196,7 +196,7 @@
                        <dependency>
                                <groupId>org.onap.ccsdk.parent</groupId>
                                <artifactId>dependencies-odl-bom</artifactId>
-                               <version>1.5.0-SNAPSHOT</version>
+                               <version>1.5.1-SNAPSHOT</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>

diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index 808bd94..40956b7 100644 (file)
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -15,7 +15,7 @@
 
        <groupId>org.onap.ccsdk.parent</groupId>
        <artifactId>mdsal-it-parent</artifactId>
-       <version>1.5.0-SNAPSHOT</version>
+       <version>1.5.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -196,7 +196,7 @@
                        <dependency>
                                <groupId>org.onap.ccsdk.parent</groupId>
                                <artifactId>dependencies-odl-bom</artifactId>
-                               <version>1.5.0-SNAPSHOT</version>
+                               <version>1.5.1-SNAPSHOT</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>

diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 4bd6f07..2c8cf74 100644 (file)
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -15,7 +15,7 @@
 
        <groupId>org.onap.ccsdk.parent</groupId>
        <artifactId>odlparent-lite</artifactId>
-       <version>1.5.0-SNAPSHOT</version>
+       <version>1.5.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -196,7 +196,7 @@
                        <dependency>
                                <groupId>org.onap.ccsdk.parent</groupId>
                                <artifactId>dependencies-odl-bom</artifactId>
-                               <version>1.5.0-SNAPSHOT</version>
+                               <version>1.5.1-SNAPSHOT</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>

diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index 69f3524..dbb3303 100644 (file)
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -15,7 +15,7 @@
 
        <groupId>org.onap.ccsdk.parent</groupId>
        <artifactId>odlparent</artifactId>
-       <version>1.5.0-SNAPSHOT</version>
+       <version>1.5.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -196,7 +196,7 @@
                        <dependency>
                                <groupId>org.onap.ccsdk.parent</groupId>
                                <artifactId>dependencies-odl-bom</artifactId>
-                               <version>1.5.0-SNAPSHOT</version>
+                               <version>1.5.1-SNAPSHOT</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 52bf11a..dc8d81b 100755 (executable)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>parent</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.5.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>odlparent-aggregator</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>

diff --git a/odlparent/setup/pom.xml b/odlparent/setup/pom.xml
index c2a519a..9ddaf12 100755 (executable)
--- a/odlparent/setup/pom.xml
+++ b/odlparent/setup/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-aggregator</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.5.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>setup</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>

diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 1725e96..00f6587 100644 (file)
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -15,7 +15,7 @@
 
        <groupId>org.onap.ccsdk.parent</groupId>
        <artifactId>single-feature-parent</artifactId>
-       <version>1.5.0-SNAPSHOT</version>
+       <version>1.5.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -196,7 +196,7 @@
                        <dependency>
                                <groupId>org.onap.ccsdk.parent</groupId>
                                <artifactId>dependencies-odl-bom</artifactId>
-                               <version>1.5.0-SNAPSHOT</version>
+                               <version>1.5.1-SNAPSHOT</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>

diff --git a/pom.xml b/pom.xml
index 195d668..3482969 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>

diff --git a/releases/1.5.0.yaml b/releases/1.5.0.yaml
new file mode 100644 (file)
index 0000000..e4e91fd
--- /dev/null
+++ b/releases/1.5.0.yaml
@@ -0,0 +1,5 @@
+---
+distribution_type: 'maven'
+version: '1.5.0'
+project: 'ccsdk-parent'
+log_dir: 'ccsdk-parent-maven-stage-master/180/'

diff --git a/springboot/pom.xml b/springboot/pom.xml
index c68e651..3aa358f 100755 (executable)
--- a/springboot/pom.xml
+++ b/springboot/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>parent</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.5.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>springboot-aggregator</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>

diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index ae7b42f..772dda5 100755 (executable)
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>spring-boot-1-starter-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -107,7 +107,7 @@
             <dependency>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-bom</artifactId>
-                <version>1.5.0-SNAPSHOT</version>
+                <version>1.5.1-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index 6148b8c..2f8b1d7 100755 (executable)
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
@@ -134,7 +134,7 @@
             <dependency>
                 <groupId>org.onap.ccsdk.parent</groupId>
                 <artifactId>dependencies-bom</artifactId>
-                <version>1.5.0-SNAPSHOT</version>
+                <version>1.5.1-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/standalone/pom.xml b/standalone/pom.xml
index c720ebf..bb30110 100755 (executable)
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>standalone-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>

diff --git a/version.properties b/version.properties
index fbddbe7..6a1d886 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -6,7 +6,7 @@
 
 release_name=1
 sprint_number=5
-feature_revision=0
+feature_revision=1
 
 base_version=${release_name}.${sprint_number}.${feature_revision}