From e3b987673c0441f33f00a6153f596d21f1a5faba Mon Sep 17 00:00:00 2001
From: Anthony Dahanne <anthony.dahanne@gmail.com>
Date: Tue, 12 Dec 2023 20:08:12 -0500
Subject: [PATCH 1/5] Add pom metadata and script for central * since
 repo.spring.io is no longer an option

---
 ci/create-release.sh                          |  2 +-
 ci/deploy.sh                                  |  9 ++-
 ci/deploy.yml                                 | 21 -------
 ci/promote-to-maven-central.sh                |  9 +++
 ci/unit-test.yml                              | 17 -----
 .../pom.xml                                   |  4 ++
 .../pom.xml                                   |  4 ++
 .../pom.xml                                   | 61 ++++++++++++++++++
 pom.xml                                       | 62 +++++++++++--------
 9 files changed, 123 insertions(+), 66 deletions(-)
 delete mode 100644 ci/deploy.yml
 create mode 100755 ci/promote-to-maven-central.sh
 delete mode 100644 ci/unit-test.yml

diff --git a/ci/create-release.sh b/ci/create-release.sh
index 3597667..159834b 100755
--- a/ci/create-release.sh
+++ b/ci/create-release.sh
@@ -8,7 +8,7 @@ SNAPSHOT=$2
 ./mvnw versions:set -DnewVersion=$RELEASE -DgenerateBackupPoms=false
 git add .
 git commit --message "v$RELEASE Release"
-git tag -s v$RELEASE -m "v$RELEASE"
+git tag v$RELEASE
 
 git reset --hard HEAD^1
 ./mvnw versions:set -DnewVersion=$SNAPSHOT -DgenerateBackupPoms=false
diff --git a/ci/deploy.sh b/ci/deploy.sh
index ec81cec..1c364a9 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -4,5 +4,12 @@ set -euo pipefail
 
 [[ -d $PWD/maven && ! -d $HOME/.m2 ]] && ln -s $PWD/maven $HOME/.m2
 
+export REPOSITORY="${PWD}"/repository
+
 cd java-buildpack-client-certificate-mapper
-./mvnw -q -Dmaven.test.skip=true deploy
+./mvnw -Dmaven.test.skip=true deploy -DcreateChecksum=true -DaltDeploymentRepository="local::default::file://${REPOSITORY}"
+
+echo "here are the published jars in ${REPOSITORY}"
+ls -al ${REPOSITORY}/org/cloudfoundry/
+ls -al ${REPOSITORY}/org/cloudfoundry/java-buildpack-client-certificate-mapper/
+ls -al ${REPOSITORY}/org/cloudfoundry/java-buildpack-client-certificate-mapper/2.0.0
diff --git a/ci/deploy.yml b/ci/deploy.yml
deleted file mode 100644
index 0c13e5b..0000000
--- a/ci/deploy.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-platform: linux
-
-image_resource:
-  type: registry-image
-  source:
-    repository: openjdk
-    tag: 8-jdk
-
-inputs:
-- name: java-buildpack-client-certificate-mapper
-
-caches:
-- path: maven
-
-run:
-  path: java-buildpack-client-certificate-mapper/ci/deploy.sh
-
-params:
-  ARTIFACTORY_USERNAME:
-  ARTIFACTORY_PASSWORD:
diff --git a/ci/promote-to-maven-central.sh b/ci/promote-to-maven-central.sh
new file mode 100755
index 0000000..639f0ad
--- /dev/null
+++ b/ci/promote-to-maven-central.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+export BUILD_INFO_LOCATION=$(pwd)/repository/build-info.json
+
+java -jar /concourse-release-scripts.jar publishToCentral 'RELEASE' "$BUILD_INFO_LOCATION" repository
+
+echo "Sync complete"
\ No newline at end of file
diff --git a/ci/unit-test.yml b/ci/unit-test.yml
deleted file mode 100644
index 6ada048..0000000
--- a/ci/unit-test.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-platform: linux
-
-image_resource:
-  type: registry-image
-  source:
-    repository: openjdk
-    tag: 8-jdk
-
-inputs:
-- name: java-buildpack-client-certificate-mapper
-
-caches:
-- path: maven
-
-run:
-  path: java-buildpack-client-certificate-mapper/ci/unit-test.sh
diff --git a/java-buildpack-client-certificate-mapper-jakarta/pom.xml b/java-buildpack-client-certificate-mapper-jakarta/pom.xml
index a25289c..aab3683 100644
--- a/java-buildpack-client-certificate-mapper-jakarta/pom.xml
+++ b/java-buildpack-client-certificate-mapper-jakarta/pom.xml
@@ -94,6 +94,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/java-buildpack-client-certificate-mapper-javax/pom.xml b/java-buildpack-client-certificate-mapper-javax/pom.xml
index c26e7f8..8768397 100644
--- a/java-buildpack-client-certificate-mapper-javax/pom.xml
+++ b/java-buildpack-client-certificate-mapper-javax/pom.xml
@@ -94,6 +94,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/java-buildpack-client-certificate-mapper/pom.xml b/java-buildpack-client-certificate-mapper/pom.xml
index 4334629..2e8b608 100644
--- a/java-buildpack-client-certificate-mapper/pom.xml
+++ b/java-buildpack-client-certificate-mapper/pom.xml
@@ -61,6 +61,67 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <!--
+                Not ideal to merge 2 jars blindly with this plugin, but... after dropping all transitive dependencies from the 2 jars, we found ourselves in a situation where javadoc could not
+                   resolve spring and other libraries and hence failed running. Adding manually additional libraries to the Javadoc plugin could work but is not maintainable.
+                   -->
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <configuration>
+                            <target>
+                                <zip destfile="target/${project.artifactId}-${version}-javadoc.jar">
+                                    <zipgroupfileset dir="../${project.artifactId}-jakarta/target/" includes="*javadoc.jar"/>
+                                    <zipgroupfileset dir="../${project.artifactId}-javax/target/" includes="*javadoc.jar"/>
+                                </zip>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>3.1.1</version>
+                <executions>
+                    <!--  the default execution is normally first; but I want to force javadoc first, since it will publish an invalid pom, that will be overwritten  -->
+                    <execution>
+                        <id>default-deploy</id>
+                        <phase>none</phase>
+                        <goals>
+                            <goal>deploy</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>deploy-javadoc</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>deploy-file</goal>
+                        </goals>
+                        <configuration>
+                            <file>target/${project.artifactId}-${version}-javadoc.jar</file>
+                            <url>file://${env.REPOSITORY}</url>
+                            <groupId>${groupId}</groupId>
+                            <artifactId>${artifactId}</artifactId>
+                            <version>${version}</version>
+                            <packaging>javadoc</packaging>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>other-default-deploy</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>deploy</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 29e9e02..4ccaf02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,11 +27,32 @@
     <artifactId>java-buildpack-client-certificate-mapper-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
+    <name>Cloud Foundry Client Certificate Mapper</name>
+    <description>Cloud Foundry Client Certificate Mapper</description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <developers>
+        <developer>
+            <name>VMware</name>
+            <email>info@vmware.com</email>
+            <organization>VMware, Inc.</organization>
+            <organizationUrl>https://www.cloudfoundry.org</organizationUrl>
+        </developer>
+    </developers>
+    <licenses>
+        <license>
+            <name>The Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+    <url>https://github.com/cloudfoundry/java-buildpack-client-certificate-mapper</url>
+    <scm>
+        <url>https://github.com/cloudfoundry/java-buildpack-client-certificate-mapper</url>
+    </scm>
+
     <modules>
         <module>java-buildpack-client-certificate-mapper</module>
         <module>java-buildpack-client-certificate-mapper-jakarta</module>
@@ -87,25 +108,25 @@
                     </configuration>
                 </plugin>
                 <plugin>
-                    <groupId>org.jfrog.buildinfo</groupId>
-                    <artifactId>artifactory-maven-plugin</artifactId>
-                    <version>3.6.2</version>
-                    <inherited>false</inherited>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.6.3</version>
+                    <configuration>
+                        <links>
+                            <link>https://projectreactor.io/docs/core/release/api/</link>
+                        </links>
+<!--                        <quiet>true</quiet>-->
+                        <source>8</source>
+                        <additionalOptions>
+                            <additionalOption>-Xdoclint:none</additionalOption>
+                        </additionalOptions>
+                    </configuration>
                     <executions>
                         <execution>
-                            <id>build-info</id>
+                            <id>attach-javadocs</id>
                             <goals>
-                                <goal>publish</goal>
+                                <goal>jar</goal>
                             </goals>
-                            <configuration>
-                                <publisher>
-                                    <contextUrl>https://repo.spring.io</contextUrl>
-                                    <username>{{ARTIFACTORY_USERNAME}}</username>
-                                    <password>{{ARTIFACTORY_PASSWORD}}</password>
-                                    <repoKey>{{ARTIFACTORY_REPO_KEY|"libs-release-local"}}</repoKey>
-                                    <snapshotRepoKey>{{ARTIFACTORY_SNAPSHOT_REPO_KEY|"libs-snapshot-local"}}</snapshotRepoKey>
-                                </publisher>
-                            </configuration>
                         </execution>
                     </executions>
                 </plugin>
@@ -113,15 +134,4 @@
         </pluginManagement>
     </build>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <id>central</id>
-            <name>bintray-plugins</name>
-            <url>https://jcenter.bintray.com</url>
-        </pluginRepository>
-    </pluginRepositories>
-
 </project>

From 2ab9ae89b4141ef2ab4a88a604e1e4f6faf86d93 Mon Sep 17 00:00:00 2001
From: Anthony Dahanne <anthony.dahanne@gmail.com>
Date: Wed, 13 Dec 2023 21:42:02 -0500
Subject: [PATCH 2/5] v2.0.1-SNAPSHOT Development

---
 ci/deploy.sh                                             | 4 ----
 java-buildpack-client-certificate-mapper-jakarta/pom.xml | 2 +-
 java-buildpack-client-certificate-mapper-javax/pom.xml   | 2 +-
 java-buildpack-client-certificate-mapper/pom.xml         | 2 +-
 pom.xml                                                  | 2 +-
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 1c364a9..602990c 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -9,7 +9,3 @@ export REPOSITORY="${PWD}"/repository
 cd java-buildpack-client-certificate-mapper
 ./mvnw -Dmaven.test.skip=true deploy -DcreateChecksum=true -DaltDeploymentRepository="local::default::file://${REPOSITORY}"
 
-echo "here are the published jars in ${REPOSITORY}"
-ls -al ${REPOSITORY}/org/cloudfoundry/
-ls -al ${REPOSITORY}/org/cloudfoundry/java-buildpack-client-certificate-mapper/
-ls -al ${REPOSITORY}/org/cloudfoundry/java-buildpack-client-certificate-mapper/2.0.0
diff --git a/java-buildpack-client-certificate-mapper-jakarta/pom.xml b/java-buildpack-client-certificate-mapper-jakarta/pom.xml
index aab3683..726b796 100644
--- a/java-buildpack-client-certificate-mapper-jakarta/pom.xml
+++ b/java-buildpack-client-certificate-mapper-jakarta/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>java-buildpack-client-certificate-mapper-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>java-buildpack-client-certificate-mapper-jakarta</artifactId>
diff --git a/java-buildpack-client-certificate-mapper-javax/pom.xml b/java-buildpack-client-certificate-mapper-javax/pom.xml
index 8768397..cc00974 100644
--- a/java-buildpack-client-certificate-mapper-javax/pom.xml
+++ b/java-buildpack-client-certificate-mapper-javax/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>java-buildpack-client-certificate-mapper-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>java-buildpack-client-certificate-mapper-javax</artifactId>
diff --git a/java-buildpack-client-certificate-mapper/pom.xml b/java-buildpack-client-certificate-mapper/pom.xml
index 2e8b608..311b29d 100644
--- a/java-buildpack-client-certificate-mapper/pom.xml
+++ b/java-buildpack-client-certificate-mapper/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>java-buildpack-client-certificate-mapper-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>java-buildpack-client-certificate-mapper</artifactId>
diff --git a/pom.xml b/pom.xml
index 4ccaf02..8af1169 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 
     <groupId>org.cloudfoundry</groupId>
     <artifactId>java-buildpack-client-certificate-mapper-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Cloud Foundry Client Certificate Mapper</name>
     <description>Cloud Foundry Client Certificate Mapper</description>

From 07678cefe9e4c012b0941c3df864f158423533ff Mon Sep 17 00:00:00 2001
From: Ben Hale <bhale@pivotal.io>
Date: Tue, 20 Aug 2019 13:30:33 -0700
Subject: [PATCH 3/5] Revert Generics Addition to support Spring Boot 1.5 a
 little longer.

Signed-off-by: Ben Hale <bhale@pivotal.io>
---
 .../javax/ClientCertificateMapperAutoConfiguration.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java-buildpack-client-certificate-mapper-javax/src/main/java/org/cloudfoundry/router/javax/ClientCertificateMapperAutoConfiguration.java b/java-buildpack-client-certificate-mapper-javax/src/main/java/org/cloudfoundry/router/javax/ClientCertificateMapperAutoConfiguration.java
index b2adfb3..b378944 100644
--- a/java-buildpack-client-certificate-mapper-javax/src/main/java/org/cloudfoundry/router/javax/ClientCertificateMapperAutoConfiguration.java
+++ b/java-buildpack-client-certificate-mapper-javax/src/main/java/org/cloudfoundry/router/javax/ClientCertificateMapperAutoConfiguration.java
@@ -38,8 +38,8 @@ ClientCertificateMapper clientCertificateMapper() throws CertificateException {
     }
 
     @Bean
-    FilterRegistrationBean<ClientCertificateMapper> clientCertificateMapperFilterRegistrationBean(ClientCertificateMapper mapper) {
-        FilterRegistrationBean<ClientCertificateMapper> result = new FilterRegistrationBean<>(mapper);
+    FilterRegistrationBean clientCertificateMapperFilterRegistrationBean(ClientCertificateMapper mapper) {
+        FilterRegistrationBean result = new FilterRegistrationBean(mapper);
         result.setOrder(Ordered.HIGHEST_PRECEDENCE);
         return result;
     }

From ab7a3c17eabcc919d64030c0afafa093d81c58d2 Mon Sep 17 00:00:00 2001
From: Anthony Dahanne <anthony.dahanne@gmail.com>
Date: Mon, 18 Dec 2023 16:09:05 -0500
Subject: [PATCH 4/5] Disable Java compiler warning for javax module * because
 of the previous commit that introduces a warning about rawtype (but that is
 still necessary for Spring Boot 1.5 users)

---
 java-buildpack-client-certificate-mapper-jakarta/pom.xml | 8 ++++++--
 java-buildpack-client-certificate-mapper-javax/pom.xml   | 4 ----
 pom.xml                                                  | 8 ++------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/java-buildpack-client-certificate-mapper-jakarta/pom.xml b/java-buildpack-client-certificate-mapper-jakarta/pom.xml
index 726b796..900c120 100644
--- a/java-buildpack-client-certificate-mapper-jakarta/pom.xml
+++ b/java-buildpack-client-certificate-mapper-jakarta/pom.xml
@@ -82,8 +82,12 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <compilerArgs>
+                        <arg>-Werror</arg>
+                        <arg>-Xlint:all</arg>
+                        <arg>-Xlint:-options</arg>
+                        <arg>-Xlint:-processing</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/java-buildpack-client-certificate-mapper-javax/pom.xml b/java-buildpack-client-certificate-mapper-javax/pom.xml
index cc00974..59a4696 100644
--- a/java-buildpack-client-certificate-mapper-javax/pom.xml
+++ b/java-buildpack-client-certificate-mapper-javax/pom.xml
@@ -81,10 +81,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index 8af1169..c6e0b31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,12 +67,8 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.11.0</version>
                     <configuration>
-                        <compilerArgs>
-                            <arg>-Werror</arg>
-                            <arg>-Xlint:all</arg>
-                            <arg>-Xlint:-options</arg>
-                            <arg>-Xlint:-processing</arg>
-                        </compilerArgs>
+                        <source>8</source>
+                        <target>8</target>
                         <showWarnings>true</showWarnings>
                     </configuration>
                 </plugin>

From dc1ed6ccd73aae852d3e58c31637fd1bc5c472f0 Mon Sep 17 00:00:00 2001
From: Anthony Dahanne <anthony.dahanne@gmail.com>
Date: Mon, 18 Dec 2023 20:20:01 -0500
Subject: [PATCH 5/5] v2.0.2-SNAPSHOT Development

---
 java-buildpack-client-certificate-mapper-jakarta/pom.xml | 2 +-
 java-buildpack-client-certificate-mapper-javax/pom.xml   | 2 +-
 java-buildpack-client-certificate-mapper/pom.xml         | 2 +-
 pom.xml                                                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java-buildpack-client-certificate-mapper-jakarta/pom.xml b/java-buildpack-client-certificate-mapper-jakarta/pom.xml
index 900c120..11f485b 100644
--- a/java-buildpack-client-certificate-mapper-jakarta/pom.xml
+++ b/java-buildpack-client-certificate-mapper-jakarta/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>java-buildpack-client-certificate-mapper-parent</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>java-buildpack-client-certificate-mapper-jakarta</artifactId>
diff --git a/java-buildpack-client-certificate-mapper-javax/pom.xml b/java-buildpack-client-certificate-mapper-javax/pom.xml
index 59a4696..cda3535 100644
--- a/java-buildpack-client-certificate-mapper-javax/pom.xml
+++ b/java-buildpack-client-certificate-mapper-javax/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>java-buildpack-client-certificate-mapper-parent</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>java-buildpack-client-certificate-mapper-javax</artifactId>
diff --git a/java-buildpack-client-certificate-mapper/pom.xml b/java-buildpack-client-certificate-mapper/pom.xml
index 311b29d..5dc032a 100644
--- a/java-buildpack-client-certificate-mapper/pom.xml
+++ b/java-buildpack-client-certificate-mapper/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>java-buildpack-client-certificate-mapper-parent</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>java-buildpack-client-certificate-mapper</artifactId>
diff --git a/pom.xml b/pom.xml
index c6e0b31..2d40640 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 
     <groupId>org.cloudfoundry</groupId>
     <artifactId>java-buildpack-client-certificate-mapper-parent</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.0.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Cloud Foundry Client Certificate Mapper</name>
     <description>Cloud Foundry Client Certificate Mapper</description>