diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml new file mode 100644 index 0000000..3d41e67 --- /dev/null +++ b/.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 + - 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: 'esign-plugin-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 diff --git a/.github/workflows/release-cut-rc.yml b/.github/workflows/release-cut-rc.yml new file mode 100644 index 0000000..b54e824 --- /dev/null +++ b/.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/-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: develop)' + type: string + required: false + default: develop + 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 diff --git a/.github/workflows/release-promote.yml b/.github/workflows/release-promote.yml new file mode 100644 index 0000000..09416fb --- /dev/null +++ b/.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 diff --git a/build.gradle b/build.gradle index 4ddb2e2..af1d1b2 100644 --- a/build.gradle +++ b/build.gradle @@ -6,23 +6,20 @@ def pluginName = 'esign_plugin' def groupName = 'com.radiologics' -def pluginVersion = '1.1.0-SNAPSHOT' group groupName -version pluginVersion +version "1.1.0-SNAPSHOT" apply plugin: 'java' -apply plugin: 'maven' apply plugin: "maven-publish" apply plugin: 'eclipse' apply plugin: 'idea' apply plugin: 'io.spring.dependency-management' -apply plugin: 'com.github.jk1.dependency-license-report' buildscript { ext { - vXnat = "1.9.0-RC-SNAPSHOT" + vXnat = "1.10.1-SNAPSHOT" } repositories { maven { url "https://plugins.gradle.org/m2/" } @@ -32,13 +29,14 @@ buildscript { mavenCentral() } dependencies { - classpath "io.spring.gradle:dependency-management-plugin:1.0.6.RELEASE" - classpath 'com.github.jk1:gradle-license-report:1.16' + classpath "io.spring.gradle:dependency-management-plugin:1.1.7" } } -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 +} repositories { mavenLocal() @@ -60,12 +58,44 @@ dependencies { exclude group: '*' } - implementation "org.nrg.xnat:xnat-data-models" + // xnat-data-models merged into xnat-web in monorepo 1.10 implementation "commons-collections:commons-collections" implementation "commons-io:commons-io" implementation "javax.mail:javax.mail-api" implementation "org.springframework:spring-jdbc" - + implementation "org.nrg:framework" + implementation "org.apache.commons:commons-lang3" + implementation "org.restlet:org.restlet" + implementation "org.nrg:config" + implementation "org.nrg:mail" + implementation "log4j:log4j:1.2.17" + annotationProcessor "org.nrg:framework" + + // Compile-only deps that xnat-web no longer surfaces on consumer compileClasspath in monorepo 1.10.1+ + implementation("turbine:turbine") { + exclude group: "commons-dbcp" + exclude group: "commons-email" + exclude group: "commons-pool" + exclude group: "fulcrum" + exclude group: "javax.activation", module: "activation" + exclude group: "javax.mail" + exclude group: "javax.servlet" + exclude group: "jython" + exclude group: "xalan" + exclude group: "xml-apis" + exclude group: "log4j", module: "log4j" + exclude group: "berkeleydb" + exclude group: "javax.sql" + exclude group: "jndi" + exclude group: "mysql" + exclude group: "tomcat" + exclude group: "xerces" + exclude group: "velocity", module: "texen" + exclude group: "jamon", module: "jamon" + } + compileOnly("org.apache.velocity:velocity") { transitive = false } + compileOnly "javax.servlet:javax.servlet-api" + compileOnly "ecs:ecs" } publishing { @@ -73,16 +103,31 @@ publishing { maven(MavenPublication) { groupId = groupName artifactId = pluginName - version = pluginVersion + version = project.version from components.java } } + repositories { + maven { + 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")) ?: "" + } + } + } } idea { module { inheritOutputDirs = false - outputDir = compileJava.destinationDir - testOutputDir = compileTestJava.destinationDir + outputDir = compileJava.destinationDirectory.asFile.get() + testOutputDir = compileTestJava.destinationDirectory.asFile.get() } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 3bca1c6..d997cfc 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 72012ec..c61a118 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Wed Dec 06 14:49:02 CST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip