Skip to content

8333146: Move maven publication logic from build.gradle #1970

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
Maran23 wants to merge 9 commits into
base: master
Choose a base branch
from
+258 −194
Open

8333146: Move maven publication logic from build.gradle #1970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1af9633
8333146: Move maven publication logic from build.gradle
Maran23 Nov 11, 2025
2b45aa6
Copyright header
Maran23 Nov 14, 2025
729a8b0
Move MAVEN_GROUP_ID and fail() over to maven-publish.gradle
Maran23 Nov 16, 2025
acf1e32
Further reduce coupling between main build.gradle and maven-publish.g…
Maran23 Nov 16, 2025
b465f5e
Use projects directly
Maran23 Nov 16, 2025
f64b684
remove print
Maran23 Nov 16, 2025
ea0b427
Merge branch 'master' of https://github.com/openjdk/jfx into 833146-m…
Maran23 Nov 16, 2025
6d8e728
Depend maven publishing on the build modules task
Maran23 Nov 18, 2025
74a9d1f
Use defineProperty and fail method from default build.gradle
Maran23 Nov 18, 2025
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
204 changes: 10 additions & 194 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
*/
defaultTasks = ["sdk"]

import com.sun.javafx.gradle.CompileTarget

import java.nio.file.Files
import java.nio.file.StandardCopyOption
import java.time.Instant
Expand Down Expand Up @@ -165,16 +167,6 @@ void loadProperties(String sourceFileName) {
}
}

/**
* Struct used to contain some information passed to the closure
* passed to compileTargets.
*/
class CompileTarget {
String name;
String upper;
String capital;
}

/**
* Iterates over each of the compile targets, passing the given closure
* a CompileTarget instance.
Expand Down Expand Up @@ -342,8 +334,6 @@ ext.IS_MAC = OS_NAME.contains("mac") || OS_NAME.contains("darwin")
ext.IS_WINDOWS = OS_NAME.contains("windows")
ext.IS_LINUX = OS_NAME.contains("linux")

ext.MAVEN_GROUP_ID = "org.openjfx"

// Enable native access from modules with native code
ext.enableNativeGraphics='--enable-native-access=javafx.graphics'
ext.enableNativeAll='--enable-native-access=javafx.graphics,javafx.media,javafx.web'
Expand Down Expand Up @@ -526,10 +516,6 @@ ext.IS_DEBUG_JAVA = CONF == "Debug" || CONF == "DebugNative"
ext.IS_DEBUG_NATIVE = CONF == "DebugNative"
ext.IS_RELEASE = !ext.IS_DEBUG_JAVA

// Specifies whether to enable the Maven publishing tasks
defineProperty("MAVEN_PUBLISH", "false")
ext.IS_MAVEN_PUBLISH = Boolean.parseBoolean(MAVEN_PUBLISH)

// Define the compiler lint warnings to enable.
//
// We define a separate set of options for normal classes, test classes
Expand Down Expand Up @@ -697,7 +683,6 @@ if (HUDSON_JOB_NAME == "not_hudson") {
defineProperty("RELEASE_SUFFIX", relSuffix)
defineProperty("RELEASE_VERSION_SHORT", "${RELEASE_VERSION}${RELEASE_SUFFIX}")
defineProperty("RELEASE_VERSION_LONG", "${RELEASE_VERSION_SHORT}+${PROMOTED_BUILD_NUMBER}${relOpt}")
defineProperty("MAVEN_VERSION", IS_MAVEN_PUBLISH ? (IS_MILESTONE_FCS ? "${RELEASE_VERSION_SHORT}" : "${RELEASE_VERSION_LONG}") : "")

// Check whether the COMPILE_TARGETS property has been specified (if so, it was done by
// the user and not by this script). If it has not been defined then default
Expand Down Expand Up @@ -816,7 +801,6 @@ try {
// build / test a standalone sdk for running with a JDK that does not include
// the javafx modules.


/**
* Fetch/Check that external tools are present for the build. This method
* will conditionally download the packages from project defined ivy repositories
Expand Down Expand Up @@ -1549,8 +1533,6 @@ logger.quiet("RELEASE_SUFFIX: $RELEASE_SUFFIX")
logger.quiet("RELEASE_VERSION_SHORT: $RELEASE_VERSION_SHORT")
logger.quiet("RELEASE_VERSION_LONG: $RELEASE_VERSION_LONG")
logger.quiet("RELEASE_VERSION_PADDED: $RELEASE_VERSION_PADDED")
logger.quiet("MAVEN_PUBLISH: $MAVEN_PUBLISH")
logger.quiet("MAVEN_VERSION: $MAVEN_VERSION")
logger.quiet("UPDATE_STUB_CACHE: $UPDATE_STUB_CACHE")

/******************************************************************************
Expand Down Expand Up @@ -1769,113 +1751,6 @@ void addJSL(Project project, String name, String pkg, List<String> addExports, C

}

void addMavenPublication(Project project, List<String> projectDependencies) {
if (!IS_MAVEN_PUBLISH) {
return
}

if (!project.hasProperty("moduleName")) {
fail("Project ${project} has no module name")
}
projectDependencies.each { projName ->
def dep = project.project(":$projName")
if (!dep.hasProperty("moduleName")) {
fail("${project} dependency ${dep} has no module name")
}
}

project.apply plugin: 'maven-publish'

project.group = MAVEN_GROUP_ID
project.version = MAVEN_VERSION

if (project.name == 'base') {
project.publishing {
publications {
javafx(MavenPublication) {
artifactId = 'javafx'
artifacts = []
}
}
}
}

gradle.taskGraph.whenReady { g ->
project.tasks.findAll { it.name == 'generatePomFileForJavafxPublication'}.each { it ->
it.doLast {
copy {
into project.file("${project.buildDir}/publications/javafx")
from file("${rootProject.projectDir}/javafx.pom")
rename "javafx.pom", "pom-default.xml"
filter { line ->
line.replaceAll("@VERSION@", MAVEN_VERSION)
}
}
}
}
}

project.publishing {
repositories {
maven {
def repositoryUrl = project.hasProperty('repositoryUrl') ? project.getProperty('repositoryUrl') : ""
def repositoryUsername = project.hasProperty('repositoryUsername') ? project.getProperty('repositoryUsername') : ""
def repositoryPassword = project.hasProperty('repositoryPassword') ? project.getProperty('repositoryPassword') : ""
url repositoryUrl
credentials {
username repositoryUsername
password repositoryPassword
}
}
}
}

compileTargets { t ->
project.publishing {
publications {
maven(MavenPublication) {
def artifactName = project.moduleName.replace('.', '-')
artifactId = artifactName

afterEvaluate {
artifact project.tasks."moduleEmptyPublicationJar$t.capital"
artifact project.tasks."modularPublicationJar$t.capital" {
archiveClassifier.set("$t.name")
}
}

pom.withXml {
Node parent = asNode().appendNode("parent")
parent.appendNode("groupId", MAVEN_GROUP_ID)
parent.appendNode("artifactId", "javafx")
parent.appendNode("version", MAVEN_VERSION)

Node dependencies = asNode().appendNode("dependencies")

Node projectDependencyPlatform = dependencies.appendNode("dependency")
projectDependencyPlatform.appendNode("groupId", MAVEN_GROUP_ID)
projectDependencyPlatform.appendNode("artifactId", artifactName)
projectDependencyPlatform.appendNode("version", MAVEN_VERSION)
projectDependencyPlatform.appendNode("classifier", "\${javafx.platform}")

if (!projectDependencies.empty) {
projectDependencies.each { projName ->
def dep = project.project(":$projName")
def depName = dep.moduleName.replace('.', '-')
Node projectDependency = dependencies.appendNode("dependency")
projectDependency.appendNode("groupId", MAVEN_GROUP_ID)
projectDependency.appendNode("artifactId", depName)
projectDependency.appendNode("version", MAVEN_VERSION)
}
}
}
}
}

}
}
}

/**
* Verifies that all of the *.java files in a source tree have the
* correct package name. If not, fail the build.
Expand Down Expand Up @@ -2294,7 +2169,6 @@ project(":base") {
sourceSets.main.java.srcDirs += "$buildDir/gensrc/java"

compileJava.dependsOn processVersionInfo
addMavenPublication(project, [])

addValidateSourceSets(project, sourceSets)

Expand Down Expand Up @@ -2892,8 +2766,6 @@ project(":graphics") {
}
}

addMavenPublication(project, [ 'base' ])

addValidateSourceSets(project, sourceSets)
}

Expand Down Expand Up @@ -2970,8 +2842,6 @@ project(":controls") {
}
processShimsResources.dependsOn(copyShimBssTask)

addMavenPublication(project, [ 'graphics' ])

addValidateSourceSets(project, sourceSets)
}

Expand Down Expand Up @@ -3040,8 +2910,6 @@ project(":incubator.input") {
modulePath += File.pathSeparator + "${rootProject.projectDir}/modules/javafx.graphics/build/classes/java/main"
modulePath += File.pathSeparator + "${rootProject.projectDir}/modules/javafx.base/build/classes/java/main"

addMavenPublication(project, [ 'controls' ])

addValidateSourceSets(project, sourceSets)
}

Expand Down Expand Up @@ -3099,8 +2967,6 @@ project(":incubator.richtext") {
modulePath += File.pathSeparator + "${rootProject.projectDir}/modules/javafx.graphics/build/classes/java/main"
modulePath += File.pathSeparator + "${rootProject.projectDir}/modules/javafx.base/build/classes/java/main"

addMavenPublication(project, [ 'controls', 'incubator.input' ])

addValidateSourceSets(project, sourceSets)
}

Expand Down Expand Up @@ -3158,10 +3024,6 @@ project(":swing") {
jvmArgs enableNativeGraphics
}

if (COMPILE_SWING) {
addMavenPublication(project, [ 'graphics' ])
}

addValidateSourceSets(project, sourceSets)
}

Expand Down Expand Up @@ -3279,7 +3141,6 @@ project(":fxml") {
classpath += files("$JDK_HOME/jre/lib/ext/nashorn.jar")
}

addMavenPublication(project, [ 'controls' ])

addValidateSourceSets(project, sourceSets)
}
Expand Down Expand Up @@ -3887,7 +3748,6 @@ project(":media") {
}
}

addMavenPublication(project, [ 'graphics' ])

addValidateSourceSets(project, sourceSets)
}
Expand All @@ -3911,8 +3771,6 @@ project(":jsobject") {
dependencies {
}

addMavenPublication(project, [])

addValidateSourceSets(project, sourceSets)
}

Expand Down Expand Up @@ -4215,8 +4073,6 @@ project(":web") {
assemble.dependsOn compileJavaDOMBinding, drtJar
}

addMavenPublication(project, [ 'controls', 'media', 'jsobject' ])

addValidateSourceSets(project, sourceSets)
}

Expand Down Expand Up @@ -4474,6 +4330,10 @@ project(":systemTests") {
addValidateSourceSets(project, nonModSrcSets, modSrcSets)
}

// Apply Maven Publishing to all projects (if enabled).
// Need to be done after all projects were defined that should be published.
apply from: 'maven-publish.gradle'

void setupLintOptions(Task compile, String lintOpts, String extraLintOpts) {
lintOpts.split("[, ]").each { s ->
compile.options.compilerArgs += "-Xlint:$s"
Expand Down Expand Up @@ -5325,6 +5185,10 @@ compileTargets { t ->
}
buildModules.dependsOn(buildModulesTask)

// Configures the maven publication (if enabled) for all projects of this compile target.
// Will run after the buildModulesTask.
configureMavenPublication(moduleProjList, t, buildModulesTask)

// BUNDLED SDK
moduleProjList.each { project ->
// Copy classes, bin, and lib directories
Expand Down Expand Up @@ -5513,46 +5377,6 @@ compileTargets { t ->
}
buildModules.dependsOn(zipSourceFilesTask)

// ============================================================

// Maven Publications
def publicationDirName = "${platformPrefix}publications"
def publicationDir = "${rootProject.buildDir}/${publicationDirName}"

moduleProjList.each { project ->
// Create publications to be uploaded

def moduleName = project.ext.moduleName
def buildDir = project.buildDir

def dstModularJarDir="${publicationDir}"
def srcClassesDir = "${buildDir}/${platformPrefix}module-classes"
def srcLibsDir = "${buildDir}/${platformPrefix}module-lib"

def modularEmptyPublicationJarName = "${moduleName}.jar"
def modularEmptyPublicationJarTask = project.task("moduleEmptyPublicationJar${t.capital}", type: Jar) {
destinationDirectory = file("${dstModularJarDir}")
archiveFileName = modularEmptyPublicationJarName
manifest {
attributes(
'Automatic-Module-Name':"${moduleName}Empty"
)
}
}

def modularPublicationJarName = "${moduleName}-${t.name}.jar"
def modularPublicationJarTask = project.task("modularPublicationJar${t.capital}", type: Jar, dependsOn: modularEmptyPublicationJarTask) {
destinationDirectory = file("${dstModularJarDir}")
archiveFileName = modularPublicationJarName
from srcLibsDir
from srcClassesDir
}

buildModulesTask.dependsOn(modularPublicationJarTask)

}
// ============================================================

def buildRunArgsTask = task("buildRunArgs$t.capital",
group: "Build", dependsOn: buildModulesTask) {
outputs.file(runArgsFile);
Expand Down Expand Up @@ -5700,9 +5524,6 @@ compileTargets { t ->
if (project.tasks.getByName("copyClassFiles$t.capital") != null) {
project.tasks.getByName("copyClassFiles$t.capital").dependsOn(buildModuleClassesTask)
}
if (project.tasks.getByName("modularPublicationJar$t.capital") != null) {
project.tasks.getByName("modularPublicationJar$t.capital").dependsOn(buildModuleClassesTask)
}
}

def buildModuleLibsTask = task("buildModuleLibs$t.capital") {
Expand Down Expand Up @@ -5772,7 +5593,6 @@ compileTargets { t ->
}
baseProject.tasks.getByName("copyLibFilesStandalone$t.capital").dependsOn(buildModuleBaseTask)
baseProject.tasks.getByName("copyLibFiles$t.capital").dependsOn(buildModuleBaseTask)
baseProject.tasks.getByName("modularPublicationJar$t.capital").dependsOn(buildModuleBaseTask)

def buildModuleGraphicsTask = task("buildModuleGraphics$t.capital", type: Copy, dependsOn: graphicsProject.assemble) {
group = "Basic"
Expand Down Expand Up @@ -5847,7 +5667,6 @@ compileTargets { t ->
graphicsProject.tasks.getByName("copyNativeFilesStandalone$t.capital").dependsOn(buildModuleGraphicsTask)
graphicsProject.tasks.getByName("copyLibFilesStandalone$t.capital").dependsOn(buildModuleGraphicsTask)
graphicsProject.tasks.getByName("copyLibFiles$t.capital").dependsOn(buildModuleGraphicsTask)
graphicsProject.tasks.getByName("modularPublicationJar$t.capital").dependsOn(buildModuleGraphicsTask)

def buildModuleMediaTask = task("buildModuleMedia$t.capital", type: Copy, dependsOn: [mediaProject.assemble, prepOpenJfxStubs]) {
group = "Basic"
Expand Down Expand Up @@ -5922,7 +5741,6 @@ compileTargets { t ->
mediaProject.tasks.getByName("copyNativeFilesStandalone$t.capital").dependsOn(buildModuleMediaTask)
mediaProject.tasks.getByName("copyLibFilesStandalone$t.capital").dependsOn(buildModuleMediaTask)
mediaProject.tasks.getByName("copyLibFiles$t.capital").dependsOn(buildModuleMediaTask)
mediaProject.tasks.getByName("modularPublicationJar$t.capital").dependsOn(buildModuleMediaTask)

def buildModuleWeb = task("buildModuleWeb$t.capital", type: Copy, dependsOn: [webProject.assemble, prepOpenJfxStubs]) {
group = "Basic"
Expand Down Expand Up @@ -5975,7 +5793,6 @@ compileTargets { t ->
webProject.tasks.getByName("copyNativeFilesStandalone$t.capital").dependsOn(buildModuleWeb)
webProject.tasks.getByName("copyLibFilesStandalone$t.capital").dependsOn(buildModuleWeb)
webProject.tasks.getByName("copyLibFiles$t.capital").dependsOn(buildModuleWeb)
webProject.tasks.getByName("modularPublicationJar$t.capital").dependsOn(buildModuleWeb)

def buildModuleSWT = task("buildModuleSWT$t.capital", type: Copy) {
group = "Basic"
Expand All @@ -6000,7 +5817,6 @@ compileTargets { t ->
graphicsProject.tasks.getByName("copyNativeFilesStandalone$t.capital").dependsOn(buildModuleSWT)
graphicsProject.tasks.getByName("copyLibFilesStandalone$t.capital").dependsOn(buildModuleSWT)
graphicsProject.tasks.getByName("copyLibFiles$t.capital").dependsOn(buildModuleSWT)
graphicsProject.tasks.getByName("modularPublicationJar$t.capital").dependsOn(buildModuleSWT)

dependsOn(
buildModuleBaseTask,
Expand Down
Loading