prep poms for branching post release

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

diff --git a/pom.xml b/pom.xml
index 75da1b5..b35b0f7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -9,13 +9,11 @@
   <groupId>org.onap.logging-analytics</groupId>
   <artifactId>logging-analytics</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.5</version>
+  <version>1.2.6-SNAPSHOT</version>
   <name>logging-analytics</name>
   <url>http://maven.apache.org</url>
   <modules>
-    <!-- temp build all leaf modules and thos dependent on logging-slf4j.jar:1.2.2 - without dependencies on each other-->
-    <module>reference/logging-demo</module>
-    <!--  temp 1 branch release at a time -->
-    <!-- module>pylog</module-->
+    <module>reference</module>
+    <module>pylog</module>
   </modules>
 </project>

diff --git a/pylog/pom.xml b/pylog/pom.xml
index 83c8e04..af11a32 100644 (file)
--- a/pylog/pom.xml
+++ b/pylog/pom.xml
@@ -14,11 +14,6 @@
 <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">
-    <!-- parent>
-        <groupId>org.onap.logging-analytics</groupId>
-        <artifactId>logging-analytics</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
-    </parent-->
     <parent>
       <groupId>org.onap.oparent</groupId>
       <artifactId>oparent</artifactId>
@@ -27,7 +22,7 @@
     <groupId>org.onap.logging-analytics</groupId>  
     <modelVersion>4.0.0</modelVersion>
     <artifactId>logging-pylog</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.6-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 c9206e9..f84f159 100644 (file)
--- a/pylog/version.properties
+++ b/pylog/version.properties
@@ -16,10 +16,10 @@
 # Versioning variables
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
 # 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=2
+patch=6
 
 base_version=${major}.${minor}.${patch}
 

diff --git a/reference/logging-demo/pom.xml b/reference/logging-demo/pom.xml
index 6b18179..9b5a0c6 100644 (file)
--- 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>

diff --git a/reference/logging-docker-root/pom.xml b/reference/logging-docker-root/pom.xml
index b045f4c..5b41b16 100644 (file)
--- a/reference/logging-docker-root/pom.xml
+++ b/reference/logging-docker-root/pom.xml
@@ -1,14 +1,12 @@
 <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-SNAPSHOT</version>
-  </parent-->  
-  <groupId>org.onap.logging-analytics</groupId>
+      <version>1.2.6-SNAPSHOT</version>
+  </parent>  
   <artifactId>logging-docker-root</artifactId>
-  <version>1.2.2</version>  
   <packaging>pom</packaging>
   <name>logging-docker-root</name>
 </project>

diff --git a/reference/logging-kubernetes/pom.xml b/reference/logging-kubernetes/pom.xml
index d79d0db..d5f35a8 100644 (file)
--- a/reference/logging-kubernetes/pom.xml
+++ b/reference/logging-kubernetes/pom.xml
@@ -1,14 +1,12 @@
 <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-SNAPSHOT</version>
-  </parent-->
-  <groupId>org.onap.logging-analytics</groupId>
+      <version>1.2.6-SNAPSHOT</version>
+  </parent>
   <artifactId>logging-kubernetes</artifactId>
-  <version>1.2.2</version>  
   <packaging>pom</packaging>
   <name>logging-kubernetes</name>
 </project>

diff --git a/reference/logging-library/.classpath b/reference/logging-library/.classpath
index 0fcb38f..7a80cdf 100644 (file)
--- a/reference/logging-library/.classpath
+++ b/reference/logging-library/.classpath
@@ -9,6 +9,7 @@
        <classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
                <attributes>
                        <attribute name="maven.pomderived" value="true"/>
+                       <attribute name="org.eclipse.jst.component.nondependency" value=""/>
                </attributes>
        </classpathentry>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">

diff --git a/reference/logging-library/pom.xml b/reference/logging-library/pom.xml
index 75671a1..67b980e 100644 (file)
--- a/reference/logging-library/pom.xml
+++ b/reference/logging-library/pom.xml
@@ -1,26 +1,17 @@
 <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-SNAPSHOT</version>
-  </parent-->
-   <parent>
-      <groupId>org.onap.oparent</groupId>
-      <artifactId>oparent</artifactId>
-      <version>1.2.1</version>
-  </parent>  
-  <groupId>org.onap.logging-analytics</groupId>
+      <version>1.2.6-SNAPSHOT</version>
+  </parent>
   <artifactId>logging-library</artifactId>
-  <version>1.2.2</version>
   <packaging>jar</packaging>
   <name>logging-library</name>
-  
-    <properties>
-       <spring.version>4.3.6.RELEASE</spring.version>
-       <logback.version>1.2.3</logback.version>          
+  <properties>
+      <spring.version>4.3.6.RELEASE</spring.version>
+      <logback.version>1.2.3</logback.version>          
   </properties>
-  
   <build>
       <plugins>
       <plugin>
@@ -71,19 +62,19 @@
   </build>
   
   <dependencies>
-      <!--  decouple HttpServlet parameters from both this project and slf4j later -->
-      <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>javax.servlet-api</artifactId>
-        <version>3.0.1</version>
-        <scope>provided</scope>
-    </dependency>
-          <dependency>
-            <groupId>org.onap.logging-analytics</groupId>
-            <artifactId>logging-slf4j</artifactId>
-            <version>1.2.2</version>
-        </dependency>
-               <dependency>
+       <dependency>
+           <groupId>org.onap.logging-analytics</groupId>
+           <artifactId>logging-slf4j</artifactId>
+           <version>1.2.6-SNAPSHOT</version>
+       </dependency>
+       <!--  decouple HttpServlet parameters from both this project and slf4j later -->
+       <dependency>
+           <groupId>javax.servlet</groupId>
+           <artifactId>javax.servlet-api</artifactId>
+           <version>3.0.1</version>
+           <scope>provided</scope>
+       </dependency>
+       <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
             <version>${spring.version}</version>
@@ -115,9 +106,9 @@
             <!--scope>test</scope-->
         </dependency>
         <dependency> 
-     <groupId>org.springframework</groupId> 
-     <artifactId>spring-aspects</artifactId> 
-     <version>${spring.version}</version> 
+            <groupId>org.springframework</groupId> 
+            <artifactId>spring-aspects</artifactId> 
+            <version>${spring.version}</version> 
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
@@ -139,16 +130,15 @@
             <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>  
- 
-  </dependencies>
+        <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>  
+   </dependencies>  
 </project>

diff --git a/reference/logging-mock-service/.classpath b/reference/logging-mock-service/.classpath
index 9ccdc5e..f941705 100644 (file)
--- a/reference/logging-mock-service/.classpath
+++ b/reference/logging-mock-service/.classpath
@@ -20,6 +20,7 @@
        <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
                <attributes>
                        <attribute name="maven.pomderived" value="true"/>
+                       <attribute name="org.eclipse.jst.component.nondependency" value=""/>
                </attributes>
        </classpathentry>
        <classpathentry kind="output" path="target/classes"/>

diff --git a/reference/logging-mock-service/pom.xml b/reference/logging-mock-service/pom.xml
index 6cc6e50..e9880fb 100644 (file)
--- a/reference/logging-mock-service/pom.xml
+++ b/reference/logging-mock-service/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-SNAPSHOT</version>
-  </parent-->
-   <parent>
-      <groupId>org.onap.oparent</groupId>
-      <artifactId>oparent</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.6-SNAPSHOT</version>
   </parent>
-  <groupId>org.onap.logging-analytics</groupId>
   <artifactId>logging-mock-service</artifactId>
-  <version>1.2.2</version>
   <packaging>jar</packaging>
   <name>logging-mock-service</name> 
   <build>
@@ -69,7 +62,7 @@
         <dependency>
             <groupId>org.onap.logging-analytics</groupId>
             <artifactId>logging-library</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.6-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/reference/logging-slf4j-demo/pom.xml b/reference/logging-slf4j-demo/pom.xml
index d0eb772..4f84b1e 100644 (file)
--- a/reference/logging-slf4j-demo/pom.xml
+++ b/reference/logging-slf4j-demo/pom.xml
@@ -1,19 +1,12 @@
 <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-SNAPSHOT</version>
+      <version>1.2.6-SNAPSHOT</version>
       <relativePath>..</relativePath>
-    </parent-->
-    <parent>
-      <groupId>org.onap.oparent</groupId>
-      <artifactId>oparent</artifactId>
-      <version>1.2.1</version>
-    </parent>    
-    <groupId>org.onap.logging-analytics</groupId>
+    </parent>   
     <artifactId>logging-slf4j-demo</artifactId>
-    <version>1.2.2</version>
     <name>logging-slf4j-demo</name>
     <packaging>war</packaging>
     <properties>
@@ -24,7 +17,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>logging-slf4j</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/reference/logging-slf4j/pom.xml b/reference/logging-slf4j/pom.xml
index f3bd500..9005795 100644 (file)
--- a/reference/logging-slf4j/pom.xml
+++ b/reference/logging-slf4j/pom.xml
@@ -1,19 +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-SNAPSHOT</version>
-      <relativePath>..</relativePath>
-    </parent-->
-    <parent>
-      <groupId>org.onap.oparent</groupId>
-      <artifactId>oparent</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.6-SNAPSHOT</version>
     </parent>
-    <groupId>org.onap.logging-analytics</groupId>
     <artifactId>logging-slf4j</artifactId>
-    <version>1.2.2</version>
     <name>logging-slf4j</name>
     <packaging>jar</packaging>
     <dependencies>

diff --git a/reference/pom.xml b/reference/pom.xml
index 7fcc241..cfd58c6 100644 (file)
--- a/reference/pom.xml
+++ b/reference/pom.xml
@@ -4,23 +4,21 @@
   <parent>
       <groupId>org.onap.logging-analytics</groupId>
       <artifactId>logging-analytics</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.6-SNAPSHOT</version>
   </parent>
-  <groupId>org.onap.logging-analytics</groupId>
   <artifactId>logging-reference</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.2-SNAPSHOT</version>
   <name>logging-reference</name>
   <url>http://maven.apache.org</url> 
   <modules>
     <module>logging-demo</module>
     <module>logging-library</module>
     <module>logging-mock-service</module>
-    <!-- module>logging-docker-root</module>
-    <module>logging-kubernetes</module-->
+    <module>logging-docker-root</module>
+    <module>logging-kubernetes</module>
     <module>logging-slf4j</module>
-    <!-- one branch at a time -->
-    <!-- module>logging-slf4j-demo</module-->
+    <module>logging-slf4j-demo</module>
+    <module>provider</module>
   </modules>
   <build>
       <pluginManagement>

diff --git a/reference/provider/pom.xml b/reference/provider/pom.xml
new file mode 100644 (file)
index 0000000..a980157
--- /dev/null
+++ b/reference/provider/pom.xml
@@ -0,0 +1,12 @@
+<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.logging-analytics</groupId>
+      <artifactId>logging-reference</artifactId>
+      <version>1.2.6-SNAPSHOT</version>
+  </parent>  
+  <artifactId>logging-provider</artifactId>
+  <packaging>pom</packaging>
+  <name>logging-provider</name>
+</project>

diff --git a/version.properties b/version.properties
index 3dcc918..190512e 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -16,10 +16,10 @@
 # Versioning variables
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
 # 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=5
+patch=6
 
 base_version=${major}.${minor}.${patch}