release logging-demo war

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

diff --git a/pom.xml b/pom.xml
index d1a45e1..e53c60d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -9,18 +9,12 @@
   <groupId>org.onap.logging-analytics</groupId>
   <artifactId>logging-analytics</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.3</version>
+  <version>1.2.4</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-slf4j</module-->
-    <!--module>reference/logging-slf4j-demo</module>
-    <module>reference/logging-library</module-->
-    <!-- on at a time and no previously released -->
-    <module>reference/logging-mock-service</module>
-    <!--module>reference/logging-slf4j</module-->
-    <!--module>reference</module-->
+    <module>reference/logging-demo</module>
     <!--  temp 1 branch release at a time -->
     <!-- module>pylog</module-->
   </modules>

diff --git a/reference/logging-demo/.classpath b/reference/logging-demo/.classpath
index 9a77030..407b61f 100644 (file)
--- a/reference/logging-demo/.classpath
+++ b/reference/logging-demo/.classpath
@@ -1,23 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="src" path="src/main/resources"/>
-       <classpathentry kind="src" path="src/test/java"/>
-       <classpathentry combineaccessrules="false" exported="true" kind="src" path="/logging-library">
+       <classpathentry kind="src" output="target/classes" path="src/main/java">
                <attributes>
-                       <attribute name="module" value="true"/>
+                       <attribute name="optional" value="true"/>
+                       <attribute name="maven.pomderived" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+               <attributes>
+                       <attribute name="maven.pomderived" value="true"/>
+               </attributes>
+       </classpathentry>
+       <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+               <attributes>
+                       <attribute name="optional" value="true"/>
+                       <attribute name="maven.pomderived" value="true"/>
                </attributes>
        </classpathentry>
        <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=""/>
                        <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
                </attributes>
        </classpathentry>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
                <attributes>
-                       <attribute name="owner.project.facets" value="java"/>
+                       <attribute name="maven.pomderived" value="true"/>
                </attributes>
        </classpathentry>
        <classpathentry kind="output" path="target/classes"/>

diff --git a/reference/logging-demo/pom.xml b/reference/logging-demo/pom.xml
index 05215c8..6b18179 100644 (file)
--- a/reference/logging-demo/pom.xml
+++ b/reference/logging-demo/pom.xml
@@ -1,11 +1,18 @@
 <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.2</version>
+  </parent-->
+  <parent>
+      <groupId>org.onap.oparent</groupId>
+      <artifactId>oparent</artifactId>
+      <version>1.2.1</version>
   </parent>
+  
   <artifactId>logging-demo</artifactId>
+  <version>1.2.2</version>
   <packaging>war</packaging>
   <name>logging-demo</name>
   <properties>
@@ -71,9 +78,9 @@
         <dependency>
             <groupId>org.onap.logging-analytics</groupId>
             <artifactId>logging-mock-service</artifactId>
-            <version>1.2.2-SNAPSHOT</version>
+            <version>1.2.2</version>
         </dependency>
-        
+       
         
             <!-- https://jersey.java.net/documentation/latest/modules-and-dependencies.html -->
     <dependency>
@@ -257,6 +264,18 @@
                         <groupId>ch.qos.logback</groupId>
                         <artifactId>logback-classic</artifactId>
                         <version>${logback.version}</version>
-                </dependency>  
+                </dependency>
+                <!-- JUnit 4.12 used to come with EELF -->
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>1.6.4</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>  
     </dependencies>
 </project>