diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9ccfb03278..e072e3dd79 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -58,7 +58,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2 + uses: github/codeql-action/init@c6f931105cb2c34c8f901cc885ba1e2e259cf745 # v4.34.0 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -69,7 +69,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2 + uses: github/codeql-action/autobuild@c6f931105cb2c34c8f901cc885ba1e2e259cf745 # v4.34.0 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -83,4 +83,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2 + uses: github/codeql-action/analyze@c6f931105cb2c34c8f901cc885ba1e2e259cf745 # v4.34.0 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 7503f5e6b7..7182c34001 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -57,13 +57,13 @@ jobs: publish_results: true - name: "Upload artifact" - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # 6.0.0 + uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0 with: name: SARIF file path: results.sarif retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2 + uses: github/codeql-action/upload-sarif@c6f931105cb2c34c8f901cc885ba1e2e259cf745 # v4.34.0 with: sarif_file: results.sarif diff --git a/pom.xml b/pom.xml index f2049d7fde..bc8e9a9200 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.apache.commons commons-parent - 96 + 97 commons-text 1.15.1-SNAPSHOT @@ -48,7 +48,7 @@ https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-text site-content 3.20.0 - 1.18.4 + 1.18.7 1.6 false 1.37 diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 4bfbe4f854..a3ae6cc2bc 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -49,9 +49,10 @@ The type attribute can be add,update,fix,remove. TextStringBuilder.append(char[], int, int) uses wrong variable in exception message #735. - Bump org.apache.commons:commons-parent from 93 to 96. + Bump org.apache.commons:commons-parent from 93 to 97. Bump the level of test coverage checks. Bump commons.bytebuddy.version from 1.18.2 to 1.18.4 #734. + Bump commons.bytebuddy.version from 1.18.4 to 1.18.7. diff --git a/src/main/java/org/apache/commons/text/similarity/LevenshteinDetailedDistance.java b/src/main/java/org/apache/commons/text/similarity/LevenshteinDetailedDistance.java index 4b4740ea9a..8ea040098d 100644 --- a/src/main/java/org/apache/commons/text/similarity/LevenshteinDetailedDistance.java +++ b/src/main/java/org/apache/commons/text/similarity/LevenshteinDetailedDistance.java @@ -132,7 +132,7 @@ public static LevenshteinDetailedDistance getDefaultInstance() { * *

* This implementation follows from Algorithms on Strings, Trees and Sequences by Dan Gusfield and Chas Emerick's implementation of the Levenshtein distance - * algorithm from http://www.merriampark.com/ld.htm + * algorithm. *

* * 
@@ -271,18 +271,9 @@ private static  LevenshteinResults limitedCompare(SimilarityInput left, Si
      * 

      *
      * 

-     * The previous implementation of the Levenshtein distance algorithm was from
-     * http://www.merriampark.com/ld.htm
-     * 

-     *
-     * 

      * Chas Emerick has written an implementation in Java, which avoids an OutOfMemoryError which can occur when my Java implementation is used with very large
      * strings.
      * 

-     * 

-     * This implementation of the Levenshtein distance algorithm is from
-     * http://www.merriampark.com/ldjava.htm
-     * 

      *
      * 
      * unlimitedCompare(null, *)             = Throws {@link IllegalArgumentException}
@@ -416,18 +407,9 @@ public LevenshteinDetailedDistance(final Integer threshold) {
      * 

      *
      * 

-     * The previous implementation of the Levenshtein distance algorithm was from
-     * http://www.merriampark.com/ld.htm
-     * 

-     *
-     * 

      * Chas Emerick has written an implementation in Java, which avoids an OutOfMemoryError which can occur when my Java implementation is used with very large
      * strings.
      * 

-     * 

-     * This implementation of the Levenshtein distance algorithm is from
-     * http://www.merriampark.com/ldjava.htm
-     * 

      *
      * 
      * distance.apply(null, *)             = Throws {@link IllegalArgumentException}
@@ -461,18 +443,9 @@ public LevenshteinResults apply(final CharSequence left, final CharSequence righ
      * 

      *
      * 

-     * The previous implementation of the Levenshtein distance algorithm was from
-     * http://www.merriampark.com/ld.htm
-     * 

-     *
-     * 

      * Chas Emerick has written an implementation in Java, which avoids an OutOfMemoryError which can occur when my Java implementation is used with very large
      * strings.
      * 

-     * 

-     * This implementation of the Levenshtein distance algorithm is from
-     * http://www.merriampark.com/ldjava.htm
-     * 

      *
      * 
      * distance.apply(null, *)             = Throws {@link IllegalArgumentException}
diff --git a/src/main/java/org/apache/commons/text/similarity/LevenshteinDistance.java b/src/main/java/org/apache/commons/text/similarity/LevenshteinDistance.java
index d8b9e121ae..479b3fadea 100644
--- a/src/main/java/org/apache/commons/text/similarity/LevenshteinDistance.java
+++ b/src/main/java/org/apache/commons/text/similarity/LevenshteinDistance.java
@@ -55,7 +55,7 @@ public static LevenshteinDistance getDefaultInstance() {
      *
      * 

      * This implementation follows from Algorithms on Strings, Trees and Sequences by Dan Gusfield and Chas Emerick's implementation of the Levenshtein distance
-     * algorithm from http://www.merriampark.com/ld.htm
+     * algorithm.
      * 

      *
      * 
@@ -204,12 +204,6 @@ private static  int limitedCompare(SimilarityInput left, SimilarityInput

      *
      * 

-     * The previous implementation of the Levenshtein distance algorithm was from
-     * 
-     * https://web.archive.org/web/20120526085419/http://www.merriampark.com/ldjava.htm
-     * 

-     *
-     * 

      * This implementation only need one single-dimensional arrays of length s.length() + 1
      * 

      *
@@ -320,18 +314,9 @@ public LevenshteinDistance(final Integer threshold) {
      * 

      *
      * 

-     * The previous implementation of the Levenshtein distance algorithm was from
-     * http://www.merriampark.com/ld.htm
-     * 

-     *
-     * 

      * Chas Emerick has written an implementation in Java, which avoids an OutOfMemoryError which can occur when my Java implementation is used with very large
      * strings.
      * 

-     * 

-     * This implementation of the Levenshtein distance algorithm is from
-     * http://www.merriampark.com/ldjava.htm
-     * 

      *
      * 
      * distance.apply(null, *)             = Throws {@link IllegalArgumentException}
diff --git a/src/site/xdoc/security.xml b/src/site/xdoc/security.xml
index b211fd77bd..150584ad35 100644
--- a/src/site/xdoc/security.xml
+++ b/src/site/xdoc/security.xml
@@ -114,5 +114,10 @@
                 

             
         
-    
+    

+      

+      For information about safe deserialization, please see Safe Deserialization.
+      

+    

+