Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
Foxcapades committed Jan 30, 2025
1 parent 0b9164a commit 1885467
Show file tree
Hide file tree
Showing 14 changed files with 377 additions and 586 deletions.
26 changes: 13 additions & 13 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import org.veupathdb.lib.gradle.container.util.Logger.Level
import org.gradle.api.JavaVersion

plugins {
java
id("org.veupathdb.lib.gradle.container.container-utils") version "4.8.10"
id("org.veupathdb.lib.gradle.container.container-utils") version "5.0.4"
id("com.github.johnrengelman.shadow") version "7.1.2"
}

Expand Down Expand Up @@ -47,9 +48,8 @@ containerBuild {
}

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
}
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

tasks.shadowJar {
Expand Down Expand Up @@ -81,25 +81,25 @@ configurations.all {
dependencies {

// Core lib
implementation("org.veupathdb.lib:jaxrs-container-core:7.0.1")
implementation("org.veupathdb.lib:jaxrs-container-core:8.0.0")

// Jersey
implementation("org.glassfish.jersey.core:jersey-server:3.1.1")
implementation("org.glassfish.jersey.core:jersey-server:3.1.10")

// Jackson
implementation("com.fasterxml.jackson.core:jackson-databind:2.15.3")
implementation("com.fasterxml.jackson.core:jackson-annotations:2.15.3")
implementation("com.fasterxml.jackson.core:jackson-databind:2.18.2")
implementation("com.fasterxml.jackson.core:jackson-annotations:2.18.2")

// Log4J
implementation("org.apache.logging.log4j:log4j-api:2.20.0")
implementation("org.apache.logging.log4j:log4j-core:2.20.0")
implementation("org.apache.logging.log4j:log4j-api:2.24.3")
implementation("org.apache.logging.log4j:log4j-core:2.24.3")

// Metrics (can remove if not adding custom service metrics over those provided by container core)
implementation("io.prometheus:simpleclient:0.16.0")
implementation("io.prometheus:simpleclient_common:0.16.0")

// Unit Testing
testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2")
testImplementation("org.mockito:mockito-core:5.2.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.4")
testImplementation("org.mockito:mockito-core:5.15.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.4")
}
23 changes: 19 additions & 4 deletions docs/api.html

Large diffs are not rendered by default.

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 1885467

Please sign in to comment.