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 b17190735cbb17cc5b3b91d021fc7c086823fa59 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Sat Nov 11 16:21:36 2023 +0100 Add `logging-parent` --- audit-service-api/pom.xml | 21 ++------------------- audit-service-war/pom.xml | 20 ++------------------ audit-service/pom.xml | 22 +++------------------- pom.xml | 14 +++++++++++--- sample-app/pom.xml | 21 ++------------------- 5 files changed, 20 insertions(+), 78 deletions(-) diff --git a/audit-service-api/pom.xml b/audit-service-api/pom.xml index 129152d..81429c9 100644 --- a/audit-service-api/pom.xml +++ b/audit-service-api/pom.xml @@ -1,30 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <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";> - <!-- - ~ 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. - --> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.logging.log4j</groupId> <artifactId>audit-sample-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${revision}</version> </parent> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>audit-service-api</artifactId> + <artifactId>audit-service-api</artifactId> <description>Audit Logging API</description> <dependencies> diff --git a/audit-service-war/pom.xml b/audit-service-war/pom.xml index e651f16..3c708ba 100644 --- a/audit-service-war/pom.xml +++ b/audit-service-war/pom.xml @@ -1,28 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <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";> - <!-- - ~ 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. - --> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.logging.log4j</groupId> <artifactId>audit-sample-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${revision}</version> </parent> - <groupId>org.apache.logging.log4j</groupId> + <artifactId>audit-service-war</artifactId> <packaging>war</packaging> diff --git a/audit-service/pom.xml b/audit-service/pom.xml index cefc067..6205000 100644 --- a/audit-service/pom.xml +++ b/audit-service/pom.xml @@ -1,32 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <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";> - <!-- - ~ 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. - --> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.logging.log4j</groupId> <artifactId>audit-sample-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${revision}</version> </parent> - <groupId>org.apache.logging.log4j</groupId> + <artifactId>audit-service</artifactId> <packaging>jar</packaging> - <description>Audit Logging Service</description> + <dependencyManagement> <dependencies> <dependency> diff --git a/pom.xml b/pom.xml index 359db7e..6238bd6 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,3 @@ -<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";> <!-- ~ Licensed to the Apache Software Foundation (ASF) under one or more ~ contributor license agreements. See the NOTICE file distributed with @@ -15,10 +14,17 @@ ~ 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> + <groupId>org.apache.logging</groupId> + <artifactId>logging-parent</artifactId> + <version>10.3.0</version> + </parent> + <groupId>org.apache.logging.log4j</groupId> <artifactId>audit-sample-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${revision}</version> <packaging>pom</packaging> <url>https://logging.apache.org/log4j-audit</url> <name>Audit Sample Parent</name> @@ -30,12 +36,14 @@ </scm> <properties> + <revision>1.0.2-SNAPSHOT</revision> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.javadoc.failOnError>false</maven.javadoc.failOnError> <classmate.version>1.2.0</classmate.version> <jackson.version>2.8.5</jackson.version> <log4j.version>2.10.0</log4j.version> - <log4j-audit.version>1.0.0</log4j-audit.version> + <log4j-audit.version>1.0.2-SNAPSHOT</log4j-audit.version> <slf4j.version>1.6.2</slf4j.version> <spring.version>4.3.3.RELEASE</spring.version> <spring.boot.version>1.5.10.RELEASE</spring.boot.version> diff --git a/sample-app/pom.xml b/sample-app/pom.xml index 506ff8d..afe5de2 100644 --- a/sample-app/pom.xml +++ b/sample-app/pom.xml @@ -1,30 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <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";> - <!-- - ~ 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. - --> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.logging.log4j</groupId> <artifactId>audit-sample-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${revision}</version> </parent> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>sample-app</artifactId> + <artifactId>sample-app</artifactId> <description>Audit Logging Sample Application</description> <dependencies>
