From 3a8de37e721b1e3e8e3e8b1c11c7c65cd49a3e9b Mon Sep 17 00:00:00 2001
From: root <frank.obrien@amdocs.com>
Date: Tue, 9 Oct 2018 13:48:18 -0400
Subject: prep poms for branching post release

Change-Id: I755a3a24521be12735929beca76dff16f9c5d043
Issue-ID: LOG-749
Signed-off-by: root <frank.obrien@amdocs.com>
---
 reference/logging-demo/pom.xml | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

(limited to 'reference/logging-demo')

diff --git a/reference/logging-demo/pom.xml b/reference/logging-demo/pom.xml
index 6b18179..9b5a0c6 100644
--- a/reference/logging-demo/pom.xml
+++ b/reference/logging-demo/pom.xml
@@ -1,18 +1,11 @@
 <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>
+  <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-reference</artifactId>
-      <version>1.2.2</version>
-  </parent-->
-  <parent>
-      <groupId>org.onap.oparent</groupId>
-      <artifactId>oparent</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.6-SNAPSHOT</version>
   </parent>
-  
   <artifactId>logging-demo</artifactId>
-  <version>1.2.2</version>
   <packaging>war</packaging>
   <name>logging-demo</name>
   <properties>
@@ -78,7 +71,7 @@
         <dependency>
             <groupId>org.onap.logging-analytics</groupId>
             <artifactId>logging-mock-service</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.6-SNAPSHOT</version>
         </dependency>
        
         
@@ -255,17 +248,17 @@
             <artifactId>spring-webmvc</artifactId>
             <version>${spring.version}</version>
         </dependency>
-                <dependency>
-                        <groupId>ch.qos.logback</groupId>
-                        <artifactId>logback-core</artifactId>
-                        <version>${logback.version}</version>
-                </dependency>
-                <dependency>
-                        <groupId>ch.qos.logback</groupId>
-                        <artifactId>logback-classic</artifactId>
-                        <version>${logback.version}</version>
-                </dependency>
-                <!-- JUnit 4.12 used to come with EELF -->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <!-- JUnit 4.12 used to come with EELF -->
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
-- 
cgit 1.2.3-korg