Skip to content

Replace 29 committed jars with their Maven artifacts #474

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

Draft
ssrowe wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Replace 29 committed jars with their Maven artifacts #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* write the Ant-Version manifest attribute.
*
* Dependencies resolve from Maven Central via gradle/libs.versions.toml;
* every coordinate was SHA-1 matched to the previously vendored jar,
* every coordinate was matched to the previously vendored jar,
* resolution is non-transitive so the artifact set stays exactly the
* audited set, and gradle/verification-metadata.xml enforces checksums
* on every resolution. The
Expand Down Expand Up @@ -154,6 +154,16 @@ subprojects {

repositories {
mavenCentral()
// dcm4che 2.x is published only to the dcm4che.org repository.
exclusiveContent {
forRepository {
maven { url = 'https://www.dcm4che.org/maven2/' }
}
filter {
includeGroup 'dcm4che'
includeGroup 'dcm4che.tool'
}
}
}

java {
Expand Down
Binary file removed client/lib/autocomplete-2.5.4.jar
View file
Open in desktop
Binary file not shown.
Binary file removed client/lib/hapi-base-2.3.jar
View file
Open in desktop
Binary file not shown.
Binary file removed client/lib/hapi-structures-v21-2.3.jar
View file
Open in desktop
Binary file not shown.
Binary file removed client/lib/hapi-structures-v22-2.3.jar
View file
Open in desktop
Binary file not shown.
Binary file removed client/lib/hapi-structures-v23-2.3.jar
View file
Open in desktop
Binary file not shown.
Binary file removed client/lib/hapi-structures-v231-2.3.jar
View file
Open in desktop
Binary file not shown.
Binary file removed client/lib/hapi-structures-v24-2.3.jar
View file
Open in desktop
Binary file not shown.
Binary file removed client/lib/hapi-structures-v25-2.3.jar
View file
Open in desktop
Binary file not shown.
Binary file removed client/lib/hapi-structures-v251-2.3.jar
View file
Open in desktop
Binary file not shown.
Binary file removed client/lib/hapi-structures-v26-2.3.jar
View file
Open in desktop
Binary file not shown.
Binary file removed client/lib/language_support.jar
View file
Open in desktop
Binary file not shown.
Binary file removed client/lib/rsyntaxtextarea-2.5.6.jar
View file
Open in desktop
Binary file not shown.
Binary file removed donkey/lib/database/jtds-1.3.1.jar
View file
Open in desktop
Binary file not shown.
55 changes: 55 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,20 @@
# gradle/verification-metadata.xml enforces checksums (regenerate it with
# a cold cache after any change here, see CONTRIBUTING.md), and
# gradle/vendored-layout.json places each artifact in the distribution.
#
# Exceptions: autocomplete, hapi-base, hapi-structures-v21 to v26, jtds,
# languagesupport, rsyntaxtextarea and sqlite-jdbc hold the same entries
# as the vendored jars in different zip packaging (sqlite-jdbc's
# manifest also orders its OSGi headers differently).
# dcm4che comes from the dcm4che.org repository.

@tonygermano tonygermano Oct 9, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think these comments are going to be useful to someone looking at this file later. The commit message already explains most of these details.

For rsyntaxtextarea and related fifesoft libs, look how awssdk-netty-nio-client and jackson-core are commented to note that they are off from the rest of the family. I'm assuming these should all eventually be aligned since rsyntaxtextarea and languagesupport are the same and autocomplete is only a couple patch versions behind.


[versions]
# Shared by artifacts released together; bump the whole family at once.
asm = "9.6"
awssdk = "2.15.28"
bouncycastle = "1.78.1"
byte-buddy = "1.14.13"
dcm4che = "2.0.29"

@tonygermano tonygermano Oct 9, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May want to put a comment here to remove the custom repo from build.gradle and pull from maven central when upgrading to 3+ so it will show up in the PR if the version gets bumped.

derby = "10.10.2.0"
flying-saucer = "9.0.1"
hapi = "2.3"
Expand Down Expand Up @@ -96,12 +103,19 @@ commons-net = { module = "commons-net:commons-net", version = "3.9.0" }
commons-pool2 = { module = "org.apache.commons:commons-pool2", version = "2.3" }
commons-text = { module = "org.apache.commons:commons-text", version = "1.15.0" }
commons-vfs2 = { module = "org.apache.commons:commons-vfs2", version = "2.10.0" }
dcm4che-core = { module = "dcm4che:dcm4che-core", version.ref = "dcm4che" }
dcm4che-filecache = { module = "dcm4che:dcm4che-filecache", version.ref = "dcm4che" }
dcm4che-net = { module = "dcm4che:dcm4che-net", version.ref = "dcm4che" }
dcm4che-tool-dcmrcv = { module = "dcm4che.tool:dcm4che-tool-dcmrcv", version.ref = "dcm4che" }
dcm4che-tool-dcmsnd = { module = "dcm4che.tool:dcm4che-tool-dcmsnd", version.ref = "dcm4che" }
derby = { module = "org.apache.derby:derby", version.ref = "derby" }
derbytools = { module = "org.apache.derby:derbytools", version.ref = "derby" }
ecj = { module = "org.eclipse.jdt:ecj", version = "3.19.0" }
error-prone-annotations = { module = "com.google.errorprone:error_prone_annotations", version = "2.3.4" }
failureaccess = { module = "com.google.guava:failureaccess", version = "1.0.1" }
fastinfoset = { module = "com.sun.xml.fastinfoset:FastInfoset", version = "1.2.13" }
fifesoft-autocomplete = { module = "com.fifesoft:autocomplete", version = "2.5.4" }
fifesoft-languagesupport = { module = "com.fifesoft:languagesupport", version = "2.5.6" }
flying-saucer-core = { module = "org.xhtmlrenderer:flying-saucer-core", version.ref = "flying-saucer" }
flying-saucer-pdf = { module = "org.xhtmlrenderer:flying-saucer-pdf", version.ref = "flying-saucer" }
fontbox = { module = "org.apache.pdfbox:fontbox", version.ref = "pdfbox" }
Expand All @@ -113,6 +127,15 @@ gmbal-api-only = { module = "org.glassfish.gmbal:gmbal-api-only", version = "3.1
guava = { module = "com.google.guava:guava", version = "32.0.1-jre" }
guice = { module = "com.google.inject:guice", version = "4.1.0" }
hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
hapi-base = { module = "ca.uhn.hapi:hapi-base", version.ref = "hapi" }
hapi-structures-v21 = { module = "ca.uhn.hapi:hapi-structures-v21", version.ref = "hapi" }
hapi-structures-v22 = { module = "ca.uhn.hapi:hapi-structures-v22", version.ref = "hapi" }
hapi-structures-v23 = { module = "ca.uhn.hapi:hapi-structures-v23", version.ref = "hapi" }
hapi-structures-v231 = { module = "ca.uhn.hapi:hapi-structures-v231", version.ref = "hapi" }
hapi-structures-v24 = { module = "ca.uhn.hapi:hapi-structures-v24", version.ref = "hapi" }
hapi-structures-v25 = { module = "ca.uhn.hapi:hapi-structures-v25", version.ref = "hapi" }
hapi-structures-v251 = { module = "ca.uhn.hapi:hapi-structures-v251", version.ref = "hapi" }
hapi-structures-v26 = { module = "ca.uhn.hapi:hapi-structures-v26", version.ref = "hapi" }
hapi-structures-v27 = { module = "ca.uhn.hapi:hapi-structures-v27", version.ref = "hapi" }
hapi-structures-v28 = { module = "ca.uhn.hapi:hapi-structures-v28", version.ref = "hapi" }
hapi-structures-v281 = { module = "ca.uhn.hapi:hapi-structures-v281", version.ref = "hapi" }
Expand Down Expand Up @@ -198,6 +221,7 @@ joda-time = { module = "joda-time:joda-time", version = "2.9.9" }
jsch = { module = "com.github.mwiede:jsch", version = "2.27.7" }
jsr181-api = { module = "javax.jws:jsr181-api", version = "1.0-MR1" }
jsr305 = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" }
jtds = { module = "net.sourceforge.jtds:jtds", version = "1.3.1" }
junit = { module = "junit:junit", version = "4.13.1" }
junit-platform-console-standalone = { module = "org.junit.platform:junit-platform-console-standalone", version = "1.11.4" }
libphonenumber = { module = "com.googlecode.libphonenumber:libphonenumber", version = "8.12.50" }
Expand Down Expand Up @@ -239,10 +263,12 @@ quartz = { module = "org.quartz-scheduler:quartz", version = "2.3.2" }
reactive-streams = { module = "org.reactivestreams:reactive-streams", version = "1.0.3" }
reflections = { module = "org.reflections:reflections", version = "0.9.10" }
rhino = { module = "org.mozilla:rhino", version = "1.7.13" }
rsyntaxtextarea = { module = "com.fifesoft:rsyntaxtextarea", version = "2.5.6" }

@NicoPiel NicoPiel Oct 9, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be fifesoft-rsyntaxtextarea?

saaj-impl = { module = "com.sun.xml.messaging.saaj:saaj-impl", version = "1.4.0" }
slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
slf4j-log4j12 = { module = "org.slf4j:slf4j-log4j12", version.ref = "slf4j" }
snakeyaml = { module = "org.yaml:snakeyaml", version = "2.5" }
sqlite-jdbc = { module = "org.xerial:sqlite-jdbc", version = "3.43.2.1" }
stax-ex = { module = "org.jvnet.staxex:stax-ex", version = "1.8" }
staxon = { module = "de.odysseus.staxon:staxon", version = "1.3" }
streambuffer = { module = "com.sun.xml.stream.buffer:streambuffer", version = "1.5.4" }
Expand Down Expand Up @@ -282,7 +308,18 @@ client-main = [
"commons-pool2",
"commons-text",
"commons-vfs2",
"fifesoft-autocomplete",
"fifesoft-languagesupport",
"guava",
"hapi-base",
"hapi-structures-v21",
"hapi-structures-v22",
"hapi-structures-v23",
"hapi-structures-v231",
"hapi-structures-v24",
"hapi-structures-v25",
"hapi-structures-v251",
"hapi-structures-v26",
"hapi-structures-v27",
"hapi-structures-v28",
"hapi-structures-v281",
Expand Down Expand Up @@ -323,6 +360,7 @@ client-main = [
"quartz",
"reflections",
"rhino",
"rsyntaxtextarea",
"slf4j-api",
"slf4j-log4j12",
"staxon",
Expand Down Expand Up @@ -412,6 +450,7 @@ donkey-main = [
"j2objc-annotations",
"javassist",
"jsr305",
"jtds",
"listenablefuture",
"log4j-1-2-api",
"log4j-api",
Expand Down Expand Up @@ -448,6 +487,11 @@ generator-main = [
"velocity-engine-core",
]
server-extensions = [
"dcm4che-core",
"dcm4che-filecache",
"dcm4che-net",
"dcm4che-tool-dcmrcv",
"dcm4che-tool-dcmsnd",
"flying-saucer-core",
"flying-saucer-pdf",
"fontbox",
Expand Down Expand Up @@ -523,6 +567,15 @@ server-main = [
"glassfish-management-api",
"gmbal-api-only",
"guice",
"hapi-base",
"hapi-structures-v21",
"hapi-structures-v22",
"hapi-structures-v23",
"hapi-structures-v231",
"hapi-structures-v24",
"hapi-structures-v25",
"hapi-structures-v251",
"hapi-structures-v26",
"hapi-structures-v27",
"hapi-structures-v28",
"hapi-structures-v281",
Expand Down Expand Up @@ -595,6 +648,7 @@ server-main = [
"joda-time",
"jsch",
"jsr181-api",
"jtds",
"log4j-1-2-api",
"log4j-api",
"log4j-core",
Expand Down Expand Up @@ -624,6 +678,7 @@ server-main = [
"rhino",
"saaj-impl",
"snakeyaml",
"sqlite-jdbc",
"stax-ex",
"staxon",
"streambuffer",
Expand Down
32 changes: 32 additions & 0 deletions gradle/vendored-layout.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
{
"client": {
"ca.uhn.hapi:hapi-base": "",
"ca.uhn.hapi:hapi-structures-v21": "",
"ca.uhn.hapi:hapi-structures-v22": "",
"ca.uhn.hapi:hapi-structures-v23": "",
"ca.uhn.hapi:hapi-structures-v231": "",
"ca.uhn.hapi:hapi-structures-v24": "",
"ca.uhn.hapi:hapi-structures-v25": "",
"ca.uhn.hapi:hapi-structures-v251": "",
"ca.uhn.hapi:hapi-structures-v26": "",
"ca.uhn.hapi:hapi-structures-v27": "",
"ca.uhn.hapi:hapi-structures-v28": "",
"ca.uhn.hapi:hapi-structures-v281": "",
"com.fasterxml.jackson.core:jackson-annotations": "",
"com.fasterxml.jackson.core:jackson-core": "",
"com.fasterxml.jackson.core:jackson-databind": "",
"com.fifesoft:autocomplete": "",
"com.fifesoft:languagesupport": {
"dir": "",
"file": "language_support.jar"
},
"com.fifesoft:rsyntaxtextarea": "",
"com.github.zafarkhaja:java-semver": "",
"com.google.guava:guava": "",
"com.googlecode.libphonenumber:libphonenumber": "",
Expand Down Expand Up @@ -141,6 +156,7 @@
"commons-dbutils:commons-dbutils": "commons",
"commons-io:commons-io": "commons",
"commons-logging:commons-logging": "commons",
"net.sourceforge.jtds:jtds": "database",
"org.apache.commons:commons-collections4": "commons",
"org.apache.commons:commons-dbcp2": "commons",
"org.apache.commons:commons-lang3": "commons",
Expand Down Expand Up @@ -171,6 +187,15 @@
"org.slf4j:slf4j-log4j12": ""
},
"server": {
"ca.uhn.hapi:hapi-base": "hapi",
"ca.uhn.hapi:hapi-structures-v21": "hapi",
"ca.uhn.hapi:hapi-structures-v22": "hapi",
"ca.uhn.hapi:hapi-structures-v23": "hapi",
"ca.uhn.hapi:hapi-structures-v231": "hapi",
"ca.uhn.hapi:hapi-structures-v24": "hapi",
"ca.uhn.hapi:hapi-structures-v25": "hapi",
"ca.uhn.hapi:hapi-structures-v251": "hapi",
"ca.uhn.hapi:hapi-structures-v26": "hapi",
"ca.uhn.hapi:hapi-structures-v27": "hapi",
"ca.uhn.hapi:hapi-structures-v28": "hapi",
"ca.uhn.hapi:hapi-structures-v281": "hapi",
Expand Down Expand Up @@ -249,6 +274,7 @@
"joda-time:joda-time": "",
"net.java.dev.jna:jna": "",
"net.java.dev.jna:jna-platform": "",
"net.sourceforge.jtds:jtds": "database",
"org.apache.commons:commons-collections4": "commons",
"org.apache.commons:commons-compress": "commons",
"org.apache.commons:commons-configuration2": "commons",
Expand Down Expand Up @@ -356,6 +382,7 @@
"org.quartz-scheduler:quartz": "",
"org.reactivestreams:reactive-streams": "aws/ext",
"org.reflections:reflections": "swagger/ext",
"org.xerial:sqlite-jdbc": "database",
"org.yaml:snakeyaml": "jackson",
"software.amazon.awssdk:annotations": "aws",
"software.amazon.awssdk:apache-client": "aws",
Expand Down Expand Up @@ -383,6 +410,11 @@
"com.lowagie:itext-rtf": "extensions/doc",
"com.openhtmltopdf:openhtmltopdf-core": "extensions/doc",
"com.openhtmltopdf:openhtmltopdf-pdfbox": "extensions/doc",
"dcm4che.tool:dcm4che-tool-dcmrcv": "extensions/dimse",
"dcm4che.tool:dcm4che-tool-dcmsnd": "extensions/dimse",
"dcm4che:dcm4che-core": "extensions/dimse",
"dcm4che:dcm4che-filecache": "extensions/dimse",
"dcm4che:dcm4che-net": "extensions/dimse",
"de.rototor.pdfbox:graphics2d": "extensions/doc",
"eu.agno3.jcifs:jcifs-ng": "extensions/file",
"gov.nih.imagej:imagej": {
Expand Down
Loading
Loading