From 070c09cd0704551e059ebdb69ed88594bafb707b Mon Sep 17 00:00:00 2001 From: Ben Hale Date: Mon, 13 Nov 2023 14:33:50 -0800 Subject: [PATCH 1/3] Jakarta Support This change updates the project to support both the javax and jakarta namespaces for JEE projects. It does this by creating two separate Maven projects, one for each, which are then shaded into a single JAR used by everyone. The contents of META-INF/services and META-INF/spring.factories route to the correct implementation preventing class loading problems. Signed-off-by: Ben Hale --- .gitignore | 1 + .idea/codeStyles/Project.xml | 3 - .idea/compiler.xml | 7 +- .idea/encodings.xml | 8 + .idea/jarRepositories.xml | 20 + .idea/misc.xml | 3 +- .idea/modules.xml | 8 - .idea/runConfigurations/All_Tests.xml | 28 -- .java-version | 1 + .mvn/wrapper/MavenWrapperDownloader.java | 110 ------ .mvn/wrapper/maven-wrapper.jar | Bin 48337 -> 62547 bytes .mvn/wrapper/maven-wrapper.properties | 19 +- .../pom.xml | 100 +++++ .../jakarta/ClientCertificateMapper.java | 136 +++++++ ...entCertificateMapperAutoConfiguration.java | 47 +++ ...cateMapperServletContainerInitializer.java | 53 +++ ...MapperServletContainerInitializerTest.java | 76 ++++ .../jakarta/ClientCertificateMapperTest.java | 189 +++++++++ .../pom.xml | 100 +++++ .../javax}/ClientCertificateMapper.java | 4 +- ...entCertificateMapperAutoConfiguration.java | 8 +- ...cateMapperServletContainerInitializer.java | 4 +- ...MapperServletContainerInitializerTest.java | 6 +- .../javax}/ClientCertificateMapperTest.java | 6 +- java-buildpack-client-certificate-mapper.iml | 81 +--- .../pom.xml | 91 +++++ ...akarta.servlet.ServletContainerInitializer | 17 + .../javax.servlet.ServletContainerInitializer | 4 +- .../main/resources/META-INF/spring.factories | 3 + mvnw | 226 ++++++----- mvnw.cmd | 366 ++++++++++-------- pom.xml | 187 ++++----- src/main/resources/META-INF/spring.factories | 1 - 33 files changed, 1294 insertions(+), 619 deletions(-) create mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/runConfigurations/All_Tests.xml create mode 100644 .java-version delete mode 100755 .mvn/wrapper/MavenWrapperDownloader.java mode change 100755 => 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 java-buildpack-client-certificate-mapper-jakarta/pom.xml create mode 100644 java-buildpack-client-certificate-mapper-jakarta/src/main/java/org/cloudfoundry/router/jakarta/ClientCertificateMapper.java create mode 100644 java-buildpack-client-certificate-mapper-jakarta/src/main/java/org/cloudfoundry/router/jakarta/ClientCertificateMapperAutoConfiguration.java create mode 100644 java-buildpack-client-certificate-mapper-jakarta/src/main/java/org/cloudfoundry/router/jakarta/ClientCertificateMapperServletContainerInitializer.java create mode 100644 java-buildpack-client-certificate-mapper-jakarta/src/test/java/org/cloudfoundry/router/jakarta/ClientCertificateMapperServletContainerInitializerTest.java create mode 100644 java-buildpack-client-certificate-mapper-jakarta/src/test/java/org/cloudfoundry/router/jakarta/ClientCertificateMapperTest.java create mode 100644 java-buildpack-client-certificate-mapper-javax/pom.xml rename {src/main/java/org/cloudfoundry/router => java-buildpack-client-certificate-mapper-javax/src/main/java/org/cloudfoundry/router/javax}/ClientCertificateMapper.java (98%) rename {src/main/java/org/cloudfoundry/router => java-buildpack-client-certificate-mapper-javax/src/main/java/org/cloudfoundry/router/javax}/ClientCertificateMapperAutoConfiguration.java (82%) rename {src/main/java/org/cloudfoundry/router => java-buildpack-client-certificate-mapper-javax/src/main/java/org/cloudfoundry/router/javax}/ClientCertificateMapperServletContainerInitializer.java (94%) rename {src/test/java/org/cloudfoundry/router => java-buildpack-client-certificate-mapper-javax/src/test/java/org/cloudfoundry/router/javax}/ClientCertificateMapperServletContainerInitializerTest.java (95%) rename {src/test/java/org/cloudfoundry/router => java-buildpack-client-certificate-mapper-javax/src/test/java/org/cloudfoundry/router/javax}/ClientCertificateMapperTest.java (98%) create mode 100644 java-buildpack-client-certificate-mapper/pom.xml create mode 100644 java-buildpack-client-certificate-mapper/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer rename {src => java-buildpack-client-certificate-mapper/src}/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer (80%) create mode 100644 java-buildpack-client-certificate-mapper/src/main/resources/META-INF/spring.factories mode change 100755 => 100644 mvnw.cmd delete mode 100644 src/main/resources/META-INF/spring.factories diff --git a/.gitignore b/.gitignore index b6f7c00..9f3c533 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea/libraries .idea/tasks.xml .idea/workspace.xml +dependency-reduced-pom.xml target diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 2cd4bcc..de3c469 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -7,9 +7,6 @@