summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore24
-rw-r--r--.gitreview5
-rw-r--r--pom.xml2
-rw-r--r--pylog/.gitignore4
-rw-r--r--pylog/pom.xml10
-rw-r--r--pylog/setup.py2
-rw-r--r--pylog/tox.ini16
-rw-r--r--pylog/version.properties4
-rw-r--r--reference/.classpath10
-rw-r--r--reference/.gitignore2
-rw-r--r--reference/.project44
-rw-r--r--reference/logging-demo/.classpath32
-rw-r--r--reference/logging-demo/.gitignore3
-rw-r--r--reference/logging-demo/.project44
-rw-r--r--reference/logging-demo/pom.xml10
-rw-r--r--reference/logging-docker-root/.project17
-rw-r--r--reference/logging-docker-root/pom.xml4
-rw-r--r--reference/logging-filter/logging-filter-base/pom.xml14
-rw-r--r--reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/PayloadLoggingServletFilter.java53
-rw-r--r--reference/logging-filter/logging-filter-spring/pom.xml14
-rw-r--r--reference/logging-filter/pom.xml30
-rw-r--r--reference/logging-kubernetes/.project17
-rw-r--r--reference/logging-kubernetes/pom.xml4
-rw-r--r--reference/logging-library/.classpath27
-rw-r--r--reference/logging-library/.gitignore2
-rw-r--r--reference/logging-library/.project53
-rw-r--r--reference/logging-library/pom.xml4
-rw-r--r--reference/logging-mock-service/.classpath27
-rw-r--r--reference/logging-mock-service/.gitignore2
-rw-r--r--reference/logging-mock-service/.project53
-rw-r--r--reference/logging-mock-service/pom.xml4
-rw-r--r--reference/logging-slf4j-demo/pom.xml8
-rw-r--r--reference/logging-slf4j/pom.xml4
-rw-r--r--reference/pom.xml10
-rw-r--r--reference/provider/pom.xml4
-rw-r--r--releases/1.6.3.yaml4
-rw-r--r--releases/1.6.4.yaml5
-rw-r--r--releases/1.6.5.yaml5
-rw-r--r--version.properties2
39 files changed, 154 insertions, 425 deletions
diff --git a/.gitignore b/.gitignore
index 8a809f2..568d66a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,27 @@
-.idea
+# Maven
+target/
+build/
+
+# Vagrant
+.vagrant
+
+# IntelliJ
+.idea/
+*.iml
+
+# Eclipse
.project
.classpath
.settings
-*.iml
+
+# Python
+.tox/
+__pycache__/
+*.pyc
+
npm-debug.log
node_modules/
node_install/
test_output/
test-output/
-target/
-dist/
-
+dist/ \ No newline at end of file
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..9587901
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.onap.org
+port=29418
+project=logging-analytics.git
+defaultbranch=master
diff --git a/pom.xml b/pom.xml
index 06db3b3..357f439 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-analytics</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
<packaging>pom</packaging>
<name>logging-analytics</name>
diff --git a/pylog/.gitignore b/pylog/.gitignore
new file mode 100644
index 0000000..9d5ff4e
--- /dev/null
+++ b/pylog/.gitignore
@@ -0,0 +1,4 @@
+.coverage
+.tox/
+__pycache__/
+tests/__pycache__/
diff --git a/pylog/pom.xml b/pylog/pom.xml
index f886bfa..5b460f2 100644
--- a/pylog/pom.xml
+++ b/pylog/pom.xml
@@ -15,17 +15,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.onap.oparent</groupId>
- <artifactId>oparent</artifactId>
- <version>2.0.0</version>
+ <groupId>org.onap.logging-analytics</groupId>
+ <artifactId>logging-analytics</artifactId>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
- <groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-pylog</artifactId>
- <version>1.6.1</version>
<packaging>pom</packaging>
- <name>logging-pylog</name>
+ <name>logging-analytics :: ${project.artifactId}</name>
<description>onap python logging library</description>
<build>
diff --git a/pylog/setup.py b/pylog/setup.py
index 99669fd..1246284 100644
--- a/pylog/setup.py
+++ b/pylog/setup.py
@@ -21,7 +21,7 @@ setup(
long_description="python-package onappylog could be used in any python"
"project to record MDC information and reload logging"
"at runtime",
- version="1.0.7",
+ version="1.6.6",
license="Apache 2.0",
author='ke liang',
author_email="lokyse@163.com",
diff --git a/pylog/tox.ini b/pylog/tox.ini
index 14ebfd0..87209a1 100644
--- a/pylog/tox.ini
+++ b/pylog/tox.ini
@@ -1,29 +1,37 @@
[tox]
-envlist =py,py3,pep8
+envlist =
+ testenv,
+ jenkins,
+ pep8
+ flake8
+ cover
skipsdist = true
skip_missing_interpreters = true
[tox:jenkins]
+basepython = python3
downloadcache = ~/cache/pip
[testenv]
+basepython = python3
deps = -r{toxinidir}/requirements.txt
pytest
coverage
pytest-cov
setenv = PYTHONPATH={toxinidir}/
-commands =
- /usr/bin/find . -type f -name "*.py[c|o]" -not -path "./.tox" -delete
- py.test
+commands = pytest
[testenv:pep8]
+basepython = python3
deps=flake8
commands=flake8
[flake8]
+basepython = python3
show-source = true
exclude = env,venv,.venv,.git,.tox,dist,doc,*egg,build
[testenv:cover]
+basepython = python3
commands = py.test --cov onaplogging
diff --git a/pylog/version.properties b/pylog/version.properties
index 176b32a..a9d88b5 100644
--- 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=4
-patch=0
+minor=6
+patch=6
base_version=${major}.${minor}.${patch}
diff --git a/reference/.classpath b/reference/.classpath
deleted file mode 100644
index 1767a9d..0000000
--- a/reference/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
- <attributes>
- <attribute name="module" value="true"/>
- <attribute name="owner.project.facets" value="java"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target"/>
-</classpath>
diff --git a/reference/.gitignore b/reference/.gitignore
deleted file mode 100644
index 99d2bb1..0000000
--- a/reference/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target/
-/build/
diff --git a/reference/.project b/reference/.project
deleted file mode 100644
index 15686ec..0000000
--- a/reference/.project
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>logging-reference</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.springframework.ide.eclipse.core.springnature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
- </natures>
-</projectDescription>
diff --git a/reference/logging-demo/.classpath b/reference/logging-demo/.classpath
deleted file mode 100644
index 407b61f..0000000
--- a/reference/logging-demo/.classpath
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java">
- <attributes>
- <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.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="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/reference/logging-demo/.gitignore b/reference/logging-demo/.gitignore
deleted file mode 100644
index eeca7fe..0000000
--- a/reference/logging-demo/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target/
-/build/
-/bin/
diff --git a/reference/logging-demo/.project b/reference/logging-demo/.project
deleted file mode 100644
index ee4ad0b..0000000
--- a/reference/logging-demo/.project
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>logging-demo</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.springframework.ide.eclipse.core.springnature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
- </natures>
-</projectDescription>
diff --git a/reference/logging-demo/pom.xml b/reference/logging-demo/pom.xml
index 4016c3a..ee5470d 100644
--- a/reference/logging-demo/pom.xml
+++ b/reference/logging-demo/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-reference</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<artifactId>logging-demo</artifactId>
<packaging>war</packaging>
- <name>logging-demo</name>
+ <name>logging-analytics :: ${project.artifactId}</name>
<properties>
<jackson-2-version>2.8.6</jackson-2-version>
@@ -223,12 +223,6 @@
<version>1.6.4</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/reference/logging-docker-root/.project b/reference/logging-docker-root/.project
deleted file mode 100644
index f1679d2..0000000
--- a/reference/logging-docker-root/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>logging-docker-root</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- </natures>
-</projectDescription>
diff --git a/reference/logging-docker-root/pom.xml b/reference/logging-docker-root/pom.xml
index 1c2d482..5c0c535 100644
--- a/reference/logging-docker-root/pom.xml
+++ b/reference/logging-docker-root/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-reference</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<artifactId>logging-docker-root</artifactId>
<packaging>pom</packaging>
- <name>logging-docker-root</name>
+ <name>logging-analytics :: ${project.artifactId}</name>
</project>
diff --git a/reference/logging-filter/logging-filter-base/pom.xml b/reference/logging-filter/logging-filter-base/pom.xml
index e01ea0c..7bd9340 100644
--- a/reference/logging-filter/logging-filter-base/pom.xml
+++ b/reference/logging-filter/logging-filter-base/pom.xml
@@ -5,11 +5,13 @@
<parent>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-filter-parent</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<artifactId>logging-filter-base</artifactId>
+ <name>logging-analytics :: ${project.artifactId}</name>
+
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
@@ -37,11 +39,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>2.25.1</version>
@@ -53,10 +50,5 @@
<version>2.10.0</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/PayloadLoggingServletFilter.java b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/PayloadLoggingServletFilter.java
index 0c0f5c4..e8d2813 100644
--- a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/PayloadLoggingServletFilter.java
+++ b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/PayloadLoggingServletFilter.java
@@ -22,18 +22,51 @@
package org.onap.logging.filter.base;
-import javax.servlet.*;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.util.zip.GZIPInputStream;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ReadListener;
+import javax.servlet.ServletException;
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.WriteListener;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
-import java.io.*;
-import java.util.zip.GZIPInputStream;
public class PayloadLoggingServletFilter extends AbstractServletFilter implements Filter {
private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(PayloadLoggingServletFilter.class);
+ private static final int defaultMaxSize = 100000;
+ private static Integer maxResponseSize;
+ private static Integer maxRequestSize;
+
+ public PayloadLoggingServletFilter() {
+ String maxRequestSizeOverride = System.getProperty("FILTER_MAX_REQUEST_SIZE");
+ if (maxRequestSizeOverride != null) {
+ maxRequestSize = Integer.valueOf(maxRequestSizeOverride);
+ } else {
+ maxRequestSize = defaultMaxSize;
+ }
+ String maxResponseSizeOverride = System.getProperty("FILTER_MAX_RESPONSE_SIZE");
+ if (maxResponseSizeOverride != null) {
+ maxResponseSize = Integer.valueOf(maxResponseSizeOverride);
+ } else {
+ maxResponseSize = defaultMaxSize;
+ }
+ }
private static class ByteArrayServletStream extends ServletOutputStream {
ByteArrayOutputStream baos;
@@ -194,7 +227,13 @@ public class PayloadLoggingServletFilter extends AbstractServletFilter implement
requestHeaders.append(getSecureRequestHeaders(httpRequest));
log.info(requestHeaders.toString());
- log.info("REQUEST BODY|{}", new String(bufferedRequest.getBuffer()));
+
+ byte[] buffer = bufferedRequest.getBuffer();
+ if (buffer.length < maxRequestSize) {
+ log.info("REQUEST BODY|{}", new String(buffer));
+ } else {
+ log.info("REQUEST BODY|{}", new String(buffer, 0, maxRequestSize));
+ }
final HttpServletResponse response = (HttpServletResponse) servletResponse;
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -242,7 +281,11 @@ public class PayloadLoggingServletFilter extends AbstractServletFilter implement
if ("gzip".equals(response.getHeader("Content-Encoding"))) {
log.info("UNGZIPED RESPONSE BODY|{}", decompressGZIPByteArray(bytes));
} else {
- log.info("RESPONSE BODY|{}", new String(bytes));
+ if (bytes.length < maxResponseSize) {
+ log.info("RESPONSE BODY|{}", new String(bytes));
+ } else {
+ log.info("RESPONSE BODY|{}", new String(bytes, 0, maxResponseSize));
+ }
}
if (pw.hasErrored()) {
diff --git a/reference/logging-filter/logging-filter-spring/pom.xml b/reference/logging-filter/logging-filter-spring/pom.xml
index 3f7c659..8d971d1 100644
--- a/reference/logging-filter/logging-filter-spring/pom.xml
+++ b/reference/logging-filter/logging-filter-spring/pom.xml
@@ -5,11 +5,13 @@
<parent>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-filter-parent</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<artifactId>logging-filter-spring</artifactId>
+ <name>logging-analytics :: ${project.artifactId}</name>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -53,19 +55,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/reference/logging-filter/pom.xml b/reference/logging-filter/pom.xml
index a25c9a5..e518620 100644
--- a/reference/logging-filter/pom.xml
+++ b/reference/logging-filter/pom.xml
@@ -5,12 +5,14 @@
<parent>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-reference</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<artifactId>logging-filter-parent</artifactId>
<packaging>pom</packaging>
+ <name>logging-analytics :: ${project.artifactId}</name>
+
<modules>
<module>logging-filter-base</module>
<module>logging-filter-spring</module>
@@ -59,18 +61,6 @@
<version>2.11.2</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>2.15.0</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -100,13 +90,13 @@
</plugin>
<!-- Plugin to Generate/Validate Copyright License header -->
- <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>license-maven-plugin</artifactId> <version>1.20</version> <configuration> <processStartTag>============LICENSE_START=======================================================</processStartTag>
- <sectionDelimiter>================================================================================</sectionDelimiter> <processEndTag>============LICENSE_END=========================================================</processEndTag>
- <licenseName>apache_v2</licenseName> <inceptionYear>2019</inceptionYear> <organizationName>AT&amp;T Intellectual Property. All rights reserved.</organizationName> <projectName>ONAP
- - Logging</projectName> <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage> <skipUpdateLicense>${format.skipExecute}</skipUpdateLicense> <skipCheckLicense>${format.skipValidate}</skipCheckLicense>
- </configuration> <executions> <execution> <id>update-headers</id> <goals> <goal>update-file-header</goal> </goals> <phase>process-sources</phase> <configuration> <canUpdateCopyright>true</canUpdateCopyright>
- <canUpdateDescription>true</canUpdateDescription> <canUpdateLicense>true</canUpdateLicense> <emptyLineAfterHeader>true</emptyLineAfterHeader> </configuration> </execution> <execution>
- <id>check-headers</id> <goals> <goal>check-file-header</goal> </goals> <phase>validate</phase> <configuration> <failOnNotUptodateHeader>true</failOnNotUptodateHeader> <failOnMissingHeader>true</failOnMissingHeader>
+ <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>license-maven-plugin</artifactId> <version>1.20</version> <configuration> <processStartTag>============LICENSE_START=======================================================</processStartTag>
+ <sectionDelimiter>================================================================================</sectionDelimiter> <processEndTag>============LICENSE_END=========================================================</processEndTag>
+ <licenseName>apache_v2</licenseName> <inceptionYear>2019</inceptionYear> <organizationName>AT&amp;T Intellectual Property. All rights reserved.</organizationName> <projectName>ONAP
+ - Logging</projectName> <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage> <skipUpdateLicense>${format.skipExecute}</skipUpdateLicense> <skipCheckLicense>${format.skipValidate}</skipCheckLicense>
+ </configuration> <executions> <execution> <id>update-headers</id> <goals> <goal>update-file-header</goal> </goals> <phase>process-sources</phase> <configuration> <canUpdateCopyright>true</canUpdateCopyright>
+ <canUpdateDescription>true</canUpdateDescription> <canUpdateLicense>true</canUpdateLicense> <emptyLineAfterHeader>true</emptyLineAfterHeader> </configuration> </execution> <execution>
+ <id>check-headers</id> <goals> <goal>check-file-header</goal> </goals> <phase>validate</phase> <configuration> <failOnNotUptodateHeader>true</failOnNotUptodateHeader> <failOnMissingHeader>true</failOnMissingHeader>
</configuration> </execution> </executions> </plugin> -->
<!-- Plugin to Format/Validate Java Classes -->
diff --git a/reference/logging-kubernetes/.project b/reference/logging-kubernetes/.project
deleted file mode 100644
index a7ec855..0000000
--- a/reference/logging-kubernetes/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>logging-kubernetes</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- </natures>
-</projectDescription>
diff --git a/reference/logging-kubernetes/pom.xml b/reference/logging-kubernetes/pom.xml
index 764502e..d1b8f2d 100644
--- a/reference/logging-kubernetes/pom.xml
+++ b/reference/logging-kubernetes/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-reference</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<artifactId>logging-kubernetes</artifactId>
<packaging>pom</packaging>
- <name>logging-kubernetes</name>
+ <name>logging-analytics :: ${project.artifactId}</name>
</project>
diff --git a/reference/logging-library/.classpath b/reference/logging-library/.classpath
deleted file mode 100644
index 7a80cdf..0000000
--- a/reference/logging-library/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/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=""/>
- </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="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 kind="output" path="target/classes"/>
-</classpath>
diff --git a/reference/logging-library/.gitignore b/reference/logging-library/.gitignore
deleted file mode 100644
index 99d2bb1..0000000
--- a/reference/logging-library/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target/
-/build/
diff --git a/reference/logging-library/.project b/reference/logging-library/.project
deleted file mode 100644
index 5ffa62b..0000000
--- a/reference/logging-library/.project
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>logging-library</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.springframework.ide.eclipse.core.springbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.springframework.ide.eclipse.core.springnature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/reference/logging-library/pom.xml b/reference/logging-library/pom.xml
index 306a934..5e848ec 100644
--- a/reference/logging-library/pom.xml
+++ b/reference/logging-library/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-reference</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<artifactId>logging-library</artifactId>
<packaging>jar</packaging>
- <name>logging-library</name>
+ <name>logging-analytics :: ${project.artifactId}</name>
<properties>
<spring.version>5.1.2.RELEASE</spring.version>
diff --git a/reference/logging-mock-service/.classpath b/reference/logging-mock-service/.classpath
deleted file mode 100644
index f941705..0000000
--- a/reference/logging-mock-service/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </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="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 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"/>
-</classpath>
diff --git a/reference/logging-mock-service/.gitignore b/reference/logging-mock-service/.gitignore
deleted file mode 100644
index 99d2bb1..0000000
--- a/reference/logging-mock-service/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target/
-/build/
diff --git a/reference/logging-mock-service/.project b/reference/logging-mock-service/.project
deleted file mode 100644
index 8e8b873..0000000
--- a/reference/logging-mock-service/.project
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>logging-mock-service</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.springframework.ide.eclipse.core.springbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.springframework.ide.eclipse.core.springnature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/reference/logging-mock-service/pom.xml b/reference/logging-mock-service/pom.xml
index e31ff85..b5914fb 100644
--- a/reference/logging-mock-service/pom.xml
+++ b/reference/logging-mock-service/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-reference</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<artifactId>logging-mock-service</artifactId>
<packaging>jar</packaging>
- <name>logging-mock-service</name>
+ <name>logging-analytics :: ${project.artifactId}</name>
<properties>
</properties>
diff --git a/reference/logging-slf4j-demo/pom.xml b/reference/logging-slf4j-demo/pom.xml
index 1f73277..310efce 100644
--- a/reference/logging-slf4j-demo/pom.xml
+++ b/reference/logging-slf4j-demo/pom.xml
@@ -5,17 +5,17 @@
<parent>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-reference</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>logging-slf4j-demo</artifactId>
<packaging>war</packaging>
- <name>logging-slf4j-demo</name>
+ <name>logging-analytics :: ${project.artifactId}</name>
<properties>
- <!-- from 1.5.10 to not pull in spring 4.3.14/5.0.5 override of 5.0.9 however 4.3.17 of spring-core over 4.3.14 is not enough - need 4.3.18+ tomcat-embed-core 8.5.31 needs 8.5.32+
+ <!-- from 1.5.10 to not pull in spring 4.3.14/5.0.5 override of 5.0.9 however 4.3.17 of spring-core over 4.3.14 is not enough - need 4.3.18+ tomcat-embed-core 8.5.31 needs 8.5.32+
- which spring-boot 1.5.15 brings in spring-expression 4.3.14 goes to 4.3.17 under 1.5.15 1.5.17 ups jackson-databind from 2.8.11.2 - but we will likely need 2.9+ -->
<springframework.boot.version>1.5.22.RELEASE</springframework.boot.version>
<spring.version>5.1.2.RELEASE</spring.version>
@@ -139,7 +139,9 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <version>3.2.3</version>
<configuration />
</plugin>
<plugin>
diff --git a/reference/logging-slf4j/pom.xml b/reference/logging-slf4j/pom.xml
index 85cbd54..3b1e2ae 100644
--- a/reference/logging-slf4j/pom.xml
+++ b/reference/logging-slf4j/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-reference</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<artifactId>logging-slf4j</artifactId>
<packaging>jar</packaging>
- <name>logging-slf4j</name>
+ <name>logging-analytics :: ${project.artifactId}</name>
<properties>
<spring.version>5.0.9.RELEASE</spring.version>
diff --git a/reference/pom.xml b/reference/pom.xml
index 50c572b..4dfdf0a 100644
--- a/reference/pom.xml
+++ b/reference/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-analytics</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<artifactId>logging-reference</artifactId>
<packaging>pom</packaging>
- <name>logging-reference</name>
+ <name>logging-analytics :: ${project.artifactId}</name>
<modules>
<module>logging-demo</module>
@@ -42,6 +42,12 @@
<version>4.12</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>2.23.4</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/reference/provider/pom.xml b/reference/provider/pom.xml
index 487d5c1..28cf743 100644
--- a/reference/provider/pom.xml
+++ b/reference/provider/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-reference</artifactId>
- <version>1.6.3-SNAPSHOT</version>
+ <version>1.6.6-SNAPSHOT</version>
</parent>
<artifactId>logging-provider</artifactId>
<packaging>pom</packaging>
- <name>logging-provider</name>
+ <name>logging-analytics :: ${project.artifactId}</name>
</project>
diff --git a/releases/1.6.3.yaml b/releases/1.6.3.yaml
new file mode 100644
index 0000000..de2a11a
--- /dev/null
+++ b/releases/1.6.3.yaml
@@ -0,0 +1,4 @@
+distribution_type: 'maven'
+version: '1.6.3'
+project: 'logging-analytics'
+log_dir: 'logging-analytics-maven-stage-master/295/'
diff --git a/releases/1.6.4.yaml b/releases/1.6.4.yaml
new file mode 100644
index 0000000..11bf54b
--- /dev/null
+++ b/releases/1.6.4.yaml
@@ -0,0 +1,5 @@
+---
+distribution_type: 'maven'
+version: '1.6.4'
+project: 'logging-analytics'
+log_dir: 'logging-analytics-maven-stage-master/302/'
diff --git a/releases/1.6.5.yaml b/releases/1.6.5.yaml
new file mode 100644
index 0000000..3e78da6
--- /dev/null
+++ b/releases/1.6.5.yaml
@@ -0,0 +1,5 @@
+---
+distribution_type: 'maven'
+version: '1.6.5'
+project: 'logging-analytics'
+log_dir: 'logging-analytics-maven-stage-master/317/'
diff --git a/version.properties b/version.properties
index 2ad0f36..3ef036d 100644
--- a/version.properties
+++ b/version.properties
@@ -19,7 +19,7 @@
# 1.2.6-SNAPSHOT is off 1.2.5
major=1
minor=6
-patch=3
+patch=6
base_version=${major}.${minor}.${patch}