log start 1.4.0-SNAPSHOT for dublin

Change-Id: Iab181b9ccf5b57614016b527402864ef3b1672e8
Issue-ID: LOG-749
Signed-off-by: root <frank.obrien@amdocs.com>

diff --git a/pom.xml b/pom.xml
index b35b0f7..cbd7c09 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
   <groupId>org.onap.logging-analytics</groupId>
   <artifactId>logging-analytics</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.6-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <name>logging-analytics</name>
   <url>http://maven.apache.org</url>
   <modules>

diff --git a/pylog/pom.xml b/pylog/pom.xml
index af11a32..a2d5e52 100644 (file)
--- a/pylog/pom.xml
+++ b/pylog/pom.xml
@@ -22,7 +22,7 @@
     <groupId>org.onap.logging-analytics</groupId>  
     <modelVersion>4.0.0</modelVersion>
     <artifactId>logging-pylog</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>logging-pylog</name>
     <description>onap python logging library</description>

diff --git a/pylog/version.properties b/pylog/version.properties
index f84f159..176b32a 100644 (file)
--- a/pylog/version.properties
+++ b/pylog/version.properties
@@ -18,8 +18,8 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 # 1.2.6-SNAPSHOT is off 1.2.2
 major=1
-minor=2
-patch=6
+minor=4
+patch=0
 
 base_version=${major}.${minor}.${patch}
 

diff --git a/reference/logging-demo/pom.xml b/reference/logging-demo/pom.xml
index e1865af..a7bd80e 100644 (file)
--- a/reference/logging-demo/pom.xml
+++ b/reference/logging-demo/pom.xml
@@ -3,7 +3,7 @@
   <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-reference</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>logging-demo</artifactId>
   <packaging>war</packaging>
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>org.onap.logging-analytics</groupId>
             <artifactId>logging-mock-service</artifactId>
-            <version>1.2.6-SNAPSHOT</version>
+            <version>1.4.0-SNAPSHOT</version>
         </dependency>
        
         

diff --git a/reference/logging-docker-root/pom.xml b/reference/logging-docker-root/pom.xml
index 5b41b16..a824c6c 100644 (file)
--- a/reference/logging-docker-root/pom.xml
+++ b/reference/logging-docker-root/pom.xml
@@ -4,7 +4,7 @@
   <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-reference</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.4.0-SNAPSHOT</version>
   </parent>  
   <artifactId>logging-docker-root</artifactId>
   <packaging>pom</packaging>

diff --git a/reference/logging-kubernetes/pom.xml b/reference/logging-kubernetes/pom.xml
index d5f35a8..e5fbfa8 100644 (file)
--- a/reference/logging-kubernetes/pom.xml
+++ b/reference/logging-kubernetes/pom.xml
@@ -4,7 +4,7 @@
   <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-reference</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>logging-kubernetes</artifactId>
   <packaging>pom</packaging>

diff --git a/reference/logging-library/pom.xml b/reference/logging-library/pom.xml
index cb77ba8..cf0092b 100644 (file)
--- a/reference/logging-library/pom.xml
+++ b/reference/logging-library/pom.xml
@@ -3,7 +3,7 @@
   <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-reference</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>logging-library</artifactId>
   <packaging>jar</packaging>
@@ -65,7 +65,7 @@
        <dependency>
            <groupId>org.onap.logging-analytics</groupId>
            <artifactId>logging-slf4j</artifactId>
-           <version>1.2.6-SNAPSHOT</version>
+           <version>1.4.0-SNAPSHOT</version>
        </dependency>
        <!--  decouple HttpServlet parameters from both this project and slf4j later -->
        <dependency>

diff --git a/reference/logging-mock-service/pom.xml b/reference/logging-mock-service/pom.xml
index e9880fb..d167f25 100644 (file)
--- a/reference/logging-mock-service/pom.xml
+++ b/reference/logging-mock-service/pom.xml
@@ -3,7 +3,7 @@
   <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-reference</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>logging-mock-service</artifactId>
   <packaging>jar</packaging>
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>org.onap.logging-analytics</groupId>
             <artifactId>logging-library</artifactId>
-            <version>1.2.6-SNAPSHOT</version>
+            <version>1.4.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/reference/logging-slf4j-demo/pom.xml b/reference/logging-slf4j-demo/pom.xml
index 88c353e..bc654dd 100644 (file)
--- a/reference/logging-slf4j-demo/pom.xml
+++ b/reference/logging-slf4j-demo/pom.xml
@@ -3,7 +3,7 @@
     <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-reference</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.4.0-SNAPSHOT</version>
       <relativePath>..</relativePath>
     </parent>   
     <artifactId>logging-slf4j-demo</artifactId>
@@ -16,13 +16,15 @@
              spring-expression 4.3.14 goes to 4.3.17 under 1.5.15
          -->
         <springframework.boot.version>1.5.15.RELEASE</springframework.boot.version>
+        <spring.version>5.0.9.RELEASE</spring.version>
+        <logback.version>1.2.3</logback.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>logging-slf4j</artifactId>
-            <version>1.2.6-SNAPSHOT</version>
+            <version>1.4.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -86,7 +88,7 @@
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.2.3</version>
+                <version>${logback.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.mashape.unirest</groupId>
@@ -106,7 +108,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-test</artifactId>
-                <version>5.0.5.RELEASE</version>
+                <version>${spring.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/reference/logging-slf4j/pom.xml b/reference/logging-slf4j/pom.xml
index fef4d05..d517ffa 100644 (file)
--- a/reference/logging-slf4j/pom.xml
+++ b/reference/logging-slf4j/pom.xml
@@ -3,11 +3,15 @@
     <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-reference</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.4.0-SNAPSHOT</version>
     </parent>
     <artifactId>logging-slf4j</artifactId>
     <name>logging-slf4j</name>
     <packaging>jar</packaging>
+    <properties>
+        <spring.version>5.0.9.RELEASE</spring.version>
+        <logback.version>1.2.3</logback.version>
+    </properties>
     <dependencies>
         <!-- Exported dependencies. -->
         <dependency>
@@ -59,7 +63,7 @@
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.2.3</version>
+                <version>${logback.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.testng</groupId>
@@ -80,7 +84,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-test</artifactId>
-                <version>5.0.9.RELEASE</version>
+                <version>${spring.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/reference/pom.xml b/reference/pom.xml
index cfd58c6..bce981f 100644 (file)
--- a/reference/pom.xml
+++ b/reference/pom.xml
@@ -4,7 +4,7 @@
   <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-analytics</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>logging-reference</artifactId>
   <packaging>pom</packaging>

diff --git a/reference/provider/pom.xml b/reference/provider/pom.xml
index a980157..ec8bcb4 100644 (file)
--- a/reference/provider/pom.xml
+++ b/reference/provider/pom.xml
@@ -4,7 +4,7 @@
   <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-reference</artifactId>
-      <version>1.2.6-SNAPSHOT</version>
+      <version>1.4.0-SNAPSHOT</version>
   </parent>  
   <artifactId>logging-provider</artifactId>
   <packaging>pom</packaging>

diff --git a/version.properties b/version.properties
index 190512e..cb8cd4f 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -18,8 +18,8 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 # 1.2.6-SNAPSHOT is off 1.2.5
 major=1
-minor=2
-patch=6
+minor=4
+patch=0
 
 base_version=${major}.${minor}.${patch}