This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j-audit-sample.git
commit c6bdef42a813b6fe40751cebab550dde4aacc165 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Sat Nov 11 16:29:21 2023 +0100 Spotless --- audit-service-api/pom.xml | 18 +++- audit-service-war/pom.xml | 18 +++- .../log4j/audit/service/RequestContext.java | 10 +-- .../service/config/RequestContextInitializer.java | 20 ++++- audit-service-war/src/main/resources/log4j2.xml | 32 ++++---- audit-service/pom.xml | 18 +++- .../apache/logging/log4j/audit/AuditService.java | 11 ++- audit-service/src/main/resources/log4j2.xml | 32 ++++---- pom.xml | 95 +++++++++++----------- sample-app/pom.xml | 20 ++++- .../org/apache/logging/audit/RequestContext.java | 10 +-- .../java/org/apache/logging/audit/SampleApp.java | 10 +-- sample-app/src/main/resources/log4j2.xml | 32 ++++---- 13 files changed, 200 insertions(+), 126 deletions(-) diff --git a/audit-service-api/pom.xml b/audit-service-api/pom.xml index 81429c9..2aa9cef 100644 --- a/audit-service-api/pom.xml +++ b/audit-service-api/pom.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to you 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. + --> <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> @@ -36,10 +52,10 @@ <executions> <execution> <id>generate</id> - <phase>generate-sources</phase> <goals> <goal>generate</goal> </goals> + <phase>generate-sources</phase> <configuration> <packageName>org.apache.logging.log4j.audit.event</packageName> <enterpriseId>18060</enterpriseId> diff --git a/audit-service-war/pom.xml b/audit-service-war/pom.xml index 3c708ba..1a7c174 100644 --- a/audit-service-war/pom.xml +++ b/audit-service-war/pom.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to you 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. + --> <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> @@ -50,8 +66,8 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-audit-war</artifactId> - <scope>runtime</scope> <type>war</type> + <scope>runtime</scope> </dependency> </dependencies> <build> diff --git a/audit-service-war/src/main/java/org/apache/logging/log4j/audit/service/RequestContext.java b/audit-service-war/src/main/java/org/apache/logging/log4j/audit/service/RequestContext.java index 2e46b63..4671d27 100644 --- a/audit-service-war/src/main/java/org/apache/logging/log4j/audit/service/RequestContext.java +++ b/audit-service-war/src/main/java/org/apache/logging/log4j/audit/service/RequestContext.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with + * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache license, Version 2.0 + * The ASF licenses this file to you 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 + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.logging.log4j.audit.service; diff --git a/audit-service-war/src/main/java/org/apache/logging/log4j/audit/service/config/RequestContextInitializer.java b/audit-service-war/src/main/java/org/apache/logging/log4j/audit/service/config/RequestContextInitializer.java index bdaced0..8c0dfaa 100644 --- a/audit-service-war/src/main/java/org/apache/logging/log4j/audit/service/config/RequestContextInitializer.java +++ b/audit-service-war/src/main/java/org/apache/logging/log4j/audit/service/config/RequestContextInitializer.java @@ -1,15 +1,27 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you 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. + */ package org.apache.logging.log4j.audit.service.config; import javax.servlet.ServletContext; import javax.servlet.ServletException; -import javax.servlet.ServletRegistration; import org.apache.logging.log4j.audit.rest.RequestContextFilter; import org.apache.logging.log4j.audit.service.RequestContext; import org.springframework.web.WebApplicationInitializer; -import org.springframework.web.context.ContextLoaderListener; -import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; -import org.springframework.web.servlet.DispatcherServlet; public class RequestContextInitializer implements WebApplicationInitializer { diff --git a/audit-service-war/src/main/resources/log4j2.xml b/audit-service-war/src/main/resources/log4j2.xml index 1449401..894f85d 100644 --- a/audit-service-war/src/main/resources/log4j2.xml +++ b/audit-service-war/src/main/resources/log4j2.xml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -~ Licensed to the Apache Software Foundation (ASF) under one or more -~ contributor license agreements. See the NOTICE file distributed with -~ this work for additional information regarding copyright ownership. -~ The ASF licenses this file to You 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. ---> + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to you 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. + --> <Configuration status="ERROR"> <properties> <property name="LOG_DIR">${sys:catalina.home}/logs/AuditService</property> @@ -77,4 +77,4 @@ <AppenderRef ref="log4j" /> </Root> </Loggers> -</Configuration> \ No newline at end of file +</Configuration> diff --git a/audit-service/pom.xml b/audit-service/pom.xml index 6205000..7f7b259 100644 --- a/audit-service/pom.xml +++ b/audit-service/pom.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to you 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. + --> <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> @@ -31,8 +47,8 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>audit-service-war</artifactId> - <type>war</type> <version>${project.version}</version> + <type>war</type> </dependency> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/audit-service/src/main/java/org/apache/logging/log4j/audit/AuditService.java b/audit-service/src/main/java/org/apache/logging/log4j/audit/AuditService.java index faa7096..0ae264e 100644 --- a/audit-service/src/main/java/org/apache/logging/log4j/audit/AuditService.java +++ b/audit-service/src/main/java/org/apache/logging/log4j/audit/AuditService.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with + * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache license, Version 2.0 + * The ASF licenses this file to you 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 + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.logging.log4j.audit; @@ -21,7 +21,6 @@ import java.io.InputStream; import java.util.Properties; import org.apache.logging.log4j.catalog.api.util.ProfileUtil; - import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.support.SpringBootServletInitializer; diff --git a/audit-service/src/main/resources/log4j2.xml b/audit-service/src/main/resources/log4j2.xml index e342766..7304fbf 100644 --- a/audit-service/src/main/resources/log4j2.xml +++ b/audit-service/src/main/resources/log4j2.xml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -~ Licensed to the Apache Software Foundation (ASF) under one or more -~ contributor license agreements. See the NOTICE file distributed with -~ this work for additional information regarding copyright ownership. -~ The ASF licenses this file to You 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. ---> + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to you 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. + --> <Configuration status="ERROR"> <properties> <property name="LOG_DIR">logs/AuditService</property> @@ -72,4 +72,4 @@ <AppenderRef ref="log4j" /> </Root> </Loggers> -</Configuration> \ No newline at end of file +</Configuration> diff --git a/pom.xml b/pom.xml index 6238bd6..e4226cd 100644 --- a/pom.xml +++ b/pom.xml @@ -1,18 +1,19 @@ - <!-- +<?xml version="1.0" encoding="UTF-8"?> +<!-- ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with + ~ contributor license agreements. See the NOTICE file distributed with ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache license, Version 2.0 + ~ The ASF licenses this file to you 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 + ~ 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. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. --> <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> @@ -26,13 +27,19 @@ <artifactId>audit-sample-parent</artifactId> <version>${revision}</version> <packaging>pom</packaging> - <url>https://logging.apache.org/log4j-audit</url> <name>Audit Sample Parent</name> + <url>https://logging.apache.org/log4j-audit</url> + <modules> + <module>audit-service-war</module> + <module>audit-service-api</module> + <module>audit-service</module> + <module>sample-app</module> + </modules> <scm> <connection>scm:git:https://git-wip-us.apache.org/repos/asf/logging-log4j-audit-sample.git</connection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/logging-log4j-audit-sample.git</developerConnection> - <url>https://git-wip-us.apache.org/repos/asf?p=logging-log4j-audit-sample.git;a=summary</url> <tag>log4j-${Log4jAuditReleaseVersion}</tag> + <url>https://git-wip-us.apache.org/repos/asf?p=logging-log4j-audit-sample.git;a=summary</url> </scm> <properties> @@ -213,6 +220,9 @@ <executions> <execution> <id>enforce</id> + <goals> + <goal>enforce</goal> + </goals> <configuration> <rules> <dependencyConvergence /> @@ -221,9 +231,6 @@ </requireJavaVersion> </rules> </configuration> - <goals> - <goal>enforce</goal> - </goals> </execution> </executions> </plugin> @@ -252,14 +259,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>2.18.1</version> - <executions> - <execution> - <id>default-test</id> - <goals> - <goal>test</goal> - </goals> - </execution> - </executions> <configuration> <includes> <include>**/Test*.java</include> @@ -275,6 +274,14 @@ <site>${site}</site> </systemPropertyVariables> </configuration> + <executions> + <execution> + <id>default-test</id> + <goals> + <goal>test</goal> + </goals> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -307,6 +314,12 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>2.17</version> + <configuration> + <!--<propertiesLocation>${vfs.parent.dir}/checkstyle.properties</propertiesLocation> --> + <configLocation>nextiva/checkstyle.xml</configLocation> + <enableRulesSummary>false</enableRulesSummary> + <propertyExpansion>basedir=${basedir}</propertyExpansion> + </configuration> <reportSets> <reportSet> <reports> @@ -314,12 +327,6 @@ </reports> </reportSet> </reportSets> - <configuration> - <!--<propertiesLocation>${vfs.parent.dir}/checkstyle.properties</propertiesLocation> --> - <configLocation>nextiva/checkstyle.xml</configLocation> - <enableRulesSummary>false</enableRulesSummary> - <propertyExpansion>basedir=${basedir}</propertyExpansion> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -346,6 +353,14 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> <version>2.8.1</version> + <configuration> + <!-- you'd think these would be the defaults, right? --> + <customBundle>${project.basedir}/src/site/custom/project-info-report.properties</customBundle> + <webAccessUrl>${project.scm.url}</webAccessUrl> + <anonymousConnection>${project.scm.connection}</anonymousConnection> + <developerConnection>${project.scm.developerConnection}</developerConnection> + <dependencyLocationsEnabled>false</dependencyLocationsEnabled> + </configuration> <reportSets> <reportSet> <reports> @@ -360,14 +375,6 @@ </reports> </reportSet> </reportSets> - <configuration> - <!-- you'd think these would be the defaults, right? --> - <customBundle>${project.basedir}/src/site/custom/project-info-report.properties</customBundle> - <webAccessUrl>${project.scm.url}</webAccessUrl> - <anonymousConnection>${project.scm.connection}</anonymousConnection> - <developerConnection>${project.scm.developerConnection}</developerConnection> - <dependencyLocationsEnabled>false</dependencyLocationsEnabled> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -394,14 +401,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> <version>2.18.1</version> - <executions> - <execution> - <id>integration-tests</id> - <goals> - <goal>integration-test</goal> - </goals> - </execution> - </executions> <configuration> <reuseForks>false</reuseForks> <includes> @@ -412,15 +411,17 @@ <site>${site}</site> </systemPropertyVariables> </configuration> + <executions> + <execution> + <id>integration-tests</id> + <goals> + <goal>integration-test</goal> + </goals> + </execution> + </executions> </plugin> </plugins> </build> </profile> </profiles> - <modules> - <module>audit-service-war</module> - <module>audit-service-api</module> - <module>audit-service</module> - <module>sample-app</module> - </modules> </project> diff --git a/sample-app/pom.xml b/sample-app/pom.xml index afe5de2..72cec98 100644 --- a/sample-app/pom.xml +++ b/sample-app/pom.xml @@ -1,4 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to you 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. + --> <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> @@ -29,8 +45,6 @@ </dependency> </dependencies> <build> - <plugins> - - </plugins> + <plugins /> </build> </project> diff --git a/sample-app/src/main/java/org/apache/logging/audit/RequestContext.java b/sample-app/src/main/java/org/apache/logging/audit/RequestContext.java index d857073..7f5fba5 100644 --- a/sample-app/src/main/java/org/apache/logging/audit/RequestContext.java +++ b/sample-app/src/main/java/org/apache/logging/audit/RequestContext.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with + * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache license, Version 2.0 + * The ASF licenses this file to you 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 + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.logging.audit; diff --git a/sample-app/src/main/java/org/apache/logging/audit/SampleApp.java b/sample-app/src/main/java/org/apache/logging/audit/SampleApp.java index c3de8cc..db5c797 100644 --- a/sample-app/src/main/java/org/apache/logging/audit/SampleApp.java +++ b/sample-app/src/main/java/org/apache/logging/audit/SampleApp.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with + * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache license, Version 2.0 + * The ASF licenses this file to you 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 + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.logging.audit; diff --git a/sample-app/src/main/resources/log4j2.xml b/sample-app/src/main/resources/log4j2.xml index 87ff4e9..cc5c7fe 100644 --- a/sample-app/src/main/resources/log4j2.xml +++ b/sample-app/src/main/resources/log4j2.xml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -~ Licensed to the Apache Software Foundation (ASF) under one or more -~ contributor license agreements. See the NOTICE file distributed with -~ this work for additional information regarding copyright ownership. -~ The ASF licenses this file to You 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. ---> + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to you 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. + --> <Configuration status="ERROR"> <properties> <property name="LOG_DIR">target/logs</property> @@ -77,4 +77,4 @@ <AppenderRef ref="log4j" /> </Root> </Loggers> -</Configuration> \ No newline at end of file +</Configuration>
