diff --git a/build.gradle.kts b/build.gradle.kts index 278f619..0638af5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,8 +3,8 @@ import org.hypertrace.gradle.publishing.License plugins { id("org.hypertrace.ci-utils-plugin") version "0.2.0" - id("org.hypertrace.publish-plugin") version "1.0.0" apply false - id("org.hypertrace.repository-plugin") version "0.2.3" + id("org.hypertrace.publish-plugin") version "1.0.4" apply false + id("org.hypertrace.repository-plugin") version "0.4.0" } subprojects { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 62d4c05..41d9927 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 186b715..92f06b5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index fbd7c51..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 5093609..107acd3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,21 +64,6 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line @@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/hypertrace-gradle-publish-maven-central-plugin/README.md b/hypertrace-gradle-publish-maven-central-plugin/README.md index 6e97e18..5f96f51 100644 --- a/hypertrace-gradle-publish-maven-central-plugin/README.md +++ b/hypertrace-gradle-publish-maven-central-plugin/README.md @@ -15,7 +15,7 @@ For signing artifacts, following properties must be provided as gradle propertie - signingKey - signingPassword -The plugin also uses [gradle-nexus-staging-plugin](https://github.com/Codearte/gradle-nexus-staging-plugin) plugin for closing and releasing staged repositories. +The plugin also uses [Nexus Publish Plugin](https://github.com/gradle-nexus/publish-plugin) plugin for closing and releasing staged repositories. Each property described below can be configured in the DSL. The default values are shown for each property, all of which, with the exception of license, can be omitted if left unchanged. @@ -56,5 +56,6 @@ plugins { #### Releasing repositories ```bash +FIXME: This has changed, as has publish https://github.com/gradle-nexus/publish-plugin/wiki/Migration-from-gradle_nexus_staging-plugin---nexus_publish-plugin-duo#tasks---simple-case ./gradlew closeAndReleaseRepository ``` diff --git a/hypertrace-gradle-publish-maven-central-plugin/build.gradle.kts b/hypertrace-gradle-publish-maven-central-plugin/build.gradle.kts index e25da1f..be83668 100644 --- a/hypertrace-gradle-publish-maven-central-plugin/build.gradle.kts +++ b/hypertrace-gradle-publish-maven-central-plugin/build.gradle.kts @@ -9,7 +9,7 @@ java { } repositories { - jcenter() + gradlePluginPortal() } gradlePlugin { @@ -23,10 +23,11 @@ gradlePlugin { dependencies { api(project(":hypertrace-gradle-publish-plugin")) - implementation("io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.30.0") - testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.1") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.1") + implementation("io.github.gradle-nexus:publish-plugin:1.1.0") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2") testImplementation(gradleTestKit()) + testImplementation(gradleApi()) } tasks { diff --git a/hypertrace-gradle-publish-maven-central-plugin/src/main/java/org/hypertrace/gradle/publishing/PublishMavenCentralPlugin.java b/hypertrace-gradle-publish-maven-central-plugin/src/main/java/org/hypertrace/gradle/publishing/PublishMavenCentralPlugin.java index 0f2e202..2a602b3 100644 --- a/hypertrace-gradle-publish-maven-central-plugin/src/main/java/org/hypertrace/gradle/publishing/PublishMavenCentralPlugin.java +++ b/hypertrace-gradle-publish-maven-central-plugin/src/main/java/org/hypertrace/gradle/publishing/PublishMavenCentralPlugin.java @@ -1,8 +1,8 @@ package org.hypertrace.gradle.publishing; -import io.codearte.gradle.nexus.BaseStagingTask; -import io.codearte.gradle.nexus.NexusStagingExtension; -import io.codearte.gradle.nexus.NexusStagingPlugin; +import io.github.gradlenexus.publishplugin.AbstractNexusStagingRepositoryTask; +import io.github.gradlenexus.publishplugin.NexusPublishExtension; +import io.github.gradlenexus.publishplugin.NexusPublishPlugin; import org.gradle.api.GradleException; import org.gradle.api.JavaVersion; import org.gradle.api.Plugin; @@ -38,53 +38,63 @@ public class PublishMavenCentralPlugin implements Plugin { public void apply(@Nonnull Project target) { project = target; this.extension = - project.getExtensions().create(EXTENSION_NAME, HypertracePublishMavenCentralExtension.class); + project + .getExtensions() + .create(EXTENSION_NAME, HypertracePublishMavenCentralExtension.class); this.applyMavenPublish(); this.applySigning(); this.applyWithJavadocJar(); this.applyWithSourcesJar(); this.addPublishRepository(); this.addPublications(); - this.applyNexusStaging(); + this.applyNexusPlugin(); } private void applySigning() { - project.getPluginManager() - .apply(SigningPlugin.class); + project.getPluginManager().apply(SigningPlugin.class); } - private void applyNexusStaging() { - project.getRootProject().getPluginManager() - .apply(NexusStagingPlugin.class); + private void applyNexusPlugin() { + // FIXME - modifying root from a child is problematic and an error in gradle 7 + project.getRootProject().getPluginManager().apply(NexusPublishPlugin.class); } - private void configureNexusStagingPlugin() { + private void configureNexusPlugin() { Optional user = getProperty(PROPERTY_OSSRH_USERNAME); Optional password = getProperty(PROPERTY_OSSRH_PASSWORD); - - getNexusStagingExtension().setServerUrl("https://s01.oss.sonatype.org/service/local/"); - if (user.isPresent() && password.isPresent()) { - getNexusStagingExtension().setUsername(user.get()); - getNexusStagingExtension().setPassword(password.get()); - } - + getNexusPublishExtension() + .getRepositories() + .sonatype( + nexusRepository -> { + nexusRepository + .getNexusUrl() + .set(project.uri("https://s01.oss.sonatype.org/service/local/")); + if (user.isPresent() && password.isPresent()) { + nexusRepository.getUsername().set(user.get()); + nexusRepository.getPassword().set(password.get()); + } + }); // packageGroup - getNexusStagingExtension().setPackageGroup(this.extension.packageGroup.get()); + getNexusPublishExtension().getPackageGroup().set(this.extension.packageGroup); } private void applyMavenPublish() { - project.getPluginManager() - .apply(MavenPublishPlugin.class); + project.getPluginManager().apply(MavenPublishPlugin.class); } private void applyWithJavadocJar() { getJavaPluginExtension().withJavadocJar(); - project.getTasks().withType(Javadoc.class).configureEach(javadoc -> { - StandardJavadocDocletOptions options = (StandardJavadocDocletOptions) javadoc.getOptions(); - if (JavaVersion.current().isJava9Compatible()) { - options.addBooleanOption("html5", true); - } - }); + project + .getTasks() + .withType(Javadoc.class) + .configureEach( + javadoc -> { + StandardJavadocDocletOptions options = + (StandardJavadocDocletOptions) javadoc.getOptions(); + if (JavaVersion.current().isJava9Compatible()) { + options.addBooleanOption("html5", true); + } + }); } private void applyWithSourcesJar() { @@ -103,101 +113,126 @@ private void addPublishRepository() { } if (user.isPresent() && password.isPresent()) { - getPublishingExtension().repositories(artifactRepositories -> - artifactRepositories.maven(mavenArtifactRepository -> { - mavenArtifactRepository.setName("mavenCentral"); - mavenArtifactRepository.setUrl(url); - mavenArtifactRepository.credentials(passwordCredentials -> { - passwordCredentials.setUsername(user.get()); - passwordCredentials.setPassword(password.get()); - }); - }) - ); + getPublishingExtension() + .repositories( + artifactRepositories -> + artifactRepositories.maven( + mavenArtifactRepository -> { + mavenArtifactRepository.setName("mavenCentral"); + mavenArtifactRepository.setUrl(url); + mavenArtifactRepository.credentials( + passwordCredentials -> { + passwordCredentials.setUsername(user.get()); + passwordCredentials.setPassword(password.get()); + }); + })); } } private void addPublications() { - project.afterEvaluate(unused -> { - validateExtensionAtConfigurationTime(); - getPublishingExtension().publications(this::addJavaLibraryPublicationWhenApplied); - validateGradlePropertiesBeforePublishTask(); - // sign after publication is added - addSigning(); - // configure staging plugin - configureNexusStagingPlugin(); - validateGradlePropertiesBeforeStagingTasks(); - }); + project.afterEvaluate( + unused -> { + validateExtensionAtConfigurationTime(); + getPublishingExtension().publications(this::addJavaLibraryPublicationWhenApplied); + validateGradlePropertiesBeforePublishTask(); + // sign after publication is added + addSigning(); + // configure nexus plugin + configureNexusPlugin(); + validateGradlePropertiesBeforeStagingTasks(); + }); } private void addJavaLibraryPublicationWhenApplied(PublicationContainer publications) { - project.getPluginManager() - .withPlugin("java-library", appliedPlugin -> { - MavenPublication publication; - - try { - // use existing publication from org.hypertrace.publish-plugin plugin - publication = (MavenPublication) publications.getByName("javaLibrary"); - } catch (UnknownDomainObjectException e) { - // create new publication - publication = publications.create("javaLibrary", MavenPublication.class); - publication.from(project.getComponents().getByName("java")); - } - - // configure pom - publication.pom(mavenPom -> { - // name - mavenPom.getName().set(project.provider(() -> { - return String.format("%s:%s", project.getGroup(), project.getName()); - })); - - // url - mavenPom.getUrl().set(this.extension.url); - - // description - mavenPom.getDescription().set(project.getDescription()); - - // scm - Provider qualifiedRepoProvider = - this.extension.scmOrganization.flatMap( - orgName -> - this.extension.repoName.map( - repoName -> String.format("%s/%s", orgName, repoName))); - Provider scmConnectionProvider = - qualifiedRepoProvider.map(qualifiedRepo -> String.format("scm:git:git://github.com/%s.git", qualifiedRepo)); - Provider scmDeveloperConnectionProvider = - qualifiedRepoProvider.map(qualifiedRepo -> String.format("scm:git:ssh://github.com:%s.git", qualifiedRepo)); - Provider scmUrlProvider = - qualifiedRepoProvider.map(qualifiedRepo -> String.format("https://github.com/%s/tree/main", qualifiedRepo)); - mavenPom.scm(mavenPomScm -> { - mavenPomScm.getConnection().set(scmConnectionProvider); - mavenPomScm.getDeveloperConnection().set(scmDeveloperConnectionProvider); - mavenPomScm.getUrl().set(scmUrlProvider); - }); - - // developers - mavenPom.developers(mavenPomDeveloperSpec -> { - mavenPomDeveloperSpec.developer(mavenPomDeveloper -> { - mavenPomDeveloper.getId().set(this.extension.developerId); - mavenPomDeveloper.getName().set(this.extension.developerName); - mavenPomDeveloper.getEmail().set(this.extension.developerEmail); - mavenPomDeveloper.getOrganization().set(this.extension.developerOrganization); - mavenPomDeveloper.getOrganizationUrl().set(this.extension.developerOrganizationUrl); - }); - }); - - // licenses - mavenPom.licenses(mavenPomLicenseSpec -> { - mavenPomLicenseSpec.license(mavenPomLicense -> { - mavenPomLicense.getName().set(this.extension.license.get().toString()); + project + .getPluginManager() + .withPlugin( + "java-library", + appliedPlugin -> { + MavenPublication publication; + + try { + // use existing publication from org.hypertrace.publish-plugin plugin + publication = (MavenPublication) publications.getByName("javaLibrary"); + } catch (UnknownDomainObjectException e) { + // create new publication + publication = publications.create("javaLibrary", MavenPublication.class); + publication.from(project.getComponents().getByName("java")); + } + + // configure pom + publication.pom( + mavenPom -> { + // name + mavenPom + .getName() + .set( + project.provider( + () -> + String.format("%s:%s", project.getGroup(), project.getName()))); + + // url + mavenPom.getUrl().set(this.extension.url); + + // description + mavenPom.getDescription().set(project.getDescription()); + + // scm + Provider qualifiedRepoProvider = + this.extension.scmOrganization.flatMap( + orgName -> + this.extension.repoName.map( + repoName -> String.format("%s/%s", orgName, repoName))); + Provider scmConnectionProvider = + qualifiedRepoProvider.map( + qualifiedRepo -> + String.format("scm:git:git://github.com/%s.git", qualifiedRepo)); + Provider scmDeveloperConnectionProvider = + qualifiedRepoProvider.map( + qualifiedRepo -> + String.format("scm:git:ssh://github.com:%s.git", qualifiedRepo)); + Provider scmUrlProvider = + qualifiedRepoProvider.map( + qualifiedRepo -> + String.format("https://github.com/%s/tree/main", qualifiedRepo)); + mavenPom.scm( + mavenPomScm -> { + mavenPomScm.getConnection().set(scmConnectionProvider); + mavenPomScm.getDeveloperConnection().set(scmDeveloperConnectionProvider); + mavenPomScm.getUrl().set(scmUrlProvider); + }); + + // developers + mavenPom.developers( + mavenPomDeveloperSpec -> + mavenPomDeveloperSpec.developer( + mavenPomDeveloper -> { + mavenPomDeveloper.getId().set(this.extension.developerId); + mavenPomDeveloper.getName().set(this.extension.developerName); + mavenPomDeveloper.getEmail().set(this.extension.developerEmail); + mavenPomDeveloper + .getOrganization() + .set(this.extension.developerOrganization); + mavenPomDeveloper + .getOrganizationUrl() + .set(this.extension.developerOrganizationUrl); + })); + + // licenses + mavenPom.licenses( + mavenPomLicenseSpec -> + mavenPomLicenseSpec.license( + mavenPomLicense -> + mavenPomLicense + .getName() + .set(this.extension.license.get().toString()))); + }); }); - }); - - }); - }); } private void addSigning() { - if (project.hasProperty(PROPERTY_SIGNING_KEY) && project.hasProperty(PROPERTY_SIGNING_PASSWORD)) { + if (project.hasProperty(PROPERTY_SIGNING_KEY) + && project.hasProperty(PROPERTY_SIGNING_PASSWORD)) { String signingKey = (String) project.property(PROPERTY_SIGNING_KEY); String signingPassword = (String) project.property(PROPERTY_SIGNING_PASSWORD); if (project.hasProperty(PROPERTY_SIGNING_KEY_ID)) { @@ -207,28 +242,23 @@ private void addSigning() { getSigningExtension().useInMemoryPgpKeys(signingKey, signingPassword); } } - getSigningExtension() - .sign(getPublishingExtension().getPublications().getByName("javaLibrary")); + getSigningExtension().sign(getPublishingExtension().getPublications().getByName("javaLibrary")); } private PublishingExtension getPublishingExtension() { - return project.getExtensions() - .getByType(PublishingExtension.class); + return project.getExtensions().getByType(PublishingExtension.class); } private JavaPluginExtension getJavaPluginExtension() { - return project.getExtensions() - .getByType(JavaPluginExtension.class); + return project.getExtensions().getByType(JavaPluginExtension.class); } private SigningExtension getSigningExtension() { - return project.getExtensions() - .getByType(SigningExtension.class); + return project.getExtensions().getByType(SigningExtension.class); } - private NexusStagingExtension getNexusStagingExtension() { - return project.getRootProject().getExtensions() - .getByType(NexusStagingExtension.class); + private NexusPublishExtension getNexusPublishExtension() { + return project.getRootProject().getExtensions().getByType(NexusPublishExtension.class); } private Optional getProperty(String propertyName) { @@ -238,38 +268,50 @@ private Optional getProperty(String propertyName) { private void validateExtensionAtConfigurationTime() { if (!this.extension.license.isPresent()) { throw new GradleException( - "A license type must be specified in the build DSL to use the Hypertrace maven central publish plugin"); + "A license type must be specified in the build DSL to use the Hypertrace maven central publish plugin"); } if (!this.extension.repoName.isPresent()) { throw new GradleException( - "Repository Name must be specified in the build DSL to use the Hypertrace maven central publish plugin"); + "Repository Name must be specified in the build DSL to use the Hypertrace maven central publish plugin"); } } private void validateGradlePropertiesBeforePublishTask() { - project.getTasks().named("publish").configure(task -> { - task.doFirst(unused -> { - validateGradleProperty(PROPERTY_OSSRH_USERNAME); - validateGradleProperty(PROPERTY_OSSRH_PASSWORD); - }); - }); + project + .getTasks() + .named("publish") + .configure( + task -> + task.doFirst( + unused -> { + validateGradleProperty(PROPERTY_OSSRH_USERNAME); + validateGradleProperty(PROPERTY_OSSRH_PASSWORD); + })); } private void validateGradlePropertiesBeforeStagingTasks() { - project.getRootProject().getTasks().withType(BaseStagingTask.class).stream().forEach(task -> { - task.doFirst(unused -> { - validateGradleProperty(PROPERTY_OSSRH_USERNAME); - validateGradleProperty(PROPERTY_OSSRH_PASSWORD); - }); - }); + project + .getRootProject() + .getTasks() + .withType(AbstractNexusStagingRepositoryTask.class) + .forEach( + task -> + task.doFirst( + unused -> { + validateGradleProperty(PROPERTY_OSSRH_USERNAME); + validateGradleProperty(PROPERTY_OSSRH_PASSWORD); + })); } private void validateGradleProperty(String propertyName) { if (!project.hasProperty(propertyName)) { - throw new GradleException("Missing expected gradle property: " + propertyName + ". It should be added " + - "in your ~/.gradle/gradle.properties file, or in a an environment variable of the form " + - "ORG_GRADLE_PROJECT_" + propertyName); + throw new GradleException( + "Missing expected gradle property: " + + propertyName + + ". It should be added " + + "in your ~/.gradle/gradle.properties file, or in a an environment variable of the form " + + "ORG_GRADLE_PROJECT_" + + propertyName); } } - } diff --git a/hypertrace-gradle-publish-maven-central-plugin/src/test/java/org/hypertrace/gradle/publishing/PublishMavenCentralPluginTest.java b/hypertrace-gradle-publish-maven-central-plugin/src/test/java/org/hypertrace/gradle/publishing/PublishMavenCentralPluginTest.java index 4898cda..29cc5ff 100644 --- a/hypertrace-gradle-publish-maven-central-plugin/src/test/java/org/hypertrace/gradle/publishing/PublishMavenCentralPluginTest.java +++ b/hypertrace-gradle-publish-maven-central-plugin/src/test/java/org/hypertrace/gradle/publishing/PublishMavenCentralPluginTest.java @@ -20,7 +20,7 @@ public static void setup() { project.getPluginManager().apply("org.hypertrace.publish-maven-central-plugin"); project.getExtensions().getByType(HypertracePublishMavenCentralExtension.class).license.set(License.APACHE_2_0); project.getExtensions().getByType(HypertracePublishMavenCentralExtension.class).repoName.set("test"); - project.getTasksByName("tasks", false); + project.getAllTasks(true); // FIXME: why is this failing - something with kotlin dsl } @Test diff --git a/settings.gradle.kts b/settings.gradle.kts index 74d14cf..f44a545 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,7 +9,7 @@ pluginManagement { } plugins { - id("org.hypertrace.version-settings") version "0.1.1" + id("org.hypertrace.version-settings") version "0.2.0" } rootProject.name = "hypertrace-gradle-publish-plugin"