feat: update deps and make api key optional (#82)

nidotls · web-flow · commit 87e5064e23a4 · 2026-04-16T21:46:07.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,12 +12,12 @@ jobs:
         java: [ "17" ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.java }}
           distribution: "adopt"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,12 +12,12 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 17
           distribution: "adopt"
@@ -52,7 +52,7 @@ jobs:
 
       - name: Get Git Changelog
         id: get_changelog
-        uses: thenilsdev/git-log-action@1.0.5
+        uses: thenilsdev/git-log-action@v2.0.3
         if: steps.release.outcome == 'success' && steps.release.conclusion == 'success'
 
       - name: Build with Maven
@@ -74,7 +74,7 @@ jobs:
 #        continue-on-error: true
 
       - name: Create Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         id: create_release
         with:
           tag_name: ${{ steps.current_tag.outputs.tag }}
diff --git a/bukkit/pom.xml b/bukkit/pom.xml
@@ -48,7 +48,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.6.2</version>
                 <configuration>
                     <relocations>
                         <relocation>
diff --git a/bungee/pom.xml b/bungee/pom.xml
@@ -14,18 +14,11 @@
     <name>NetworkFilterBungee</name>
     <description/>
 
-    <repositories>
-        <repository>
-            <id>bungeecord-repo</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.21-R0.1-SNAPSHOT</version>
+            <version>1.21-R0.4</version>
             <scope>provided</scope>
         </dependency>
 
@@ -48,7 +41,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.6.2</version>
                 <configuration>
                     <relocations>
                         <relocation>
diff --git a/common/pom.xml b/common/pom.xml
@@ -18,45 +18,51 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.18.0</version>
+            <version>2.21.2</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.18.0</version>
+            <version>2.21.2</version>
         </dependency>
         <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
-            <version>3.1.0</version>
+            <version>3.1.1</version>
         </dependency>
 
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
-            <version>3.11.1</version>
+            <version>3.13.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.konghq</groupId>
             <artifactId>unirest-java-core</artifactId>
-            <version>4.4.4</version>
+            <version>4.8.1</version>
         </dependency>
         <dependency>
             <groupId>com.konghq</groupId>
             <artifactId>unirest-modules-gson</artifactId>
-            <version>4.4.4</version>
+            <version>4.8.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jspecify</groupId>
+            <artifactId>jspecify</artifactId>
+            <version>1.0.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
-            <version>3.1.8</version>
+            <version>3.2.3</version>
         </dependency>
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>5.2.0</version>
+            <version>7.4.1</version>
         </dependency>
 
         <dependency>
diff --git a/common/src/main/java/ls/ni/networkfilter/common/NetworkFilterResult.java b/common/src/main/java/ls/ni/networkfilter/common/NetworkFilterResult.java
@@ -1,6 +1,6 @@
 package ls.ni.networkfilter.common;
 
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/common/src/main/java/ls/ni/networkfilter/common/cache/Cache.java b/common/src/main/java/ls/ni/networkfilter/common/cache/Cache.java
@@ -1,7 +1,7 @@
 package ls.ni.networkfilter.common.cache;
 
 import ls.ni.networkfilter.common.filter.FilterResult;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.function.Function;
diff --git a/common/src/main/java/ls/ni/networkfilter/common/cache/types/CaffeineCache.java b/common/src/main/java/ls/ni/networkfilter/common/cache/types/CaffeineCache.java
@@ -3,7 +3,7 @@
 import com.github.benmanes.caffeine.cache.Caffeine;
 import ls.ni.networkfilter.common.cache.Cache;
 import ls.ni.networkfilter.common.filter.FilterResult;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.jetbrains.annotations.NotNull;
 
 import java.time.Duration;
diff --git a/common/src/main/java/ls/ni/networkfilter/common/cache/types/RedisCache.java b/common/src/main/java/ls/ni/networkfilter/common/cache/types/RedisCache.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import ls.ni.networkfilter.common.cache.Cache;
 import ls.ni.networkfilter.common.filter.FilterResult;
-import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.jetbrains.annotations.NotNull;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
diff --git a/common/src/main/java/ls/ni/networkfilter/common/config/service/types/NetworkFilterServiceSettings.java b/common/src/main/java/ls/ni/networkfilter/common/config/service/types/NetworkFilterServiceSettings.java
@@ -1,15 +1,15 @@
 package ls.ni.networkfilter.common.config.service.types;
 
-import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.jetbrains.annotations.Nullable;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 public class NetworkFilterServiceSettings {
 
-    @NotNull
+    @Nullable
     private String key;
 }
diff --git a/common/src/main/java/ls/ni/networkfilter/common/filter/types/NetworkFilterFilterService.java b/common/src/main/java/ls/ni/networkfilter/common/filter/types/NetworkFilterFilterService.java
@@ -1,6 +1,6 @@
 package ls.ni.networkfilter.common.filter.types;
 
-import jakarta.validation.constraints.NotBlank;
+import kong.unirest.core.HttpRequestWithBody;
 import kong.unirest.core.HttpResponse;
 import kong.unirest.core.JsonNode;
 import kong.unirest.core.Unirest;
@@ -10,17 +10,18 @@
 import ls.ni.networkfilter.common.filter.FilterResult;
 import ls.ni.networkfilter.common.filter.FilterService;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.Optional;
 
 public class NetworkFilterFilterService implements FilterService {
 
-    @NotNull
+    @Nullable
     private final String apiKey;
 
-    public NetworkFilterFilterService(@NotNull @NotBlank String apiKey) {
-        this.apiKey = apiKey;
+    public NetworkFilterFilterService(@Nullable String apiKey) {
+        this.apiKey = apiKey != null && !apiKey.isBlank() ? apiKey : null;
     }
 
     @Override
@@ -30,9 +31,14 @@ public NetworkFilterFilterService(@NotNull @NotBlank String apiKey) {
 
     @Override
     public @NotNull FilterResult check(@NotNull String ip) {
-        HttpResponse<JsonNode> response = Unirest.post("https://nf.ni.ls/api/check")
-                .header("X-API-KEY", this.apiKey)
-                .header("Content-Type", "application/x-www-form-urlencoded")
+        HttpRequestWithBody request = Unirest.post("https://nf.ni.ls/api/check")
+                .header("Content-Type", "application/x-www-form-urlencoded");
+
+        if (this.apiKey != null) {
+            request.header("X-API-KEY", this.apiKey);
+        }
+
+        HttpResponse<JsonNode> response = request
                 .field("ip", ip)
                 .asJson();
 
diff --git a/common/src/main/resources/config.yml b/common/src/main/resources/config.yml
@@ -20,7 +20,7 @@ caches:
 services:
   # https://nf.ni.ls
   networkfilter:
-    # Required
+    # Optional, needed if rate-limited
     key: ""
 
   # https://ipapi.is
diff --git a/pom.xml b/pom.xml
@@ -30,21 +30,21 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.34</version>
+            <version>1.18.44</version>
             <scope>provided</scope>
         </dependency>
         <!-- annotations -->
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>26.0.0</version>
+            <version>26.1.0</version>
             <scope>compile</scope>
         </dependency>
         <!-- test -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.11.2</version>
+            <version>6.0.3</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -58,7 +58,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.13.0</version>
+                <version>3.15.0</version>
                 <configuration>
                     <source>17</source>
                     <target>17</target>
@@ -93,7 +93,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.4.2</version>
+                <version>3.5.0</version>
                 <configuration>
                     <outputDirectory>${project.parent.basedir}/artifacts/</outputDirectory>
                 </configuration>
@@ -104,7 +104,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.6.0</version>
+                    <version>3.6.2</version>
                     <executions>
                         <execution>
                             <phase>package</phase>
diff --git a/velocity/pom.xml b/velocity/pom.xml
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>com.velocitypowered</groupId>
             <artifactId>velocity-api</artifactId>
-            <version>3.3.0-SNAPSHOT</version>
+            <version>3.4.0</version>
             <scope>provided</scope>
         </dependency>
 
@@ -56,7 +56,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.6.2</version>
                 <configuration>
                     <relocations>
                         <relocation>
