From 26ffef7fc7e191e083411d2abad7be88adb111c6 Mon Sep 17 00:00:00 2001 From: Patrick Dowler Date: Thu, 26 Feb 2026 11:22:05 -0800 Subject: [PATCH 1/4] update opencadc.gradle --- cadc-cdp/build.gradle | 3 +++ opencadc.gradle | 36 +++++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/cadc-cdp/build.gradle b/cadc-cdp/build.gradle index 603b54d..f114376 100644 --- a/cadc-cdp/build.gradle +++ b/cadc-cdp/build.gradle @@ -2,6 +2,7 @@ plugins { id 'java-library' id 'maven-publish' id 'application' + id 'checkstyle' } repositories { @@ -9,6 +10,8 @@ repositories { mavenLocal() } +apply from: '../opencadc.gradle' + sourceCompatibility = 11 group = 'org.opencadc' diff --git a/opencadc.gradle b/opencadc.gradle index 25e6331..a2ea655 100644 --- a/opencadc.gradle +++ b/opencadc.gradle @@ -1,12 +1,14 @@ configurations { checkstyleDep - intTestCompile.extendsFrom testCompile - intTestRuntime.extendsFrom testRuntime + intTestImplementation.extendsFrom testImplementation + + runtimeOnly.exclude module: 'slf4j-reload4j' + runtimeOnly.exclude module: 'reload4j' } dependencies { - testCompile 'com.puppycrawl.tools:checkstyle:8.2' - checkstyleDep 'org.opencadc:cadc-quality:[1.0,)' + testImplementation 'com.puppycrawl.tools:checkstyle:8.2' + checkstyleDep 'org.opencadc:cadc-quality:[1.0,1.1)' } checkstyle { @@ -17,26 +19,22 @@ checkstyle { } sourceSets { - test { - resources.srcDirs += 'src/test/resources' - } intTest { java { compileClasspath += main.output + test.output - runtimeClasspath += main.output + test.output + runtimeClasspath += compileClasspath } - resources.srcDir file('src/intTest/resources') + resources.srcDirs += file('src/intTest/resources') resources.srcDirs += new File(System.getenv('A') + '/test-certificates/') } } // Temporary work around for issue https://github.com/gradle/gradle/issues/881 - // gradle not displaying fail build status when warnings reported --> - tasks.withType(Checkstyle).each { checkstyleTask -> checkstyleTask.doLast { reports.all { report -> - def outputFile = report.destination + def outputFile = report.outputLocation.get().asFile if (outputFile.exists() && outputFile.text.contains(" Date: Thu, 26 Feb 2026 11:24:31 -0800 Subject: [PATCH 2/4] move cadc-cert-gen to obsolete --- {cadc-cert-gen => obsolete/cadc-cert-gen}/README.md | 0 {cadc-cert-gen => obsolete/cadc-cert-gen}/build.gradle | 0 .../src/main/java/ca/nrc/cadc/cert/AbstractCertGenAction.java | 0 .../src/main/java/ca/nrc/cadc/cert/CertGenAction.java | 0 .../src/main/java/ca/nrc/cadc/cert/DbCertGenAction.java | 0 .../cadc-cert-gen}/src/main/java/ca/nrc/cadc/cert/Main.java | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename {cadc-cert-gen => obsolete/cadc-cert-gen}/README.md (100%) rename {cadc-cert-gen => obsolete/cadc-cert-gen}/build.gradle (100%) rename {cadc-cert-gen => obsolete/cadc-cert-gen}/src/main/java/ca/nrc/cadc/cert/AbstractCertGenAction.java (100%) rename {cadc-cert-gen => obsolete/cadc-cert-gen}/src/main/java/ca/nrc/cadc/cert/CertGenAction.java (100%) rename {cadc-cert-gen => obsolete/cadc-cert-gen}/src/main/java/ca/nrc/cadc/cert/DbCertGenAction.java (100%) rename {cadc-cert-gen => obsolete/cadc-cert-gen}/src/main/java/ca/nrc/cadc/cert/Main.java (100%) diff --git a/cadc-cert-gen/README.md b/obsolete/cadc-cert-gen/README.md similarity index 100% rename from cadc-cert-gen/README.md rename to obsolete/cadc-cert-gen/README.md diff --git a/cadc-cert-gen/build.gradle b/obsolete/cadc-cert-gen/build.gradle similarity index 100% rename from cadc-cert-gen/build.gradle rename to obsolete/cadc-cert-gen/build.gradle diff --git a/cadc-cert-gen/src/main/java/ca/nrc/cadc/cert/AbstractCertGenAction.java b/obsolete/cadc-cert-gen/src/main/java/ca/nrc/cadc/cert/AbstractCertGenAction.java similarity index 100% rename from cadc-cert-gen/src/main/java/ca/nrc/cadc/cert/AbstractCertGenAction.java rename to obsolete/cadc-cert-gen/src/main/java/ca/nrc/cadc/cert/AbstractCertGenAction.java diff --git a/cadc-cert-gen/src/main/java/ca/nrc/cadc/cert/CertGenAction.java b/obsolete/cadc-cert-gen/src/main/java/ca/nrc/cadc/cert/CertGenAction.java similarity index 100% rename from cadc-cert-gen/src/main/java/ca/nrc/cadc/cert/CertGenAction.java rename to obsolete/cadc-cert-gen/src/main/java/ca/nrc/cadc/cert/CertGenAction.java diff --git a/cadc-cert-gen/src/main/java/ca/nrc/cadc/cert/DbCertGenAction.java b/obsolete/cadc-cert-gen/src/main/java/ca/nrc/cadc/cert/DbCertGenAction.java similarity index 100% rename from cadc-cert-gen/src/main/java/ca/nrc/cadc/cert/DbCertGenAction.java rename to obsolete/cadc-cert-gen/src/main/java/ca/nrc/cadc/cert/DbCertGenAction.java diff --git a/cadc-cert-gen/src/main/java/ca/nrc/cadc/cert/Main.java b/obsolete/cadc-cert-gen/src/main/java/ca/nrc/cadc/cert/Main.java similarity index 100% rename from cadc-cert-gen/src/main/java/ca/nrc/cadc/cert/Main.java rename to obsolete/cadc-cert-gen/src/main/java/ca/nrc/cadc/cert/Main.java From 8f25de5b8848da3295bdf4d4a5a081a7da49e1f4 Mon Sep 17 00:00:00 2001 From: Patrick Dowler Date: Thu, 26 Feb 2026 12:29:07 -0800 Subject: [PATCH 3/4] cadc-cdp: update some dependencies to api --- cadc-cdp/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cadc-cdp/build.gradle b/cadc-cdp/build.gradle index f114376..c772e68 100644 --- a/cadc-cdp/build.gradle +++ b/cadc-cdp/build.gradle @@ -25,10 +25,10 @@ mainClassName = 'ca.nrc.cadc.cred.client.Main' dependencies { implementation 'xerces:xercesImpl:[2.12.1,3.0)' - implementation 'org.bouncycastle:bcprov-jdk18on:[1.70,2.0)' - implementation 'org.bouncycastle:bcpkix-jdk18on:[1.70,2.0)' - implementation 'org.opencadc:cadc-util:[1.11,)' - implementation 'org.opencadc:cadc-registry:[1.4,)' + api 'org.bouncycastle:bcprov-jdk18on:[1.70,2.0)' + api 'org.bouncycastle:bcpkix-jdk18on:[1.70,2.0)' + api 'org.opencadc:cadc-util:[1.11,)' + api 'org.opencadc:cadc-registry:[1.4,)' implementation 'javax.servlet:javax.servlet-api:3.1.0' testImplementation 'junit:junit:[4.13,5.0)' From 191913ae733aeb0d68367b6d563a27551eec0ef0 Mon Sep 17 00:00:00 2001 From: Patrick Dowler Date: Thu, 26 Feb 2026 12:34:59 -0800 Subject: [PATCH 4/4] fix build dependencies --- cadc-cdp/build.gradle | 7 ++++--- cred/build.gradle | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cadc-cdp/build.gradle b/cadc-cdp/build.gradle index c772e68..1b8ef9b 100644 --- a/cadc-cdp/build.gradle +++ b/cadc-cdp/build.gradle @@ -24,11 +24,12 @@ def git_url = 'https://github.com/opencadc/cdp' mainClassName = 'ca.nrc.cadc.cred.client.Main' dependencies { - implementation 'xerces:xercesImpl:[2.12.1,3.0)' + // control the BC version here api 'org.bouncycastle:bcprov-jdk18on:[1.70,2.0)' api 'org.bouncycastle:bcpkix-jdk18on:[1.70,2.0)' - api 'org.opencadc:cadc-util:[1.11,)' - api 'org.opencadc:cadc-registry:[1.4,)' + + implementation 'org.opencadc:cadc-util:[1.11,)' + implementation 'org.opencadc:cadc-registry:[1.4,)' implementation 'javax.servlet:javax.servlet-api:3.1.0' testImplementation 'junit:junit:[4.13,5.0)' diff --git a/cred/build.gradle b/cred/build.gradle index d0f5e35..e4fbf20 100644 --- a/cred/build.gradle +++ b/cred/build.gradle @@ -26,8 +26,7 @@ dependencies { implementation 'org.opencadc:cadc-vosi:[1.4.9,)' implementation 'org.opencadc:cadc-log:[1.2.1,)' implementation 'org.opencadc:cadc-cdp:[1.4.0,)' - - runtimeOnly 'org.opencadc:cadc-registry:[1.7.6,)' + implementation 'org.opencadc:cadc-registry:[1.7.6,)' runtimeOnly 'org.opencadc:cadc-gms:[1.0.12,)' runtimeOnly 'org.opencadc:cadc-access-control-identity:[1.2.5,)'