From 2ab194ebd99962804cfb977d3a3b8f8d732d22f0 Mon Sep 17 00:00:00 2001 From: "Smokowski, Kevin (ks6305)" Date: Mon, 13 Jan 2020 19:16:57 +0000 Subject: pom changes centralize maven compiler plugin config and organize poms Issue-ID: LOG-1193 Signed-off-by: Smokowski, Kevin (ks6305) Change-Id: I8e6526f5709ea5773dd3214adddda15614daaff5 --- pom.xml | 13 +- pylog/pom.xml | 10 +- reference/logging-demo/pom.xml | 462 +++++++++------------ reference/logging-docker-root/pom.xml | 13 +- .../logging-filter/logging-filter-base/pom.xml | 112 ++--- .../logging-filter/logging-filter-spring/pom.xml | 130 +++--- reference/logging-filter/pom.xml | 437 +++++++++---------- reference/logging-kubernetes/pom.xml | 13 +- reference/logging-library/pom.xml | 220 +++++----- reference/logging-mock-service/pom.xml | 73 +--- reference/logging-slf4j-demo/pom.xml | 320 +++++++------- reference/logging-slf4j/pom.xml | 180 ++++---- reference/pom.xml | 181 ++++---- reference/provider/pom.xml | 13 +- 14 files changed, 988 insertions(+), 1189 deletions(-) diff --git a/pom.xml b/pom.xml index 813fb9d..06db3b3 100644 --- a/pom.xml +++ b/pom.xml @@ -1,17 +1,20 @@ 4.0.0 + - org.onap.oparent - oparent - 2.0.0 + org.onap.oparent + oparent + 2.0.0 + org.onap.logging-analytics logging-analytics - pom 1.6.3-SNAPSHOT + pom + logging-analytics - http://maven.apache.org + reference pylog diff --git a/pylog/pom.xml b/pylog/pom.xml index f68151a..f886bfa 100644 --- a/pylog/pom.xml +++ b/pylog/pom.xml @@ -11,21 +11,23 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --> - + + 4.0.0 + org.onap.oparent oparent 2.0.0 + org.onap.logging-analytics - 4.0.0 logging-pylog 1.6.1 pom + logging-pylog onap python logging library + diff --git a/reference/logging-demo/pom.xml b/reference/logging-demo/pom.xml index dec4c4b..4016c3a 100644 --- a/reference/logging-demo/pom.xml +++ b/reference/logging-demo/pom.xml @@ -1,112 +1,62 @@ + 4.0.0 + - org.onap.logging-analytics - logging-reference - 1.6.3-SNAPSHOT + org.onap.logging-analytics + logging-reference + 1.6.3-SNAPSHOT + logging-demo war + logging-demo + - 2.8.6 - - 5.1.2.RELEASE - 1.2.3 + 2.8.6 + + 5.1.2.RELEASE + 1.2.3 - - - - - - org.apache.maven.plugins - maven-site-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - 3.2 - - 1.8 - 1.8 - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - - - maven-compiler-plugin - - - [3.2,) - - - testCompile - - - - - - - - - - - - - - - - org.onap.logging-analytics - logging-mock-service - ${project.version} - - - + + + org.onap.logging-analytics + logging-mock-service + ${project.version} + + - javax.ws.rs - javax.ws.rs-api - 2.0.1 + javax.ws.rs + javax.ws.rs-api + 2.0.1 - org.glassfish.jersey.containers - jersey-container-servlet - 2.23 + org.glassfish.jersey.containers + jersey-container-servlet + 2.23 - org.glassfish.jersey.core - jersey-server - 2.23 + org.glassfish.jersey.core + jersey-server + 2.23 - org.glassfish.jersey.core - jersey-client - 2.23 + org.glassfish.jersey.core + jersey-client + 2.23 - org.glassfish.jersey.media - jersey-media-multipart - 2.23 + org.glassfish.jersey.media + jersey-media-multipart + 2.23 - org.glassfish.jersey.media - jersey-media-json-jackson - 2.23 + org.glassfish.jersey.media + jersey-media-json-jackson + 2.23 com.fasterxml.jackson.core @@ -116,183 +66,181 @@ - org.glassfish.jersey.ext - jersey-spring3 - 2.23 - - - - spring-context - org.springframework - - - spring-core - org.springframework - - - spring-web - org.springframework - - - spring-beans - org.springframework - - - org.glassfish.hk2.external - bean-validator - - + org.glassfish.jersey.ext + jersey-spring3 + 2.23 + + + + org.springframework + spring-context + + + spring-core + org.springframework + + + spring-web + org.springframework + + + spring-beans + org.springframework + + + org.glassfish.hk2.external + bean-validator + + - - - - com.fasterxml.jackson.core - jackson-core - ${jackson-2-version} - - - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson-2-version} - - - - - - - - com.fasterxml.jackson.dataformat - jackson-dataformat-smile - ${jackson-2-version} - - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson-2-version} - - + + + com.fasterxml.jackson.core - jackson-databind - - - - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${jackson-2-version} - - + jackson-core + ${jackson-2-version} + + + com.fasterxml.jackson.core - jackson-databind - - - + jackson-annotations + ${jackson-2-version} + + + + - com.owlike - genson - 1.1 + com.fasterxml.jackson.dataformat + jackson-dataformat-smile + ${jackson-2-version} + + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson-2-version} + + + com.fasterxml.jackson.core + jackson-databind + + + + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson-2-version} + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.owlike + genson + 1.1 + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + org.springframework + spring-aop + ${spring.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + org.springframework + spring-orm + ${spring.version} + + + org.springframework + spring-oxm + ${spring.version} + + + org.springframework + spring-test + ${spring.version} + - - - javax.servlet - javax.servlet-api - 3.0.1 - provided + org.springframework + spring-aspects + ${spring.version} + + org.aspectj + aspectjrt + 1.9.1 + + + org.springframework + spring-tx + ${spring.version} + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-webmvc + ${spring.version} + + + ch.qos.logback + logback-core + ${logback.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + + org.powermock + powermock-module-junit4 + 1.6.4 + test + + + junit + junit + 4.12 + test + + - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-orm - ${spring.version} - - - org.springframework - spring-oxm - ${spring.version} - - - org.springframework - spring-test - ${spring.version} - - - - org.springframework - spring-aspects - ${spring.version} - - - org.aspectj - aspectjrt - 1.9.1 - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-webmvc - ${spring.version} - - - ch.qos.logback - logback-core - ${logback.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - - org.powermock - powermock-module-junit4 - 1.6.4 - test - - - junit - junit - 4.12 - test - - + + + + org.apache.maven.plugins + maven-site-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + + + diff --git a/reference/logging-docker-root/pom.xml b/reference/logging-docker-root/pom.xml index 5eb9b5d..1c2d482 100644 --- a/reference/logging-docker-root/pom.xml +++ b/reference/logging-docker-root/pom.xml @@ -1,12 +1,15 @@ - + + 4.0.0 + - org.onap.logging-analytics - logging-reference - 1.6.3-SNAPSHOT + org.onap.logging-analytics + logging-reference + 1.6.3-SNAPSHOT + logging-docker-root pom + logging-docker-root diff --git a/reference/logging-filter/logging-filter-base/pom.xml b/reference/logging-filter/logging-filter-base/pom.xml index 718441f..e01ea0c 100644 --- a/reference/logging-filter/logging-filter-base/pom.xml +++ b/reference/logging-filter/logging-filter-base/pom.xml @@ -1,62 +1,62 @@ - 4.0.0 + 4.0.0 - - org.onap.logging-analytics - logging-filter-parent - 1.6.3-SNAPSHOT - + + org.onap.logging-analytics + logging-filter-parent + 1.6.3-SNAPSHOT + - logging-filter-base + logging-filter-base - - - javax.annotation - javax.annotation-api - - - org.onap.logging-analytics - logging-slf4j - - - javax.servlet - javax.servlet-api - - - javax.ws.rs - javax.ws.rs-api - - - org.slf4j - slf4j-api - - - org.apache.logging.log4j - log4j-slf4j-impl - test - - - junit - junit - test - - - org.glassfish.jersey.core - jersey-client - 2.25.1 - test - - - org.apache.logging.log4j - log4j-core - 2.10.0 - test - - - org.mockito - mockito-core - test - - + + + javax.annotation + javax.annotation-api + + + org.onap.logging-analytics + logging-slf4j + + + javax.servlet + javax.servlet-api + + + javax.ws.rs + javax.ws.rs-api + + + org.slf4j + slf4j-api + + + org.apache.logging.log4j + log4j-slf4j-impl + test + + + junit + junit + test + + + org.glassfish.jersey.core + jersey-client + 2.25.1 + test + + + org.apache.logging.log4j + log4j-core + 2.10.0 + test + + + org.mockito + mockito-core + test + + diff --git a/reference/logging-filter/logging-filter-spring/pom.xml b/reference/logging-filter/logging-filter-spring/pom.xml index c8be7a9..3f7c659 100644 --- a/reference/logging-filter/logging-filter-spring/pom.xml +++ b/reference/logging-filter/logging-filter-spring/pom.xml @@ -1,71 +1,71 @@ - 4.0.0 + 4.0.0 - - org.onap.logging-analytics - logging-filter-parent - 1.6.3-SNAPSHOT - + + org.onap.logging-analytics + logging-filter-parent + 1.6.3-SNAPSHOT + - logging-filter-spring + logging-filter-spring - - - - org.springframework.boot - spring-boot-dependencies - 2.0.5.RELEASE - pom - import - - - - - - org.springframework - spring-webmvc - - - org.onap.logging-analytics - logging-filter-base - ${project.version} - - - org.onap.logging-analytics - logging-slf4j - - - javax.servlet - javax.servlet-api - - - javax.ws.rs - javax.ws.rs-api - - - org.slf4j - slf4j-api - - - org.apache.logging.log4j - log4j-slf4j-impl - test - - - junit - junit - test - - - org.glassfish.jersey.core - jersey-client - test - - - org.mockito - mockito-core - test - - + + + + org.springframework.boot + spring-boot-dependencies + 2.0.5.RELEASE + pom + import + + + + + + org.springframework + spring-webmvc + + + org.onap.logging-analytics + logging-filter-base + ${project.version} + + + org.onap.logging-analytics + logging-slf4j + + + javax.servlet + javax.servlet-api + + + javax.ws.rs + javax.ws.rs-api + + + org.slf4j + slf4j-api + + + org.apache.logging.log4j + log4j-slf4j-impl + test + + + junit + junit + test + + + org.glassfish.jersey.core + jersey-client + test + + + org.mockito + mockito-core + test + + diff --git a/reference/logging-filter/pom.xml b/reference/logging-filter/pom.xml index 8f7e5fb..a25c9a5 100644 --- a/reference/logging-filter/pom.xml +++ b/reference/logging-filter/pom.xml @@ -1,263 +1,200 @@ - 4.0.0 + 4.0.0 - - org.onap.logging-analytics - logging-reference - 1.6.3-SNAPSHOT - - - logging-filter-parent - pom - - - logging-filter-base - logging-filter-spring - + + org.onap.logging-analytics + logging-reference + 1.6.3-SNAPSHOT + - - false - true - UTF-8 - + logging-filter-parent + pom - - - - javax.annotation - javax.annotation-api - 1.2 - provided - - - org.onap.logging-analytics - logging-slf4j - ${project.version} - - - javax.servlet - javax.servlet-api - 3.1.0 - provided - - - javax.ws.rs - javax.ws.rs-api - 2.0.1 - provided - - - org.slf4j - slf4j-api - 1.7.25 - provided - - - org.apache.logging.log4j - log4j-slf4j-impl - 2.11.2 - test - - - junit - junit - 4.11 - test - - - org.mockito - mockito-core - 2.15.0 - test - - - + + logging-filter-base + logging-filter-spring + - - - - maven-compiler-plugin - 2.5.1 - - - default-compile - compile - - compile - - - - default-testCompile - test-compile - - testCompile - - - - - 1.8 - 1.8 - true - -parameters - -Xlint:deprecation - - + + false + true + UTF-8 + - - - org.commonjava.maven.plugins - directory-maven-plugin - 0.2 - - - validate - directories - - highest-basedir - - - baseDirPath - - - - - - - + + org.commonjava.maven.plugins + directory-maven-plugin + 0.2 + + + validate + directories + + highest-basedir + + + baseDirPath + + + + - false - ${format.skipExecute} - ${format.skipValidate} - - - - update-headers - - update-file-header - - process-sources - - true - true - true - true - - - - check-headers - - check-file-header - - validate - - true - true - - - - - --> + + - - - net.revelc.code.formatter - formatter-maven-plugin - 2.10.0 - - - format-java - - format - - process-sources - - LF - ${format.skipExecute} - ${project.basedir} - ${baseDirPath}/project-configs/code-tools/onap-java-format.xml - - src/**/*.java - - - - - validate-java - - validate - - validate - - LF - ${format.skipValidate} - ${project.basedir} - ${baseDirPath}/project-configs/code-tools/onap-java-format.xml - - src/**/*.java - - - - - - - com.fasterxml.jackson.core - jackson-annotations - 2.9.8 - - - + + + net.revelc.code.formatter + formatter-maven-plugin + 2.10.0 + + + format-java + + format + + process-sources + + LF + ${format.skipExecute} + ${project.basedir} + ${baseDirPath}/project-configs/code-tools/onap-java-format.xml + + src/**/*.java + + + + + validate-java + + validate + + validate + + LF + ${format.skipValidate} + ${project.basedir} + ${baseDirPath}/project-configs/code-tools/onap-java-format.xml + + src/**/*.java + + + + + + + com.fasterxml.jackson.core + jackson-annotations + 2.9.8 + + + - - - org.codehaus.mojo - tidy-maven-plugin - 1.1.0 - - - format-pom - process-sources - - pom - - - ${format.skipExecute} - - - - validate-pom - validate - - check - - - ${format.skipValidate} - - - - - - + + + org.codehaus.mojo + tidy-maven-plugin + 1.1.0 + + + format-pom + process-sources + + pom + + + ${format.skipExecute} + + + + validate-pom + validate + + check + + + ${format.skipValidate} + + + + + + - - - format - - true - false - - - + + + format + + true + false + + + diff --git a/reference/logging-kubernetes/pom.xml b/reference/logging-kubernetes/pom.xml index 5ae96a4..764502e 100644 --- a/reference/logging-kubernetes/pom.xml +++ b/reference/logging-kubernetes/pom.xml @@ -1,12 +1,15 @@ - + + 4.0.0 + - org.onap.logging-analytics - logging-reference - 1.6.3-SNAPSHOT + org.onap.logging-analytics + logging-reference + 1.6.3-SNAPSHOT + logging-kubernetes pom + logging-kubernetes diff --git a/reference/logging-library/pom.xml b/reference/logging-library/pom.xml index cca06b6..306a934 100644 --- a/reference/logging-library/pom.xml +++ b/reference/logging-library/pom.xml @@ -1,144 +1,110 @@ + 4.0.0 + - org.onap.logging-analytics - logging-reference - 1.6.3-SNAPSHOT + org.onap.logging-analytics + logging-reference + 1.6.3-SNAPSHOT + logging-library jar + logging-library + - 5.1.2.RELEASE - 1.2.3 + 5.1.2.RELEASE + 1.2.3 + + + + org.onap.logging-analytics + logging-slf4j + ${project.version} + + + + javax.servlet + javax.servlet-api + 3.0.1 + provided + + + org.springframework + spring-aop + ${spring.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + org.springframework + spring-orm + ${spring.version} + + + org.springframework + spring-oxm + ${spring.version} + + + org.springframework + spring-test + ${spring.version} + + + + org.springframework + spring-aspects + ${spring.version} + + + org.aspectj + aspectjrt + 1.9.1 + + + org.springframework + spring-tx + ${spring.version} + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-webmvc + ${spring.version} + + + ch.qos.logback + logback-core + ${logback.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + - + org.apache.maven.plugins maven-compiler-plugin - 3.2 - - 1.8 - 1.8 - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - - - maven-compiler-plugin - - - [3.2,) - - - testCompile - - - - - - - - - - - - - - - - org.onap.logging-analytics - logging-slf4j - ${project.version} - - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-orm - ${spring.version} - - - org.springframework - spring-oxm - ${spring.version} - - - org.springframework - spring-test - ${spring.version} - - - - org.springframework - spring-aspects - ${spring.version} - - - org.aspectj - aspectjrt - 1.9.1 - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-webmvc - ${spring.version} - - - ch.qos.logback - logback-core - ${logback.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - diff --git a/reference/logging-mock-service/pom.xml b/reference/logging-mock-service/pom.xml index 1da2c59..e31ff85 100644 --- a/reference/logging-mock-service/pom.xml +++ b/reference/logging-mock-service/pom.xml @@ -1,68 +1,35 @@ + 4.0.0 + - org.onap.logging-analytics - logging-reference - 1.6.3-SNAPSHOT + org.onap.logging-analytics + logging-reference + 1.6.3-SNAPSHOT + logging-mock-service jar + logging-mock-service + + + + + + + org.onap.logging-analytics + logging-library + ${project.version} + + + - + org.apache.maven.plugins maven-compiler-plugin - 3.2 - - 1.8 - 1.8 - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - - - maven-compiler-plugin - - - [3.2,) - - - testCompile - - - - - - - - - - - - - - - - - org.onap.logging-analytics - logging-library - ${project.version} - - diff --git a/reference/logging-slf4j-demo/pom.xml b/reference/logging-slf4j-demo/pom.xml index e630e5b..1f73277 100644 --- a/reference/logging-slf4j-demo/pom.xml +++ b/reference/logging-slf4j-demo/pom.xml @@ -1,169 +1,163 @@ + - 4.0.0 - - org.onap.logging-analytics - logging-reference - 1.6.3-SNAPSHOT - .. - - logging-slf4j-demo - logging-slf4j-demo - war - - - 1.5.22.RELEASE - 5.1.2.RELEASE - 1.2.3 - + 4.0.0 - - - ${project.groupId} - logging-slf4j - 1.4.0 - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-json - - - com.fasterxml.jackson.core - jackson-databind - - - - - com.google.code.gson - gson - - - org.apache.commons - commons-lang3 - - - org.slf4j - slf4j-api - - - ch.qos.logback - logback-classic - - - com.mashape.unirest - unirest-java - - - org.springframework - spring-test - - - org.testng - testng - test - - - org.hamcrest - hamcrest-all - test - - + + org.onap.logging-analytics + logging-reference + 1.6.3-SNAPSHOT + .. + + + logging-slf4j-demo + war - - - - org.springframework.boot - spring-boot-dependencies - ${springframework.boot.version} - pom - import - - - org.apache.tomcat.embed - tomcat-embed-websocket - - - - - org.apache.commons - commons-lang3 - 3.4 - - - org.slf4j - slf4j-api - 1.7.25 - - - ch.qos.logback - logback-classic - ${logback.version} - - - com.mashape.unirest - unirest-java - 1.4.9 - - - commons-codec - commons-codec - - - - - org.testng - testng - 6.8.5 - - - org.hamcrest - hamcrest-all - 1.3 - - - org.springframework - spring-test - ${spring.version} - - - + logging-slf4j-demo - - - - maven-war-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - 1.8 - 1.8 - - - - org.springframework.boot - spring-boot-maven-plugin - ${springframework.boot.version} - - - - repackage - - - - - - + + + 1.5.22.RELEASE + 5.1.2.RELEASE + 1.2.3 + + + + + + org.springframework.boot + spring-boot-dependencies + ${springframework.boot.version} + pom + import + + + org.apache.tomcat.embed + tomcat-embed-websocket + + + + + org.apache.commons + commons-lang3 + 3.4 + + + org.slf4j + slf4j-api + 1.7.25 + + + ch.qos.logback + logback-classic + ${logback.version} + + + com.mashape.unirest + unirest-java + 1.4.9 + + + commons-codec + commons-codec + + + + + org.testng + testng + 6.8.5 + + + org.hamcrest + hamcrest-all + 1.3 + + + org.springframework + spring-test + ${spring.version} + + + + + + ${project.groupId} + logging-slf4j + 1.4.0 + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-json + + + com.fasterxml.jackson.core + jackson-databind + + + + + com.google.code.gson + gson + + + org.apache.commons + commons-lang3 + + + org.slf4j + slf4j-api + + + ch.qos.logback + logback-classic + + + com.mashape.unirest + unirest-java + + + org.springframework + spring-test + + + org.testng + testng + test + + + org.hamcrest + hamcrest-all + test + + + + + + maven-war-plugin + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.springframework.boot + spring-boot-maven-plugin + ${springframework.boot.version} + + + + repackage + + + + + + diff --git a/reference/logging-slf4j/pom.xml b/reference/logging-slf4j/pom.xml index 756c86e..85cbd54 100644 --- a/reference/logging-slf4j/pom.xml +++ b/reference/logging-slf4j/pom.xml @@ -1,92 +1,96 @@ + - 4.0.0 - - org.onap.logging-analytics - logging-reference - 1.6.3-SNAPSHOT - - logging-slf4j - logging-slf4j - jar - - 5.0.9.RELEASE - 1.2.3 - - - - - org.slf4j - slf4j-api - - - - javax.servlet - javax.servlet-api - provided - - - - ch.qos.logback - logback-classic - test - - - org.springframework - spring-test - test - - - org.testng - testng - test - - - org.hamcrest - hamcrest-all - test - - + 4.0.0 + + + org.onap.logging-analytics + logging-reference + 1.6.3-SNAPSHOT + + + logging-slf4j + jar - - - - org.slf4j - slf4j-api - 1.7.25 - - - javax.servlet - javax.servlet-api - 3.1.0 - provided - - - ch.qos.logback - logback-classic - ${logback.version} - - - org.testng - testng - 6.8.5 - - - junit - junit - - - - - org.hamcrest - hamcrest-all - 1.3 - - - org.springframework - spring-test - ${spring.version} - - - + logging-slf4j + + 5.0.9.RELEASE + 1.2.3 + + + + + + org.slf4j + slf4j-api + 1.7.25 + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + ch.qos.logback + logback-classic + ${logback.version} + + + org.testng + testng + 6.8.5 + + + junit + junit + + + + + org.hamcrest + hamcrest-all + 1.3 + + + org.springframework + spring-test + ${spring.version} + + + + + + + org.slf4j + slf4j-api + + + + javax.servlet + javax.servlet-api + provided + + + + ch.qos.logback + logback-classic + test + + + org.springframework + spring-test + test + + + org.testng + testng + test + + + org.hamcrest + hamcrest-all + test + + diff --git a/reference/pom.xml b/reference/pom.xml index b655e8a..50c572b 100644 --- a/reference/pom.xml +++ b/reference/pom.xml @@ -1,15 +1,18 @@ - + + 4.0.0 + - org.onap.logging-analytics - logging-analytics - 1.6.3-SNAPSHOT + org.onap.logging-analytics + logging-analytics + 1.6.3-SNAPSHOT + logging-reference pom + logging-reference - http://maven.apache.org + logging-demo logging-library @@ -19,111 +22,77 @@ logging-slf4j logging-slf4j-demo provider - logging-filter + logging-filter - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - maven-release-plugin - 2.4.2 - - - org.apache.maven.scm - maven-scm-provider-gitexe - 1.8.1 - - - - - - - org.apache.maven.plugins - maven-site-plugin - 3.6 - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - - - maven-compiler-plugin - - - [3.2,) - - - compile - - - - - - - - - - - - - - UTF-8 + UTF-8 - + + + + org.powermock + powermock-module-junit4 + 1.6.4 + test + + + junit + junit + 4.12 + test + + + + + - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17 - - - - checkstyle - - - - + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + maven-release-plugin + 2.4.2 + + + org.apache.maven.scm + maven-scm-provider-gitexe + 1.8.1 + + + + + + + + org.apache.maven.plugins + maven-site-plugin + 3.6 + - - - - - - - org.powermock - powermock-module-junit4 - 1.6.4 - test - - - junit - junit - 4.12 - test - + + - + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.17 + + + + checkstyle + + + + + + diff --git a/reference/provider/pom.xml b/reference/provider/pom.xml index 3e517b7..487d5c1 100644 --- a/reference/provider/pom.xml +++ b/reference/provider/pom.xml @@ -1,12 +1,15 @@ - + + 4.0.0 + - org.onap.logging-analytics - logging-reference - 1.6.3-SNAPSHOT + org.onap.logging-analytics + logging-reference + 1.6.3-SNAPSHOT + logging-provider pom + logging-provider -- cgit 1.2.3-korg