Merge branch 'main' into lemeurherve-patch-1

jenkins-infra · May 14, 2024 · 0f490c4 · 0f490c4
2 parents 382a355 + 923e112
commit 0f490c4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
         with:
           fetch-depth: 0
       - name: Release Drafter

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -102,9 +102,9 @@ dependencies {
 
     implementation("com.captcha:botdetect-jsp20:4.0.beta3.7")
 
-    implementation("com.github.spotbugs:spotbugs-annotations:4.8.3")
+    implementation("com.github.spotbugs:spotbugs-annotations:4.8.5")
 
-    implementation("com.google.guava:guava:33.1.0-jre")
+    implementation("com.google.guava:guava:33.2.0-jre")
 
     testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
 }

diff --git a/src/main/java/org/jenkinsci/account/Application.java b/src/main/java/org/jenkinsci/account/Application.java
@@ -1172,7 +1172,11 @@ public AdminUI getAdmin() {
         "176.67.86.", // laptoprepair gmail guy and Persistent spammers
         "176.67.86.36", // Persistent spammer
         "177.154.139.203", // http://www.ipvoid.com/scan/177.154.139.203
-        "180.151.",
+        "180.151.228.235", // https://github.com/jenkins-infra/account-app/commit/a04efa7690fa6fc228a407d6707cfe24bf1dd995
+        "180.151.246.3", // https://github.com/jenkins-infra/account-app/commit/a04efa7690fa6fc228a407d6707cfe24bf1dd995
+        "180.151.30.243", // https://github.com/jenkins-infra/account-app/commit/a04efa7690fa6fc228a407d6707cfe24bf1dd995
+        "180.151.7.42", // https://github.com/jenkins-infra/account-app/commit/a04efa7690fa6fc228a407d6707cfe24bf1dd995
+        "180.151.84.234", // https://github.com/jenkins-infra/account-app/commit/a04efa7690fa6fc228a407d6707cfe24bf1dd995
         "180.254.96.177", // http://www.ipvoid.com/scan/180.254.96.177
         "181.41.197.63", // Persistent spammer
         "182.156.72.162",