From f60db6d89ea6ca41101471a53c937d9ae1f088b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raimar=20B=C3=BChmann?= Date: Tue, 24 Jun 2025 09:14:56 +0200 Subject: [PATCH 1/7] Update animal-sniffer-maven-plugin from 1.18 to 1.24 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index f651fdf..022d12a 100644 --- a/pom.xml +++ b/pom.xml @@ -179,6 +179,7 @@ org.codehaus.mojo animal-sniffer-maven-plugin + 1.24 signature-check From 9320c5ce5c6da79e8d8968e1462a679055559cc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raimar=20B=C3=BChmann?= Date: Tue, 24 Jun 2025 09:12:55 +0200 Subject: [PATCH 2/7] Do not use JPMS for test execution --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 022d12a..39fe71c 100644 --- a/pom.xml +++ b/pom.xml @@ -68,6 +68,7 @@ UTF-8 ${project.basedir} false + false From 2ec082363c40ebec6705a983168b52874d7a5084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raimar=20B=C3=BChmann?= Date: Tue, 24 Jun 2025 09:20:18 +0200 Subject: [PATCH 3/7] Update maven-compiler-plugin from 3.8.0 to 3.14.0 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 39fe71c..713b637 100644 --- a/pom.xml +++ b/pom.xml @@ -208,6 +208,7 @@ maven-compiler-plugin + 3.14.0 ${maven.compiler.target} ${maven.compiler.target} From 970a2615f4bff200d16c199040eb87ba6fe940df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raimar=20B=C3=BChmann?= Date: Tue, 24 Jun 2025 09:22:58 +0200 Subject: [PATCH 4/7] Use maven.compiler.target in log4j2-ecs-layout --- log4j2-ecs-layout/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/log4j2-ecs-layout/pom.xml b/log4j2-ecs-layout/pom.xml index ea09d12..af1a1e6 100644 --- a/log4j2-ecs-layout/pom.xml +++ b/log4j2-ecs-layout/pom.xml @@ -27,6 +27,7 @@ process-classes + ${maven.compiler.target} only org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor From cc0c5a7f9062e1ed0c1fead41d410984c4033249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raimar=20B=C3=BChmann?= Date: Wed, 11 Jun 2025 09:21:14 +0200 Subject: [PATCH 5/7] Add module-info file to ecs-logging-core --- .../src/main/java/module-info.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 ecs-logging-core/src/main/java/module-info.java diff --git a/ecs-logging-core/src/main/java/module-info.java b/ecs-logging-core/src/main/java/module-info.java new file mode 100644 index 0000000..86fa6a9 --- /dev/null +++ b/ecs-logging-core/src/main/java/module-info.java @@ -0,0 +1,31 @@ +/*- + * #%L + * Java ECS logging + * %% + * Copyright (C) 2019 - 2020 Elastic and contributors + * %% + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. 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. + * #L% + */ +module co.elastic.logging { + + requires java.base; + exports co.elastic.logging; + +} + From 8838ce4865bfae4a69f2fb6233e52698dbf84da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raimar=20B=C3=BChmann?= Date: Wed, 11 Jun 2025 09:21:14 +0200 Subject: [PATCH 6/7] Add module-info file to logback-ecs-encoder --- .../src/main/java/module-info.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 logback-ecs-encoder/src/main/java/module-info.java diff --git a/logback-ecs-encoder/src/main/java/module-info.java b/logback-ecs-encoder/src/main/java/module-info.java new file mode 100644 index 0000000..466fb7a --- /dev/null +++ b/logback-ecs-encoder/src/main/java/module-info.java @@ -0,0 +1,36 @@ +/*- + * #%L + * Java ECS logging + * %% + * Copyright (C) 2019 - 2020 Elastic and contributors + * %% + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. 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. + * #L% + */ +module co.elastic.logging.logback { + + requires java.base; + requires org.slf4j; + requires co.elastic.logging; + requires logback.core; + requires logback.classic; + + exports co.elastic.logging.logback; + +} + From c5b2086586f5fa16d1002b35d4b59e79cf82d0d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raimar=20B=C3=BChmann?= Date: Fri, 20 Jun 2025 09:14:21 +0200 Subject: [PATCH 7/7] Compile module-info.java with Java 9 --- pom.xml | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 57 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 713b637..6d5b228 100644 --- a/pom.xml +++ b/pom.xml @@ -198,7 +198,6 @@ - maven-surefire-plugin @@ -210,12 +209,65 @@ maven-compiler-plugin 3.14.0 - ${maven.compiler.target} - ${maven.compiler.target} - ${maven.compiler.testTarget} - ${maven.compiler.testTarget} UTF-8 + + + default-compile + + ${maven.compiler.target} + + module-info.java + + + + + default-testCompile + + ${maven.compiler.testTarget} + + module-info.java + + + + + compile-module-info + prepare-package + + compile + + + 9 + + co/**/*.java + + + + + + + + maven-clean-plugin + + + auto-clean + process-test-resources + + clean + + + true + + + ${project.build.outputDirectory} + + module-info.class + + + + + + com.coderplus.maven.plugins