From 6d37abd568b9e2acde794d73f5b3f0f8297798f6 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Thu, 23 Feb 2023 13:07:49 +0100 Subject: [PATCH 01/17] Added jakarta servlet module --- .gitignore | 2 + .../pom.xml | 206 ++++++++++++++++++ cf-java-logging-support-servlet/pom.xml | 16 ++ pom.xml | 1 + 4 files changed, 225 insertions(+) create mode 100644 cf-java-logging-support-servlet-jakarta/pom.xml diff --git a/.gitignore b/.gitignore index 57080521..99243815 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,5 @@ gen # VSCode .vscode + +cf-java-logging-support-servlet-jakarta/src \ No newline at end of file diff --git a/cf-java-logging-support-servlet-jakarta/pom.xml b/cf-java-logging-support-servlet-jakarta/pom.xml new file mode 100644 index 00000000..4e63c1d9 --- /dev/null +++ b/cf-java-logging-support-servlet-jakarta/pom.xml @@ -0,0 +1,206 @@ + + 4.0.0 + + cf-java-logging-support-servlet-jakarta + jar + + cf-java-logging-support-servlet-jakarta + + com.sap.hcp.cf.logging + cf-java-logging-support-parent + 3.6.3 + ../pom.xml + + + + 5.0.0 + + + + com.sap.hcp.cf.logging + cf-java-logging-support-servlet + ${project.version} + provided + + + com.sap.hcp.cf.logging + cf-java-logging-support-servlet + ${project.version} + tests + provided + + + + + jakarta.servlet + jakarta.servlet-api + ${servlet.api.version} + provided + + + com.sap.hcp.cf.logging + cf-java-logging-support-core + ${project.version} + + + + com.sap.hcp.cf.logging + cf-java-logging-support-logback + ${project.version} + test + + + ch.qos.logback + logback-classic + ${logback.version} + test + + + + com.auth0 + java-jwt + 3.18.2 + + + com.fasterxml.jackson.core + jackson-databind + 2.13.4.1 + + + + + org.eclipse.jetty + jetty-server + 11.0.13 + test + + + org.eclipse.jetty + jetty-servlet + 11.0.13 + test + + + org.apache.httpcomponents + httpclient + 4.5.13 + test + + + + + + + + maven-source-plugin + + + attach-sources + + jar + + + + + + + + maven-clean-plugin + + + + ${basedir}/src + false + + + + + + + + maven-dependency-plugin + + + unpack + generate-sources + + unpack + + + + + ${project.groupId} + cf-java-logging-support-servlet + ${project.version} + jar + sources + false + ${basedir}/src/main/java + **/*.java + + + ${project.groupId} + cf-java-logging-support-servlet + ${project.version} + jar + test-sources + false + ${basedir}/src/test/java + **/*.java + + + + + + + + + io.github.floverfelt + find-and-replace-maven-plugin + 1.1.0 + + + replace-in-xml + process-resources + + find-and-replace + + + file-contents + src/ + javax.servlet + jakarta.servlet + true + .xml + + + + replace-in-java + process-resources + + find-and-replace + + + file-contents + src/ + javax.servlet + jakarta.servlet + true + .java + + + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + true + + + + + + diff --git a/cf-java-logging-support-servlet/pom.xml b/cf-java-logging-support-servlet/pom.xml index 07ba924b..22eb6d51 100644 --- a/cf-java-logging-support-servlet/pom.xml +++ b/cf-java-logging-support-servlet/pom.xml @@ -76,4 +76,20 @@ + + + + + maven-source-plugin + + + + jar + test-jar + + + + + + diff --git a/pom.xml b/pom.xml index 97280c3e..3e9cc4c9 100644 --- a/pom.xml +++ b/pom.xml @@ -190,6 +190,7 @@ cf-java-logging-support-logback cf-java-logging-support-log4j2 cf-java-logging-support-servlet + cf-java-logging-support-servlet-jakarta cf-java-logging-support-jersey cf-java-monitoring-custom-metrics-clients sample From 4831e1542d82aca195dbf617522a4af43cbe5c06 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Thu, 23 Feb 2023 13:25:52 +0100 Subject: [PATCH 02/17] added missing plugin versions --- cf-java-logging-support-servlet-jakarta/pom.xml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/cf-java-logging-support-servlet-jakarta/pom.xml b/cf-java-logging-support-servlet-jakarta/pom.xml index 4e63c1d9..31b96f1a 100644 --- a/cf-java-logging-support-servlet-jakarta/pom.xml +++ b/cf-java-logging-support-servlet-jakarta/pom.xml @@ -92,21 +92,9 @@ - - maven-source-plugin - - - attach-sources - - jar - - - - - - maven-clean-plugin + 3.2.0 @@ -117,9 +105,9 @@ - maven-dependency-plugin + 3.5.0 unpack From 44b19d35893cf0b981acefb468adc1be8a735106 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Thu, 23 Feb 2023 15:51:20 +0100 Subject: [PATCH 03/17] maintain dependency versions in root pom.xml --- .../pom.xml | 21 ++++--------------- cf-java-logging-support-servlet/pom.xml | 6 +++--- pom.xml | 3 +++ 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/cf-java-logging-support-servlet-jakarta/pom.xml b/cf-java-logging-support-servlet-jakarta/pom.xml index 31b96f1a..afc6ff5a 100644 --- a/cf-java-logging-support-servlet-jakarta/pom.xml +++ b/cf-java-logging-support-servlet-jakarta/pom.xml @@ -16,21 +16,8 @@ 5.0.0 - - - com.sap.hcp.cf.logging - cf-java-logging-support-servlet - ${project.version} - provided - - - com.sap.hcp.cf.logging - cf-java-logging-support-servlet - ${project.version} - tests - provided - + jakarta.servlet @@ -60,12 +47,12 @@ com.auth0 java-jwt - 3.18.2 + ${java-jwt.version} com.fasterxml.jackson.core jackson-databind - 2.13.4.1 + ${jackson-databind.version} @@ -84,7 +71,7 @@ org.apache.httpcomponents httpclient - 4.5.13 + ${httpclient.version} test diff --git a/cf-java-logging-support-servlet/pom.xml b/cf-java-logging-support-servlet/pom.xml index 22eb6d51..c222f38b 100644 --- a/cf-java-logging-support-servlet/pom.xml +++ b/cf-java-logging-support-servlet/pom.xml @@ -47,12 +47,12 @@ com.auth0 java-jwt - 3.18.2 + ${java-jwt.version} com.fasterxml.jackson.core jackson-databind - 2.13.4.1 + ${jackson-databind.version} @@ -71,7 +71,7 @@ org.apache.httpcomponents httpclient - 4.5.13 + ${httpclient.version} test diff --git a/pom.xml b/pom.xml index 3e9cc4c9..3ced9712 100644 --- a/pom.xml +++ b/pom.xml @@ -183,6 +183,9 @@ 3.1.1 1.6 8 + 3.18.2 + 2.13.4.1 + 4.5.13 From b0eba3caebc78f30e4e91155d92092de4ac5b74d Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Thu, 23 Feb 2023 15:52:09 +0100 Subject: [PATCH 04/17] fixed formatting --- cf-java-logging-support-servlet-jakarta/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cf-java-logging-support-servlet-jakarta/pom.xml b/cf-java-logging-support-servlet-jakarta/pom.xml index afc6ff5a..0fc0552a 100644 --- a/cf-java-logging-support-servlet-jakarta/pom.xml +++ b/cf-java-logging-support-servlet-jakarta/pom.xml @@ -174,7 +174,7 @@ true - + From 1f05634bab75cfdc01ad03db53d6c818c93eef6f Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Thu, 23 Feb 2023 17:14:48 +0100 Subject: [PATCH 05/17] Use target/generated-sources/java/ --- .../pom.xml | 139 ++++++++++++------ 1 file changed, 93 insertions(+), 46 deletions(-) diff --git a/cf-java-logging-support-servlet-jakarta/pom.xml b/cf-java-logging-support-servlet-jakarta/pom.xml index 0fc0552a..3db2bced 100644 --- a/cf-java-logging-support-servlet-jakarta/pom.xml +++ b/cf-java-logging-support-servlet-jakarta/pom.xml @@ -79,19 +79,6 @@ - - maven-clean-plugin - 3.2.0 - - - - ${basedir}/src - false - - - - - maven-dependency-plugin 3.5.0 @@ -111,7 +98,7 @@ jar sources false - ${basedir}/src/main/java + target/generated-sources/java **/*.java @@ -121,7 +108,7 @@ jar test-sources false - ${basedir}/src/test/java + target/generated-test-sources/java **/*.java @@ -130,41 +117,101 @@ + + org.codehaus.mojo + build-helper-maven-plugin + 3.3.0 + + + add-generated-sources + + add-source + + generate-sources + + + target/generated-sources/java + + + + + add-generated-resources + + add-resource + + generate-resources + + + + target/generated-sources/resources + + + + + + add-generated-test-sources + + add-test-source + + generate-test-sources + + + target/generated-test-sources/java + + + + + add-generated-test-resources + + add-test-resource + + generate-test-resources + + + + target/generated-test-sources/resources + + + + + + + io.github.floverfelt find-and-replace-maven-plugin 1.1.0 - - replace-in-xml - process-resources - - find-and-replace - - - file-contents - src/ - javax.servlet - jakarta.servlet - true - .xml - - - - replace-in-java - process-resources - - find-and-replace - - - file-contents - src/ - javax.servlet - jakarta.servlet - true - .java - - + + replace-in-sources + process-sources + + find-and-replace + + + file-contents + target/generated-sources/java/ + javax.servlet + jakarta.servlet + true + .java + + + + replace-in-test-sources + process-sources + + find-and-replace + + + file-contents + target/generated-test-sources/java/ + javax.servlet + jakarta.servlet + true + .java + + @@ -178,4 +225,4 @@ - + \ No newline at end of file From b9d6c69c8e57665c3bf933f68c9b960f6721757e Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Thu, 23 Feb 2023 17:17:29 +0100 Subject: [PATCH 06/17] revert gitignore changes --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index 99243815..57080521 100644 --- a/.gitignore +++ b/.gitignore @@ -32,5 +32,3 @@ gen # VSCode .vscode - -cf-java-logging-support-servlet-jakarta/src \ No newline at end of file From eada4a163c16d1df746335d25ef1b132fd38da34 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Thu, 23 Feb 2023 17:28:10 +0100 Subject: [PATCH 07/17] fixed tests --- cf-java-logging-support-servlet-jakarta/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cf-java-logging-support-servlet-jakarta/pom.xml b/cf-java-logging-support-servlet-jakarta/pom.xml index 3db2bced..b526d593 100644 --- a/cf-java-logging-support-servlet-jakarta/pom.xml +++ b/cf-java-logging-support-servlet-jakarta/pom.xml @@ -99,7 +99,7 @@ sources false target/generated-sources/java - **/*.java + **/*.* ${project.groupId} @@ -109,7 +109,7 @@ test-sources false target/generated-test-sources/java - **/*.java + **/*.* From 2a975b31aef075cf7cbb0a261d74685fc34bfa8e Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Thu, 23 Feb 2023 17:34:59 +0100 Subject: [PATCH 08/17] next try to fix tests --- cf-java-logging-support-servlet-jakarta/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cf-java-logging-support-servlet-jakarta/pom.xml b/cf-java-logging-support-servlet-jakarta/pom.xml index b526d593..08d1196e 100644 --- a/cf-java-logging-support-servlet-jakarta/pom.xml +++ b/cf-java-logging-support-servlet-jakarta/pom.xml @@ -99,7 +99,7 @@ sources false target/generated-sources/java - **/*.* + **/*.java ${project.groupId} @@ -109,7 +109,7 @@ test-sources false target/generated-test-sources/java - **/*.* + **/*.java,**/*.xml From 8cd000e51bcf2e6146892b5dc5ad735ccc84e79d Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Thu, 23 Feb 2023 17:54:23 +0100 Subject: [PATCH 09/17] don't extract pom.xml --- cf-java-logging-support-servlet-jakarta/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cf-java-logging-support-servlet-jakarta/pom.xml b/cf-java-logging-support-servlet-jakarta/pom.xml index 08d1196e..783ba0f3 100644 --- a/cf-java-logging-support-servlet-jakarta/pom.xml +++ b/cf-java-logging-support-servlet-jakarta/pom.xml @@ -109,7 +109,7 @@ test-sources false target/generated-test-sources/java - **/*.java,**/*.xml + **/*.java,**/logback-test.xml From f2191cab9f4a1f91b17f7918d4109d470fdaa9e8 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Thu, 23 Feb 2023 20:04:36 +0100 Subject: [PATCH 10/17] reworked config of build-helper-maven-plugin --- .../pom.xml | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/cf-java-logging-support-servlet-jakarta/pom.xml b/cf-java-logging-support-servlet-jakarta/pom.xml index 783ba0f3..bfa96f88 100644 --- a/cf-java-logging-support-servlet-jakarta/pom.xml +++ b/cf-java-logging-support-servlet-jakarta/pom.xml @@ -127,53 +127,23 @@ add-source - generate-sources target/generated-sources/java - - add-generated-resources - - add-resource - - generate-resources - - - - target/generated-sources/resources - - - - add-generated-test-sources add-test-source - generate-test-sources target/generated-test-sources/java - - add-generated-test-resources - - add-test-resource - - generate-test-resources - - - - target/generated-test-sources/resources - - - - From d0c379e8381172b8565167086b1898448e678e46 Mon Sep 17 00:00:00 2001 From: Harald Aamot Date: Fri, 24 Feb 2023 10:44:25 +0100 Subject: [PATCH 11/17] Update pom.xml --- cf-java-logging-support-servlet-jakarta/pom.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cf-java-logging-support-servlet-jakarta/pom.xml b/cf-java-logging-support-servlet-jakarta/pom.xml index bfa96f88..b2b940e9 100644 --- a/cf-java-logging-support-servlet-jakarta/pom.xml +++ b/cf-java-logging-support-servlet-jakarta/pom.xml @@ -15,6 +15,9 @@ 5.0.0 + 3.5.0 + 3.3.0 + 11.0.13 @@ -195,4 +198,4 @@ - \ No newline at end of file + From cc97c18ee7946f873c52e1bd30e5ef160683d1c7 Mon Sep 17 00:00:00 2001 From: Harald Aamot Date: Fri, 24 Feb 2023 10:59:04 +0100 Subject: [PATCH 12/17] other plugin for replacement --- .../pom.xml | 78 +++++++++++-------- cf-java-logging-support-servlet/pom.xml | 7 +- 2 files changed, 51 insertions(+), 34 deletions(-) diff --git a/cf-java-logging-support-servlet-jakarta/pom.xml b/cf-java-logging-support-servlet-jakarta/pom.xml index b2b940e9..c09d2c14 100644 --- a/cf-java-logging-support-servlet-jakarta/pom.xml +++ b/cf-java-logging-support-servlet-jakarta/pom.xml @@ -62,13 +62,13 @@ org.eclipse.jetty jetty-server - 11.0.13 + ${jetty.version} test org.eclipse.jetty jetty-servlet - 11.0.13 + ${jetty.version} test @@ -84,7 +84,7 @@ maven-dependency-plugin - 3.5.0 + ${maven-dependency-plugin.version} unpack @@ -114,6 +114,16 @@ target/generated-test-sources/java **/*.java,**/logback-test.xml + + ${project.groupId} + cf-java-logging-support-servlet + ${project.version} + jar + test-sources + false + target/generated-test-sources/resources + **/logback-test.xml + @@ -123,13 +133,14 @@ org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + ${build-helper-maven-plugin.version} add-generated-sources add-source + generate-sources target/generated-sources/java @@ -141,49 +152,54 @@ add-test-source + generate-test-sources target/generated-test-sources/java + + add-generated-test-resources + + add-test-resource + + generate-test-resources + + + + target/generated-test-sources/resources + + + + - io.github.floverfelt - find-and-replace-maven-plugin - 1.1.0 + maven-antrun-plugin - replace-in-sources process-sources - - find-and-replace - - file-contents - target/generated-sources/java/ - javax.servlet - jakarta.servlet - true - .java + + + + + + + + + + - - - replace-in-test-sources - process-sources - find-and-replace + run - - file-contents - target/generated-test-sources/java/ - javax.servlet - jakarta.servlet - true - .java - @@ -198,4 +214,4 @@ - + \ No newline at end of file diff --git a/cf-java-logging-support-servlet/pom.xml b/cf-java-logging-support-servlet/pom.xml index c222f38b..a1bf415a 100644 --- a/cf-java-logging-support-servlet/pom.xml +++ b/cf-java-logging-support-servlet/pom.xml @@ -15,6 +15,7 @@ 3.1.0 + 9.4.49.v20220914 @@ -59,13 +60,13 @@ org.eclipse.jetty jetty-server - 9.4.49.v20220914 + ${jetty.version} test org.eclipse.jetty jetty-servlet - 9.4.49.v20220914 + ${jetty.version} test @@ -92,4 +93,4 @@ - + \ No newline at end of file From 4d679cc43ad47c5168495568f3f3c8e1f9326986 Mon Sep 17 00:00:00 2001 From: Harald Aamot Date: Fri, 24 Feb 2023 11:04:12 +0100 Subject: [PATCH 13/17] formatting --- .../pom.xml | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/cf-java-logging-support-servlet-jakarta/pom.xml b/cf-java-logging-support-servlet-jakarta/pom.xml index c09d2c14..d35153d7 100644 --- a/cf-java-logging-support-servlet-jakarta/pom.xml +++ b/cf-java-logging-support-servlet-jakarta/pom.xml @@ -1,4 +1,5 @@ - 4.0.0 @@ -123,7 +124,7 @@ false target/generated-test-sources/resources **/logback-test.xml - + @@ -159,20 +160,20 @@ - - add-generated-test-resources - - add-test-resource - - generate-test-resources - - - - target/generated-test-sources/resources - - - - + + add-generated-test-resources + + add-test-resource + + generate-test-resources + + + + target/generated-test-sources/resources + + + + @@ -183,14 +184,12 @@ process-sources - + - + From 530d3e7c477bfa82f0df69fca717ea3b7f9a31fa Mon Sep 17 00:00:00 2001 From: Harald Aamot Date: Sat, 25 Feb 2023 08:44:28 +0100 Subject: [PATCH 14/17] correct build lifecycle phases --- .../pom.xml | 51 +++++++++++++++---- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/cf-java-logging-support-servlet-jakarta/pom.xml b/cf-java-logging-support-servlet-jakarta/pom.xml index d35153d7..85ccb589 100644 --- a/cf-java-logging-support-servlet-jakarta/pom.xml +++ b/cf-java-logging-support-servlet-jakarta/pom.xml @@ -88,7 +88,7 @@ ${maven-dependency-plugin.version} - unpack + unpack-sources generate-sources unpack @@ -105,6 +105,17 @@ target/generated-sources/java **/*.java + + + + + unpack-test-sources + generate-test-sources + + unpack + + + ${project.groupId} cf-java-logging-support-servlet @@ -113,8 +124,19 @@ test-sources false target/generated-test-sources/java - **/*.java,**/logback-test.xml + **/*.java + + + + + unpack-test-rersources + generate-test-resources + + unpack + + + ${project.groupId} cf-java-logging-support-servlet @@ -127,7 +149,7 @@ - + @@ -141,7 +163,6 @@ add-source - generate-sources target/generated-sources/java @@ -153,7 +174,6 @@ add-test-source - generate-test-sources target/generated-test-sources/java @@ -165,7 +185,6 @@ add-test-resource - generate-test-resources @@ -181,6 +200,10 @@ maven-antrun-plugin + package-replace-sources + + run + process-sources @@ -189,6 +212,17 @@ token="javax.servlet" value="jakarta.servlet"> + + + + + package-replace-test-sources + + run + + process-test-sources + + @@ -196,10 +230,7 @@ - - run - - + From 4eae1ed9d4bc8169ea8e4e0876e1c4dcb543b4d9 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Sat, 25 Feb 2023 09:37:43 +0100 Subject: [PATCH 15/17] use default phases of build-helper-maven-plugin --- cf-java-logging-support-servlet-jakarta/pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/cf-java-logging-support-servlet-jakarta/pom.xml b/cf-java-logging-support-servlet-jakarta/pom.xml index d35153d7..c5fc0a37 100644 --- a/cf-java-logging-support-servlet-jakarta/pom.xml +++ b/cf-java-logging-support-servlet-jakarta/pom.xml @@ -141,7 +141,6 @@ add-source - generate-sources target/generated-sources/java @@ -153,7 +152,6 @@ add-test-source - generate-test-sources target/generated-test-sources/java @@ -165,7 +163,6 @@ add-test-resource - generate-test-resources From c663739a544d7259def01c54bb9561ec6413e34c Mon Sep 17 00:00:00 2001 From: Harald Aamot Date: Mon, 27 Feb 2023 08:11:01 +0100 Subject: [PATCH 16/17] Revert "correct build lifecycle phases" This reverts commit 530d3e7c477bfa82f0df69fca717ea3b7f9a31fa. --- .../pom.xml | 51 ++++--------------- 1 file changed, 10 insertions(+), 41 deletions(-) diff --git a/cf-java-logging-support-servlet-jakarta/pom.xml b/cf-java-logging-support-servlet-jakarta/pom.xml index 85ccb589..d35153d7 100644 --- a/cf-java-logging-support-servlet-jakarta/pom.xml +++ b/cf-java-logging-support-servlet-jakarta/pom.xml @@ -88,7 +88,7 @@ ${maven-dependency-plugin.version} - unpack-sources + unpack generate-sources unpack @@ -105,17 +105,6 @@ target/generated-sources/java **/*.java - - - - - unpack-test-sources - generate-test-sources - - unpack - - - ${project.groupId} cf-java-logging-support-servlet @@ -124,19 +113,8 @@ test-sources false target/generated-test-sources/java - **/*.java + **/*.java,**/logback-test.xml - - - - - unpack-test-rersources - generate-test-resources - - unpack - - - ${project.groupId} cf-java-logging-support-servlet @@ -149,7 +127,7 @@ - + @@ -163,6 +141,7 @@ add-source + generate-sources target/generated-sources/java @@ -174,6 +153,7 @@ add-test-source + generate-test-sources target/generated-test-sources/java @@ -185,6 +165,7 @@ add-test-resource + generate-test-resources @@ -200,10 +181,6 @@ maven-antrun-plugin - package-replace-sources - - run - process-sources @@ -212,17 +189,6 @@ token="javax.servlet" value="jakarta.servlet"> - - - - - package-replace-test-sources - - run - - process-test-sources - - @@ -230,7 +196,10 @@ - + + run + + From e464de9a05c20684b9bc4401ead67d2dcc6ac915 Mon Sep 17 00:00:00 2001 From: Harald Aamot Date: Mon, 27 Feb 2023 08:13:28 +0100 Subject: [PATCH 17/17] remove wrongly placed logback-test.xml --- cf-java-logging-support-servlet-jakarta/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cf-java-logging-support-servlet-jakarta/pom.xml b/cf-java-logging-support-servlet-jakarta/pom.xml index d35153d7..5aeee589 100644 --- a/cf-java-logging-support-servlet-jakarta/pom.xml +++ b/cf-java-logging-support-servlet-jakarta/pom.xml @@ -113,7 +113,7 @@ test-sources false target/generated-test-sources/java - **/*.java,**/logback-test.xml + **/*.java ${project.groupId}