Merge branch 'main' into bugfix/api/register-checks

Diruptio · Nov 6, 2024 · be42a74 · be42a74
2 parents 46a52ee + 5d6197d
commit be42a74
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,12 +13,12 @@ repositories {
 }
 
 dependencies {
-    compileOnly("org.jetbrains:annotations:25.0.0")
+    compileOnly("org.jetbrains:annotations:26.0.1")
     implementation("io.netty:netty-all:4.1.114.Final")
     implementation("com.google.guava:guava:33.3.1-jre")
     implementation("com.google.code.gson:gson:2.11.0")
     implementation("org.yaml:snakeyaml:2.3")
-    runtimeOnly("org.bouncycastle:bcpkix-jdk18on:1.78.1")
+    runtimeOnly("org.bouncycastle:bcpkix-jdk18on:1.79")
 }
 
 spotless {
@@ -60,6 +60,7 @@ tasks {
     jar {
         from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
+        exclude("META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA")
         manifest.attributes["Implementation-Title"] = "Spikedog"
         manifest.attributes["Implementation-Version"] = version
         manifest.attributes["Main-Class"] = "diruptio.spikedog.Spikedog"

diff --git a/example-module/build.gradle.kts b/example-module/build.gradle.kts
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly(project(":"))
-    compileOnly("org.jetbrains:annotations:25.0.0")
+    compileOnly("org.jetbrains:annotations:26.0.1")
 }
 
 tasks {

diff --git a/info-module/build.gradle.kts b/info-module/build.gradle.kts
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly(project(":"))
-    compileOnly("org.jetbrains:annotations:25.0.0")
+    compileOnly("org.jetbrains:annotations:26.0.1")
 }
 
 tasks {

diff --git a/reload-module/build.gradle.kts b/reload-module/build.gradle.kts
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly(project(":"))
-    compileOnly("org.jetbrains:annotations:25.0.0")
+    compileOnly("org.jetbrains:annotations:26.0.1")
 }
 
 tasks {