You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/01/06 15:58:32 UTC

[tomcat] branch 10.1.x updated (7921b2e5f9 -> 6a54b9ec54)

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


    from 7921b2e5f9 Add Java 21 source/target support for JSPs (if JDT version supports it)
     new 58ef1ec31d Update testing/validation libraries
     new dc82724fc5 Fix SpotBugs issues reported via IDE
     new 6a54b9ec54 Additional false positives when running via Ant

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.properties.default                | 14 +++++-----
 res/spotbugs/filter-false-positives.xml | 46 +++++++++++++++++++++++++++------
 webapps/docs/changelog.xml              |  9 +++++++
 3 files changed, 54 insertions(+), 15 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat] 02/03: Fix SpotBugs issues reported via IDE

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit dc82724fc583806a72095881ffa9e08f71511446
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jan 6 15:37:19 2023 +0000

    Fix SpotBugs issues reported via IDE
---
 res/spotbugs/filter-false-positives.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/res/spotbugs/filter-false-positives.xml b/res/spotbugs/filter-false-positives.xml
index b2710b9dca..9a1745c663 100644
--- a/res/spotbugs/filter-false-positives.xml
+++ b/res/spotbugs/filter-false-positives.xml
@@ -1208,15 +1208,15 @@
   </Match>
   <Match>
     <!-- SQL construction is necessary for pooled statements -->
+    <Class name="org.apache.tomcat.dbcp.dbcp2.PStmtKey" />
     <Or>
-      <Class name="org.apache.tomcat.dbcp.dbcp2.PStmtKey$PreparedStatementSQL" />
-      <Class name="org.apache.tomcat.dbcp.dbcp2.PStmtKey$PreparedStatementWithAutoGeneratedKeys" />
-      <Class name="org.apache.tomcat.dbcp.dbcp2.PStmtKey$PreparedStatementWithColumnIndexes" />
-      <Class name="org.apache.tomcat.dbcp.dbcp2.PStmtKey$PreparedStatementWithColumnNames" />
-      <Class name="org.apache.tomcat.dbcp.dbcp2.PStmtKey$PreparedStatementWithResultSetConcurrency" />
-      <Class name="org.apache.tomcat.dbcp.dbcp2.PStmtKey$PreparedStatementWithResultSetHoldability" />
+      <Method name="lambda$3" />
+      <Method name="lambda$4" />
+      <Method name="lambda$5" />
+      <Method name="lambda$6" />
+      <Method name="lambda$7" />
+      <Method name="lambda$8" />
     </Or>
-    <Method name="createStatement" />
     <Bug pattern="SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING" />
   </Match>
   <Match>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat] 01/03: Update testing/validation libraries

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 58ef1ec31d682645be5c89d6b6575af93621603e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jan 6 15:25:20 2023 +0000

    Update testing/validation libraries
---
 build.properties.default   | 14 +++++++-------
 webapps/docs/changelog.xml |  9 +++++++++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index a13b99c88f..a9191a849a 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -256,19 +256,19 @@ objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
 objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
 
 # ----- UnboundID, used by unit tests, version 5.1.4 or later -----
-unboundid.version=6.0.6
+unboundid.version=6.0.7
 unboundid.checksum.enabled=true
 unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=080a6719ceeb55bcdcc8cac7146b4da1ef7c29107d336868e7f77666fc834ed4191bdaa54dac03eccf02bdfb0b6293809b7b8a41eee7cf420489c98018afeb9f
+unboundid.checksum.value=c0adafab9e493150b9729f51fb0dee6a787821ab93a760794962fadcdbbbf9f868e5c159f3a344c43f0b7b037b9b01b35f86e4bc97e903a40e25c884cdedaf5b
 unboundid.home=${base.path}/unboundid-${unboundid.version}
 unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
 unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
 
 # ----- Checkstyle, version 6.16 or later -----
-checkstyle.version=10.3.4
+checkstyle.version=10.6.0
 checkstyle.checksum.enabled=true
 checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=03bf9d20a83dbf44dd83e8081e293903c94b10f92b9b78051be04a6c759c43cff537acf4086da23a69c8875b3f3dbabdd11ab345d07d3d42940621c507fc1e84
+checkstyle.checksum.value=424ec002f7246c081df0d24168ba3da20af06d001a1d77afead5a730fe2565bc7db5025ccdefe4d27b4545c4358cb20ac845365162011e63e216aabd6f7adf38
 checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
 checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
 checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
@@ -283,10 +283,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
 jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
 
 # ----- SpotBugs (originally FindBugs) -----
-spotbugs.version=4.7.2
+spotbugs.version=4.7.3
 spotbugs.checksum.enabled=true
 spotbugs.checksum.algorithm=SHA-256
-spotbugs.checksum.value=f02a023d03b0fde70038ccb4bc8d4a964a504262d13024a97b14d9070f7d4d96
+spotbugs.checksum.value=f02e2f1135b23f3edfddb75f64be0491353cfeb567b5a584115aa4fd373d4431
 spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
 spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
 spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
@@ -298,7 +298,7 @@ bnd.version=6.3.1
 # checksums for biz.aQute.bnd-6.3.1.jar
 bnd.checksum.enabled=true
 bnd.checksum.algorithm=MD5|SHA-1
-bnd.checksum.value=06bb0a51c208fc2f24c8cd54216b4b6f|c00993c55ccee432dd43f540e6f7c194fe946d20
+bnd.checksum.value=a812b31a81f05767ea11896a81cd8eab|8a359edbb02aad9138b7824a0d7bbe22f02cf990
 
 bnd.home=${base.path}/bnd-${bnd.version}
 bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b34f0a8001..f3b193c5ec 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -186,6 +186,15 @@
       <update>
         Update to the Eclipse JDT compiler 4.26. (markt)
       </update>
+      <update>
+        Update Checkstyle to 10.6.0. (markt)
+      </update>
+      <update>
+        Update Unboundid to 6.0.7. (markt)
+      </update>
+      <update>
+        Update SpotBugs to 4.7.3. (markt)
+      </update>
     </changelog>
   </subsection>
 </section>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat] 03/03: Additional false positives when running via Ant

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 6a54b9ec542ea261bdc7dfdd85045a81905bd50c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jan 6 15:52:28 2023 +0000

    Additional false positives when running via Ant
---
 res/spotbugs/filter-false-positives.xml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/res/spotbugs/filter-false-positives.xml b/res/spotbugs/filter-false-positives.xml
index 9a1745c663..ac7915b632 100644
--- a/res/spotbugs/filter-false-positives.xml
+++ b/res/spotbugs/filter-false-positives.xml
@@ -924,6 +924,16 @@
     <Method name="emitHeader" />
     <Bug pattern="VO_VOLATILE_INCREMENT" />
   </Match>
+  <Match>
+    <!-- False positive. Affects 4.7.3. May affect other versions. -->
+    <Class name="org.apache.coyote.http2.HpackDecoder" />
+    <Method name="handleMaxMemorySizeChange" />
+    <Or>
+      <Field name="currentMemorySize" />
+      <Field name="filledTableSlots" />
+    </Or>
+    <Bug pattern="SA_FIELD_SELF_ASSIGNMENT" />
+  </Match>
   <Match>
     <!-- Number being tested is unsigned. -->
     <Class name="org.apache.coyote.http2.Http2UpgradeHandler" />
@@ -945,6 +955,12 @@
       <Bug pattern="NO_NOTIFY_NOT_NOTIFYALL" />
     </Or>
   </Match>
+  <Match>
+    <!-- Switch fall-through is intentional. -->
+    <Class name="org.apache.coyote.http2.Http2UpgradeHandler" />
+    <Method name="upgradeDispatch" />
+     <Bug pattern="SF_SWITCH_FALLTHROUGH" />
+  </Match>
   <Match>
     <!-- Return value is intentionally ignored. -->
     <Class name="org.apache.coyote.http2.Http2UpgradeHandler$PingManager" />
@@ -1210,12 +1226,20 @@
     <!-- SQL construction is necessary for pooled statements -->
     <Class name="org.apache.tomcat.dbcp.dbcp2.PStmtKey" />
     <Or>
+      <!-- Names reported via IDE -->
       <Method name="lambda$3" />
       <Method name="lambda$4" />
       <Method name="lambda$5" />
       <Method name="lambda$6" />
       <Method name="lambda$7" />
       <Method name="lambda$8" />
+      <!-- Names reported via Ant -->
+      <Method name="lambda$static$3" />
+      <Method name="lambda$static$4" />
+      <Method name="lambda$static$5" />
+      <Method name="lambda$static$6" />
+      <Method name="lambda$static$7" />
+      <Method name="lambda$static$8" />
     </Or>
     <Bug pattern="SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING" />
   </Match>
@@ -1397,6 +1421,12 @@
     <Method name="toString"/>
     <Bug code="NP" />
   </Match>
+  <Match>
+    <!-- Switch fall-through is intentional. -->
+    <Class name="org.apache.tomcat.util.buf.MessageBytes"/>
+    <Method name="toChars"/>
+    <Bug pattern="SF_SWITCH_FALLTHROUGH" />
+  </Match>
   <Match>
     <!-- Returning null here is fine -->
     <Class name="org.apache.tomcat.util.buf.MessageBytes"/>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org