From 5267e877376e519b3acd7af38dd636c541a05aea Mon Sep 17 00:00:00 2001
From: Gary Gregory <garydgregory@gmail.com>
Date: Tue, 21 Jan 2025 13:50:14 -0500
Subject: [PATCH 1/4] Add Checkstyle TypecastParenPad

---
 src/conf/checkstyle.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml
index 207a32fca3..690e1d8a4b 100644
--- a/src/conf/checkstyle.xml
+++ b/src/conf/checkstyle.xml
@@ -71,7 +71,7 @@
       <property name="ordered" value="true"/>
       <property name="separated" value="true"/>
     </module>
-
+    <module name="TypecastParenPad" />
   </module>
   
   <!-- Require package Javadoc -->

From e44cdd19d5f9b1122760472b4623adc083fc08a9 Mon Sep 17 00:00:00 2001
From: Gary Gregory <garydgregory@gmail.com>
Date: Tue, 21 Jan 2025 14:44:28 -0500
Subject: [PATCH 2/4] Fix ParenPad

---
 src/conf/checkstyle.xml                                  | 1 +
 .../apache/commons/pool3/impl/LinkedBlockingDeque.java   | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml
index 690e1d8a4b..2b959d03d3 100644
--- a/src/conf/checkstyle.xml
+++ b/src/conf/checkstyle.xml
@@ -71,6 +71,7 @@
       <property name="ordered" value="true"/>
       <property name="separated" value="true"/>
     </module>
+    <module name="ParenPad" />
     <module name="TypecastParenPad" />
   </module>
   
diff --git a/src/main/java/org/apache/commons/pool3/impl/LinkedBlockingDeque.java b/src/main/java/org/apache/commons/pool3/impl/LinkedBlockingDeque.java
index b4232df5c7..3c5c3a3b5c 100644
--- a/src/main/java/org/apache/commons/pool3/impl/LinkedBlockingDeque.java
+++ b/src/main/java/org/apache/commons/pool3/impl/LinkedBlockingDeque.java
@@ -953,13 +953,12 @@ public E pollLast() {
      * @return the unlinked element
      * @throws InterruptedException if the current thread is interrupted
      */
-    public E pollLast(final Duration timeout)
-        throws InterruptedException {
+    public E pollLast(final Duration timeout) throws InterruptedException {
         long nanos = timeout.toNanos();
         lock.lockInterruptibly();
         try {
             E x;
-            while ( (x = unlinkLast()) == null) {
+            while ((x = unlinkLast()) == null) {
                 if (nanos <= 0) {
                     return null;
                 }
@@ -1292,7 +1291,7 @@ public E takeFirst() throws InterruptedException {
         lock.lock();
         try {
             E x;
-            while ( (x = unlinkFirst()) == null) {
+            while ((x = unlinkFirst()) == null) {
                 notEmpty.await();
             }
             return x;
@@ -1312,7 +1311,7 @@ public E takeLast() throws InterruptedException {
         lock.lock();
         try {
             E x;
-            while ( (x = unlinkLast()) == null) {
+            while ((x = unlinkLast()) == null) {
                 notEmpty.await();
             }
             return x;

From 156c292669d8d7113f7d57453a36e41eed01cd28 Mon Sep 17 00:00:00 2001
From: Sebb <sebb@apache.org>
Date: Tue, 21 Jan 2025 23:51:20 +0000
Subject: [PATCH 3/4] Obsolete files (no longer present)

---
 src/assembly/src-tar-gz.xml | 3 ---
 src/assembly/src-zip.xml    | 2 --
 2 files changed, 5 deletions(-)

diff --git a/src/assembly/src-tar-gz.xml b/src/assembly/src-tar-gz.xml
index fbc391cfca..fdb9b209d4 100644
--- a/src/assembly/src-tar-gz.xml
+++ b/src/assembly/src-tar-gz.xml
@@ -25,7 +25,6 @@
     <fileSets>
         <fileSet>
             <includes>
-                <include>build.xml</include>
                 <include>checkstyle.xml</include>
                 <include>LICENSE.txt</include>
                 <include>license-header.txt</include>
@@ -34,7 +33,6 @@
                 <include>README.txt</include>
                 <include>RELEASE-NOTES.txt</include>
                 <include>findbugs-exclude-filter.xml</include>
-                <include>build.properties.sample</include>
             </includes>
             <lineEnding>lf</lineEnding>
         </fileSet>
@@ -73,4 +71,3 @@
         </fileSet> 
     </fileSets>
 </assembly>
-
diff --git a/src/assembly/src-zip.xml b/src/assembly/src-zip.xml
index f309ca6d64..3078e08252 100644
--- a/src/assembly/src-zip.xml
+++ b/src/assembly/src-zip.xml
@@ -25,7 +25,6 @@
     <fileSets>
         <fileSet>
             <includes>
-                <include>build.xml</include>
                 <include>checkstyle.xml</include>
                 <include>LICENSE.txt</include>
                 <include>license-header.txt</include>
@@ -34,7 +33,6 @@
                 <include>README.txt</include>
                 <include>RELEASE-NOTES.txt</include>
                 <include>findbugs-exclude-filter.xml</include>
-                <include>build.properties.sample</include>
             </includes>
             <lineEnding>crlf</lineEnding>
         </fileSet>

From a4ba4a6e1fc2f273726df2e460917a89a88997b4 Mon Sep 17 00:00:00 2001
From: Sebb <sebb@apache.org>
Date: Tue, 21 Jan 2025 23:53:13 +0000
Subject: [PATCH 4/4] These files are under src/conf

---
 src/assembly/src-tar-gz.xml | 2 --
 src/assembly/src-zip.xml    | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/assembly/src-tar-gz.xml b/src/assembly/src-tar-gz.xml
index fdb9b209d4..e34c0794e2 100644
--- a/src/assembly/src-tar-gz.xml
+++ b/src/assembly/src-tar-gz.xml
@@ -25,14 +25,12 @@
     <fileSets>
         <fileSet>
             <includes>
-                <include>checkstyle.xml</include>
                 <include>LICENSE.txt</include>
                 <include>license-header.txt</include>
                 <include>NOTICE.txt</include>
                 <include>pom.xml</include>
                 <include>README.txt</include>
                 <include>RELEASE-NOTES.txt</include>
-                <include>findbugs-exclude-filter.xml</include>
             </includes>
             <lineEnding>lf</lineEnding>
         </fileSet>
diff --git a/src/assembly/src-zip.xml b/src/assembly/src-zip.xml
index 3078e08252..60f54727ae 100644
--- a/src/assembly/src-zip.xml
+++ b/src/assembly/src-zip.xml
@@ -25,14 +25,12 @@
     <fileSets>
         <fileSet>
             <includes>
-                <include>checkstyle.xml</include>
                 <include>LICENSE.txt</include>
                 <include>license-header.txt</include>
                 <include>NOTICE.txt</include>
                 <include>pom.xml</include>
                 <include>README.txt</include>
                 <include>RELEASE-NOTES.txt</include>
-                <include>findbugs-exclude-filter.xml</include>
             </includes>
             <lineEnding>crlf</lineEnding>
         </fileSet>