INTERNAL-2043 Add GitHub release actions to open-source plugin repos

.github/workflows/build-publish.yml

@@ -0,0 +1,40 @@
+name: Build and Publish
+
+# Thin caller around the shared reusable workflow in
+# NrgXnat/xnat-ci-workflows. Plugin variant — no GHCR Docker image
+# (plugins ship a jar to JFrog only).
+
+on:
+  push:
+    branches:
+      - main
+      - dev            # container-service uses 'dev' instead of 'develop'
+      - 'releases/*'   # RC / release branches, e.g. releases/1.6.0-rc
+  workflow_dispatch:
+    inputs:
+      publish_jfrog:
+        description: 'Publish jar to JFrog Artifactory (nrgxnat)'
+        type: boolean
+        default: false
+
+permissions:
+  contents: read
+  packages: write   # required by reusable workflow's publish-ghcr job (gated by if: inputs.publish-ghcr but parsed at startup)
+
+jobs:
+  build-publish:
+    uses: NrgXnat/xnat-ci-workflows/.github/workflows/gradle-build-publish.yml@v1
+    with:
+      # ──── Artifact ────
+      artifact-glob: 'build/libs/*.jar'
+      artifact-name: 'container-service-jar'
+
+      # ──── JFrog ────
+      # On any push to a triggered branch: publish. On dispatch: only when publish_jfrog ticked.
+      publish-jfrog: ${{ github.event_name == 'push' || inputs.publish_jfrog }}
+
+      # publish-ghcr deliberately omitted — defaults to false in the reusable workflow.
+
+    # secrets: inherit passes XNAT_ARTIFACTORY_USER/TOKEN (org-level) and
+    # the auto-injected GITHUB_TOKEN through to the reusable workflow.
+    secrets: inherit

.github/workflows/release-cut-rc.yml

@@ -0,0 +1,37 @@
+name: Release - Cut RC Branch
+
+# Thin caller around the shared reusable workflow in NrgXnat/xnat-ci-workflows.
+# Cuts a `releases/<release>-rc` branch from source_branch and bumps
+# source_branch to the next dev version. All release-cut logic lives in the
+# reusable workflow; this file only defines our triggers + inputs.
+
+on:
+  workflow_dispatch:
+    inputs:
+      next_dev_version:
+        description: 'Next dev SNAPSHOT version (e.g. 1.7.0-SNAPSHOT)'
+        type: string
+        required: true
+      source_branch:
+        description: 'Branch to cut from (default: dev)'
+        type: string
+        required: false
+        default: dev
+      trigger_build:
+        description: 'After cut, dispatch build/publish on RC and source_branch'
+        type: boolean
+        required: false
+        default: true
+
+permissions:
+  contents: write
+  actions:  write   # dispatch build-publish workflow
+
+jobs:
+  cut-rc:
+    uses: NrgXnat/xnat-ci-workflows/.github/workflows/gradle-release-cut-rc.yml@v1
+    with:
+      next_dev_version: ${{ inputs.next_dev_version }}
+      source_branch:    ${{ inputs.source_branch }}
+      trigger_build:    ${{ inputs.trigger_build }}
+    secrets: inherit

.github/workflows/release-promote.yml

@@ -0,0 +1,37 @@
+name: Release - Promote RC to Main
+
+# Thin caller around the shared reusable workflow in NrgXnat/xnat-ci-workflows.
+# Promotes a stabilized RC branch to a tagged release on target_main. All
+# release-promote logic lives in the reusable workflow; this file only defines
+# our triggers + inputs.
+
+on:
+  workflow_dispatch:
+    inputs:
+      rc_branch:
+        description: 'RC branch to promote (e.g. releases/1.6.0-rc)'
+        type: string
+        required: true
+      target_main:
+        description: 'Branch to merge into (default main)'
+        type: string
+        required: false
+        default: main
+      trigger_build:
+        description: 'After promote, dispatch build/publish on target_main'
+        type: boolean
+        required: false
+        default: true
+
+permissions:
+  contents: write   # push RC/main + create tag
+  actions:  write   # dispatch build-publish workflow
+
+jobs:
+  promote:
+    uses: NrgXnat/xnat-ci-workflows/.github/workflows/gradle-release-promote.yml@v1
+    with:
+      rc_branch:     ${{ inputs.rc_branch }}
+      target_main:   ${{ inputs.target_main }}
+      trigger_build: ${{ inputs.trigger_build }}
+    secrets: inherit

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        vXnat = "1.9.3"
+        vXnat = "1.10.1-SNAPSHOT"
         pluginAppName = "XNAT Container Service"
     }
 }
@@ -12,18 +12,17 @@ plugins {
     id "com.palantir.git-version" version "3.3.0"
     id "io.spring.dependency-management" version "1.1.7"
     id "io.franzbecker.gradle-lombok" version "5.0.0"
-    id "net.linguica.maven-settings" version "0.5"
 }
 
 group "org.nrg.xnatx.plugins"
 version "3.9.0-SNAPSHOT"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = 21
+    targetCompatibility = 21
 }
 
-def vMockito = "1.10.19"
+def vMockito = "5.7.0"
 def vJavassist = "3.21.0-GA"
 def vAwaitility = "2.0.0"
 
@@ -38,32 +37,40 @@ dependencyManagement {
     imports {
         mavenBom("org.nrg:parent:${vXnat}") {
             bomProperties([
-                    "mockito.version": vMockito,
                     "javassist.version": vJavassist
             ])
         }
     }
 }
 
 def vDockerJava = "3.4.0.1"
-def vAutoValue = "1.3"
+def vAutoValue = "1.5.4"
 def vKubernetesClient = "15.0.+"
-def vPowerMock = "1.7.0"
-def vGson = dependencyManagement.importedProperties["gson.version"]
-def vJackson = dependencyManagement.importedProperties["jackson.version"]
-def vSpringSecurity = dependencyManagement.importedProperties["spring-security.version"]
-def vActiveMQ = dependencyManagement.importedProperties["activemq.version"]
+def vPowerMock = "2.0.9"
+// importedProperties not available from Gradle java-platform BOM — versions managed by BOM directly
 
 // Use this configuration to put dependencies into the fat jar
 configurations {
     implementation.extendsFrom(implementAndInclude)
     all {
         resolutionStrategy.force "org.mockito:mockito-core:${vMockito}"
+        resolutionStrategy.force "com.github.docker-java:docker-java-api:${vDockerJava}"
 
         exclude group: "org.bouncycastle"
     }
 }
 
+tasks.withType(Test).configureEach {
+//        jvmArgs("--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED")
+        jvmArgs("--add-opens", "java.xml/jdk.xml.internal=ALL-UNNAMED")
+        jvmArgs("--add-opens", "java.base/java.lang=ALL-UNNAMED")
+    }
+
+lombok {
+    version = "1.18.34"
+    sha256 = "1ea5ad6c6afcff902d75072b2aaa6695585aebee9f12127e15c0036ba95d2918"
+}
+
 dependencies {
     annotationProcessor "org.nrg:framework"
     annotationProcessor "com.google.auto.value:auto-value:${vAutoValue}"
@@ -105,9 +112,7 @@ dependencies {
     implementation ("org.nrg.xdat:core") {
         transitive = false
     }
-    implementation ("org.nrg.xnat:xnat-data-models") {
-        transitive = false
-    }
+    // xnat-data-models merged into org.nrg.xnat:web in monorepo — no longer a separate artifact
     implementation "org.nrg:prefs"
     implementation ("org.nrg:notify") {
         exclude group: "cglib"
@@ -131,8 +136,8 @@ dependencies {
     implementation "org.springframework:spring-webmvc"
     implementation "org.springframework:spring-jms"
     implementation "org.springframework:spring-messaging"
-    implementation "javax.jms:javax.jms-api:2.0.1"
-    implementation "org.apache.activemq:activemq-all:${vActiveMQ}"
+    implementation "javax.jms:javax.jms-api"
+    implementation "org.apache.activemq:activemq-all"
     implementation "org.aspectj:aspectjweaver"
 
     implementation "io.springfox:springfox-swagger2"
@@ -144,8 +149,8 @@ dependencies {
     implementation "com.fasterxml.jackson.core:jackson-annotations"
     implementation "com.fasterxml.jackson.core:jackson-core"
     implementation "com.fasterxml.jackson.core:jackson-databind"
-    implementation "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:${vJackson}"
-    implementation "com.fasterxml.jackson.datatype:jackson-datatype-guava:${vJackson}"
+    implementation "com.fasterxml.jackson.module:jackson-module-jaxb-annotations"
+    implementation "com.fasterxml.jackson.datatype:jackson-datatype-guava"
 
     implementation "com.jayway.jsonpath:json-path"
 
@@ -163,7 +168,7 @@ dependencies {
     implementation ("org.apache.velocity:velocity") {
         transitive = false
     }
-    implementation ("xalan:xalan") {
+    implementation ("xalan:xalan:2.7.2") {
         transitive = false
     }
 
@@ -174,39 +179,47 @@ dependencies {
     runtimeOnly "org.apache.commons:commons-compress"
     runtimeOnly "org.apache.commons:commons-lang3"
     runtimeOnly "org.apache.httpcomponents:httpclient"
-    runtimeOnly "com.google.code.gson:gson:${vGson}"
+    runtimeOnly "com.google.code.gson:gson"
     runtimeOnly "com.google.code.findbugs:jsr305"
     runtimeOnly "org.yaml:snakeyaml:1.15+"
 
-    testImplementation "junit:junit"
+    testImplementation "junit:junit:4.13.2"
+    testImplementation(platform('org.junit:junit-bom:5.10.2'))
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     testImplementation "org.hamcrest:hamcrest-library"
     testImplementation "org.springframework:spring-test"
-    testImplementation "org.springframework.security:spring-security-test:${vSpringSecurity}"
+    testImplementation "org.springframework.security:spring-security-test"
     testImplementation "org.springframework.security:spring-security-config"
-    testImplementation "org.mockito:mockito-core"
+    testImplementation "org.mockito:mockito-core:${vMockito}"
+    testImplementation 'org.mockito:mockito-junit-jupiter:5.0.0'  // JUnit 5 integration for Mockito
+
     testImplementation "javax.servlet:javax.servlet-api"
     testImplementation "com.h2database:h2"
     testImplementation "org.springframework:spring-jdbc"
     testImplementation "org.springframework:spring-orm"
     testImplementation "org.apache.commons:commons-dbcp2"
     testImplementation "commons-net:commons-net"
-    testImplementation "org.powermock:powermock-module-junit4:${vPowerMock}"
-    testImplementation "org.powermock:powermock-api-mockito:${vPowerMock}"
     testImplementation "org.awaitility:awaitility:${vAwaitility}"
     testImplementation "org.testcontainers:junit-jupiter:1.19.0"
     testImplementation "org.testcontainers:postgresql:1.19.0"
 }
 
 test {
+    useJUnitPlatform()
     systemProperty "integration", System.getProperty('integration') == "true"
 }
 
 tasks.register ( 'unitTest', Test ) {
+    useJUnitPlatform()
+
     systemProperties['integration'] = "false"
     test
 }
 
 tasks.register ( 'integrationTest', Test ) {
+    useJUnitPlatform()
     systemProperties['integration'] = "true"
     test
 }
@@ -236,23 +249,23 @@ try {
     isCleanTag = false
 }
 
-ext.gitManifest = manifest {
-    attributes "Application-Name": pluginAppName,
-            "Build-Date": buildDate,
-            "Build-Number": buildNumber,
-            "Implementation-Version": project.version,
-            "Implementation-Sha": gitHash,
-            "Implementation-Sha-Full": gitHashFull,
-            "Implementation-Commit": commitDistance,
-            "Implementation-LastTag": lastTag,
-            "Implementation-Branch": branchName,
-            "Implementation-CleanTag": isCleanTag,
-            "Implementation-Dirty": isDirty
-}
+ext.gitManifestAttrs = [
+        "Application-Name"        : pluginAppName,
+        "Build-Date"              : buildDate,
+        "Build-Number"            : buildNumber,
+        "Implementation-Version"  : project.version,
+        "Implementation-Sha"      : gitHash,
+        "Implementation-Sha-Full" : gitHashFull,
+        "Implementation-Commit"   : commitDistance,
+        "Implementation-LastTag"  : lastTag,
+        "Implementation-Branch"   : branchName,
+        "Implementation-CleanTag" : isCleanTag,
+        "Implementation-Dirty"    : isDirty
+]
 
 task fatJar(type: Jar) {
     zip64 true
-    classifier = "fat"
+    archiveClassifier.set("fat")
     from {
         configurations.implementAndInclude.collect { it.isDirectory() ? it : zipTree(it) }
     } {
@@ -262,7 +275,7 @@ task fatJar(type: Jar) {
     }
     duplicatesStrategy "exclude"
     manifest {
-        from gitManifest
+        attributes gitManifestAttrs
     }
     with jar
 }
@@ -274,7 +287,7 @@ sourceSets.main.java {
 
 jar{
     manifest {
-        from gitManifest
+        attributes gitManifestAttrs
     }
     doLast {
         if (!gradle.taskGraph.hasTask(":fatJar")) {
@@ -284,17 +297,17 @@ jar{
 }
 
 task sourceJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
+    archiveClassifier.set("sources")
     manifest {
-        from gitManifest
+        attributes gitManifestAttrs
     }
     from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = "javadoc"
+    archiveClassifier.set("javadoc")
     manifest {
-        from gitManifest
+        attributes gitManifestAttrs
     }
     from javadoc.destinationDir
 }
@@ -345,13 +358,17 @@ publishing {
     }
     repositories {
         maven {
-            if (project.version.endsWith("-SNAPSHOT")) {
-                url "https://nrgxnat.jfrog.io/nrgxnat/libs-snapshot-local"
-            } else {
-                url "https://nrgxnat.jfrog.io/nrgxnat/libs-release-local"
-            }
-            // The value for name must match <id> in ~/.m2/settings.xml
             name = "XNAT_Artifactory"
+            url = project.version.toString().endsWith("-SNAPSHOT")
+                ? "https://nrgxnat.jfrog.io/nrgxnat/libs-snapshot-local"
+                : "https://nrgxnat.jfrog.io/nrgxnat/libs-release-local"
+            // CI injects ORG_GRADLE_PROJECT_artifactoryUser/Token env vars (Gradle maps
+            // these to project properties). Local devs can set artifactoryUser/Token in
+            // ~/.gradle/gradle.properties. Mirrors monorepo's buildSrc convention.
+            credentials {
+                username = (project.findProperty("artifactoryUser")  ?: System.getenv("ARTIFACTORY_USER"))  ?: ""
+                password = (project.findProperty("artifactoryToken") ?: System.getenv("ARTIFACTORY_TOKEN")) ?: ""
+            }
         }
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists