diff options
| -rw-r--r-- | dbc-client/pom.xml | 2 | ||||
| -rw-r--r-- | dmaap-bc/pom.xml | 22 | ||||
| -rw-r--r-- | dmaap-bc/src/main/webapp/WEB-INF/log4j.xml | 45 | ||||
| -rw-r--r-- | dmaap-bc/src/main/webapp/WEB-INF/log4j2.xml | 50 | ||||
| -rw-r--r-- | pom.xml | 2 |
5 files changed, 65 insertions, 56 deletions
diff --git a/dbc-client/pom.xml b/dbc-client/pom.xml index 85a5364..763f043 100644 --- a/dbc-client/pom.xml +++ b/dbc-client/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>2.0.0</version> + <version>3.2.0</version> <relativePath/> </parent> <build> diff --git a/dmaap-bc/pom.xml b/dmaap-bc/pom.xml index 6881541..48cc024 100644 --- a/dmaap-bc/pom.xml +++ b/dmaap-bc/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>2.1.0</version> + <version>3.2.0</version> <relativePath/> </parent> <build> @@ -358,9 +358,14 @@ <artifactId>jersey-media-moxy</artifactId> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>${log4j.version}</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4j.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> @@ -378,7 +383,6 @@ <version>2.1.7</version> <classifier>full</classifier> </dependency> - <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> @@ -400,15 +404,14 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.11</version> + <version>1.15</version> </dependency> <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql --> <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>42.2.5</version> + <version>42.2.14</version> </dependency> - <dependency> <groupId>org.onap.dmaap.dbcapi</groupId> <artifactId>dbcapi</artifactId> @@ -447,7 +450,8 @@ <docker.maven.plugin.version>1.0.0</docker.maven.plugin.version> <jersey.version>2.29</jersey.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <jettyVersion>9.4.24.v20191120</jettyVersion> + <log4j.version>2.13.3</log4j.version> + <jettyVersion>9.4.36.v20210114</jettyVersion> <eelf.version>1.0.0</eelf.version> <swagger.version>1.5.19</swagger.version> <artifact.version>2.0.4-SNAPSHOT</artifact.version> diff --git a/dmaap-bc/src/main/webapp/WEB-INF/log4j.xml b/dmaap-bc/src/main/webapp/WEB-INF/log4j.xml deleted file mode 100644 index 4e4d5e9..0000000 --- a/dmaap-bc/src/main/webapp/WEB-INF/log4j.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ============LICENSE_START======================================================= - OpenECOMP - org.openecomp.dmaapbc - ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ============LICENSE_END========================================================= - --> - -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd" > -<log4j:configuration> - <appender name="dmaapBC" class="org.apache.log4j.RollingFileAppender"> - <param name="File" value="dmaapBC.log"/> - <param name="MaxFileSize" value="1000KB"/> - <param name="MaxBackupIndex" value="3"/> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="[%d{HH:mm:ss:SSS}] - %-6p - %c.%M() - %m%n"/> - </layout> - </appender> - <appender name="media" class="org.apache.log4j.ConsoleAppender"> - <param name="Threshold" value="FATAL"/> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/> - </layout> - </appender> - <category name="org.openecomp.dcae.dmaapBC"> - <appender-ref ref="dmaapBC"/> - </category> - <root> - <priority value="all"/> - <appender-ref ref="media"/> - </root> -</log4j:configuration> diff --git a/dmaap-bc/src/main/webapp/WEB-INF/log4j2.xml b/dmaap-bc/src/main/webapp/WEB-INF/log4j2.xml new file mode 100644 index 0000000..bd7e9c5 --- /dev/null +++ b/dmaap-bc/src/main/webapp/WEB-INF/log4j2.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ============LICENSE_START======================================================= + Copyright (C) 2021 Nordix Foundation. + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + SPDX-License-Identifier: Apache-2.0 + ============LICENSE_END========================================================= + --> + +<Configuration status="WARN"> + <Appenders> + <!-- Console Appender --> + <Console name="STDOUT" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %-5r %-5p [%c] (%t:%x) %m%n"/> + </Console> + + <!-- Rolling File Appender --> + <RollingFile name="rollingFile"> + <FileName>dmaapBC.log</FileName> + <FilePattern>${date:yyyy-MM}/dmaapBC-%d{yyyy-MM-dd}-%i.log.gz</FilePattern> + <PatternLayout> + <Pattern>[%d{HH:mm:ss:SSS}] - %-6p - %c.%M() - %m%n</Pattern> + </PatternLayout> + <Policies> + <SizeBasedTriggeringPolicy size="1000 KB"/> + </Policies> + <DefaultRolloverStrategy max="3"/> + </RollingFile> + </Appenders> + <Loggers> + <Logger name="org.openecomp.dcae.dmaapBC" level="debug" additivity="false"> + <AppenderRef ref="rollingFile"/> + </Logger> + <Root level="ALL"> + <AppenderRef ref="STDOUT"/> + </Root> + </Loggers> +</Configuration>
\ No newline at end of file @@ -29,7 +29,7 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>2.1.0</version> + <version>3.2.0</version> </parent> <properties> |