Skip to content

[#86, #91] General build & dependency updates, and mmtc-core multi-release jar #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rmseng wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[#86, #91] General build & dependency updates, and mmtc-core multi-release jar #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b32a5ad
[#86] Make mmtc-core jar multi-release
rmseng May 20, 2026
fdd0928
[#91] Update Java dependencies, except Javalin
rmseng May 21, 2026
bbea7ed
[#91] Update to Gradle 8.14.5
rmseng May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
25 changes: 14 additions & 11 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 14 additions & 12 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 17 additions & 7 deletions mmtc-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ dependencies {
implementation(libs.jakarta.xml)
implementation(libs.jaxb.impl)

implementation("commons-beanutils:commons-beanutils:1.11.0")
implementation("org.apache.commons:commons-configuration2:2.12.0")
implementation("com.google.guava:guava:33.4.8-jre")
implementation(libs.commons.beanutils)
implementation(libs.commons.configuration)
implementation(libs.google.guava)

implementation("org.jdbi:jdbi3-core:3.39.1")
implementation("org.jdbi:jdbi3-sqlite:3.39.1")
implementation(libs.jdbi3.core)
implementation(libs.jdbi3.sqlite)
implementation(libs.log4j.slf4j) // jdbi3-core uses slf4j-api, and we need to provide it a logging implementation
implementation("org.xerial:sqlite-jdbc:3.50.3.0")
implementation(libs.sqlite.jdbc)

implementation(libs.commons.cli)
implementation(libs.commons.csv)
Expand All @@ -54,7 +54,7 @@ dependencies {
testImplementation(testlibs.junit.jupiter.params)
testImplementation(testlibs.junit.jupiter.engine)
testRuntimeOnly(testlibs.junit.platform.launcher)
testImplementation(testlibs.mockito.inline)
testImplementation(testlibs.mockito.core)
}

description = "mmtc-core"
Expand Down Expand Up @@ -165,6 +165,16 @@ tasks.build {
dependsOn(uberJar)
}

tasks.jar {
manifest {
attributes(
"Implementation-Title" to project.name,
"Implementation-Version" to project.version,
"Multi-Release" to "true"
)
}
}

publishing {
publications {
create<MavenPublication>("mmtc-core") {
Expand Down
2 changes: 1 addition & 1 deletion mmtc-output-plugin-sdk/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies {
testImplementation(testlibs.junit.jupiter.params)
testImplementation(testlibs.junit.jupiter.engine)
testRuntimeOnly(testlibs.junit.platform.launcher)
testImplementation(testlibs.mockito.inline)
testImplementation(testlibs.mockito.core)
}

description = "mmtc-output-plugin-example"
Expand Down
4 changes: 2 additions & 2 deletions mmtc-plugin-ampcs/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies {

compileOnly(project(":mmtc-core"))

implementation("com.google.guava:guava:33.4.8-jre")
implementation(libs.google.guava)

// provides javax.xml.bind classes
implementation(libs.jakarta.xml)
Expand All @@ -44,7 +44,7 @@ dependencies {
testImplementation(testlibs.junit.jupiter.params)
testImplementation(testlibs.junit.jupiter.engine)
testRuntimeOnly(testlibs.junit.platform.launcher)
testImplementation(testlibs.mockito.inline)
testImplementation(testlibs.mockito.core)
}

description = "mmtc-plugin-ampcs"
Expand Down
2 changes: 1 addition & 1 deletion mmtc-tlm-source-plugin-sdk/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dependencies {
testImplementation(testlibs.junit.jupiter.params)
testImplementation(testlibs.junit.jupiter.engine)
testRuntimeOnly(testlibs.junit.platform.launcher)
testImplementation(testlibs.mockito.inline)
testImplementation(testlibs.mockito.core)
}

description = "mmtc-tlm-plugin-example"
Expand Down
4 changes: 2 additions & 2 deletions mmtc-webapp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ dependencies {
)))

implementation(project(":mmtc-core"))
implementation("io.javalin:javalin:6.7.0")
implementation("com.fasterxml.jackson.core:jackson-databind:2.17.2")
implementation(libs.javalin.javalin)
implementation(libs.jackson.databind)
implementation(libs.log4j.slf4j)
implementation(libs.log4j.api)
implementation(libs.log4j.core)
Expand Down
56 changes: 40 additions & 16 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ rootProject.name = "mmtc"
include(":mmtc-core")
include(":mmtc-output-plugin-sdk")
include(":mmtc-plugin-ampcs")
include(":mmtc-output-plugin-sdk")
include(":mmtc-tlm-source-plugin-sdk")
include(":mmtc-webapp")
include(":mmtc-webapp-ui")
Expand All @@ -17,27 +16,52 @@ include(":jnispice")
dependencyResolutionManagement {
versionCatalogs {
create("libs") {
library("commons-csv", "org.apache.commons:commons-csv:1.14.0")
library("commons-lang3", "org.apache.commons:commons-lang3:3.18.0")
library("commons-cli", "commons-cli:commons-cli:1.9.0")
library("commons-io", "commons-io:commons-io:2.19.0")
// comments in this block indicate reasons as to why certain dependencies are not at their latest

library("commons-csv", "org.apache.commons:commons-csv:1.14.1")
library("commons-lang3", "org.apache.commons:commons-lang3:3.20.0")
library("commons-cli", "commons-cli:commons-cli:1.11.0")
library("commons-io", "commons-io:commons-io:2.22.0")
library("commons-beanutils", "commons-beanutils:commons-beanutils:1.11.0")
library("commons-configuration", "org.apache.commons:commons-configuration2:2.15.0")

library("google-guava", "com.google.guava:guava:33.6.0-jre")

library("log4j-api", "org.apache.logging.log4j:log4j-api:2.25.1")
library("log4j-core", "org.apache.logging.log4j:log4j-core:2.25.1")
library("log4j-jcl", "org.apache.logging.log4j:log4j-jcl:2.25.1")
library("log4j-slf4j", "org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1")
library("log4j-api", "org.apache.logging.log4j:log4j-api:2.26.0")
library("log4j-core", "org.apache.logging.log4j:log4j-core:2.26.0")
library("log4j-jcl", "org.apache.logging.log4j:log4j-jcl:2.26.0")
library("log4j-slf4j", "org.apache.logging.log4j:log4j-slf4j2-impl:2.26.0")

// provides javax.xml.bind classes
// these provide javax.xml.bind classes
// version 3 is the last to support Java 8
library("jakarta-xml", "jakarta.xml.bind:jakarta.xml.bind-api:3.0.1")
library("jaxb-impl", "com.sun.xml.bind:jaxb-impl:3.0.1")

// this is the last JDBI version to support Java 8
library("jdbi3-core", "org.jdbi:jdbi3-core:3.39.1")
library("jdbi3-sqlite", "org.jdbi:jdbi3-sqlite:3.39.1")

// todo update javalin from v6 to v7
library("javalin-javalin", "io.javalin:javalin:6.7.0")

// Javalin only supports jackson 2.x currently
library("jackson-databind", "com.fasterxml.jackson.core:jackson-databind:2.21.3")

// sqlite follows semantic versioning; any 3.x release should maintain backward compatibility
// todo still, write a regression test that uses cached data from MMTC 1.6.0
library("sqlite-jdbc", "org.xerial:sqlite-jdbc:3.53.1.0")
}

create("testlibs") {
library("junit-jupiter-api", "org.junit.jupiter:junit-jupiter-api:5.13.4")
library("junit-jupiter-params", "org.junit.jupiter:junit-jupiter-params:5.13.4")
library("junit-jupiter-engine", "org.junit.jupiter:junit-jupiter-engine:5.13.4")
library("junit-platform-launcher", "org.junit.platform:junit-platform-launcher:1.13.4")
library("mockito-inline", "org.mockito:mockito-inline:4.11.0")
// staying with major version 5 for junit-jupiter to maintain similarity with end-to-end-tests
library("junit-jupiter-api", "org.junit.jupiter:junit-jupiter-api:5.14.4")
library("junit-jupiter-params", "org.junit.jupiter:junit-jupiter-params:5.14.4")
library("junit-jupiter-engine", "org.junit.jupiter:junit-jupiter-engine:5.14.4")

// junit platform launcher v1 works with JUnit 5; newer versions require Java 17+
library("junit-platform-launcher", "org.junit.platform:junit-platform-launcher:1.14.4")

library("mockito-core", "org.mockito:mockito-core:5.23.0")
}
}
}
}