Updated release scripts and instructions

build.gradle.kts

@@ -138,7 +138,9 @@ tasks.validateBeforeBuildingReleaseArtifacts {
 
 val String.v: String get() = rootProject.extra["$this.version"] as String
 
+// Looker Instructions: Keep the first line with the suffix for development snapshots; use the second for release builds.
 val buildVersion = "calcite".v + releaseParams.snapshotSuffix
+// val buildVersion = "calcite".v
 
 println("Building Apache Calcite $buildVersion")
 

looker-release.sh

@@ -87,8 +87,9 @@ calcite.version=$NEXT_VERSION
         echo -e "  This becomes the new tip of the looker branch." >&2
         echo -e "- Prior fixups, if any..." >&2
         echo -e "- All commits from upstream..." >&2
-        echo -e "\nIf everything looks good, you can publish to Nexus with this command:\n" >&2
-        echo -e "    ./gradlew -Prelease -PskipSign publishAllPublicationsToLookerNexusRepository\n" >&2
+        echo -e "\nIf everything looks good, you can publish to Artifact Registry with this command:\n" >&2
+        echo -e "(*Remember to update the build version in gradle.properties for the release artifact before running*\n)" >&2
+        echo -e "    ./looker-upload-artifact-registry.sh\n" >&2
         echo -e "And you can push the release tag and force-push the looker branch to looker-open-source with these commands:\n" >&2
         echo -e "    git push [email protected]:looker-open-source/calcite.git $NEXT_TAG"
         echo -e "    git push -f [email protected]:looker-open-source/calcite.git $LOOKER_COMMIT:looker"

looker-snapshot.sh

@@ -19,7 +19,7 @@
 # $1 is the sub-project directory
 # $2 is the artifact ID
 # $3 is the version
-function snapshot_upload {
+function artifact_registry_snapshot_upload {
     mvn deploy:deploy-file \
         -DgroupId=org.apache.calcite \
         -DartifactId="$2" \
@@ -28,16 +28,16 @@ function snapshot_upload {
         -Dfile="./$1/build/libs/$2-$3.jar" \
         -DgeneratePom=false \
         -DpomFile="./$1/build/publications/$1/pom-default.xml" \
-        -DrepositoryId=nexus \
-        -Durl=https://nexusrepo.looker.com/repository/maven-snapshots/
+        -DrepositoryId=artifact-registry \
+        -Durl=https://us-maven.pkg.dev/prow-build-looker/looker-maven-snapshots
 }
 
-./gradlew build -x :redis:test && ./gradlew jar && ./gradlew generatePom && (
+./gradlew build -x test && ./gradlew jar && ./gradlew generatePom && (
     VERSION="$(sed -n 's/^calcite\.version=\([^ ]*\).*/\1/p' gradle.properties)-SNAPSHOT"
-    snapshot_upload core calcite-core "$VERSION"
-    snapshot_upload babel calcite-babel "$VERSION"
-    snapshot_upload linq4j calcite-linq4j "$VERSION"
-    snapshot_upload testkit calcite-testkit "$VERSION"
+    artifact_registry_snapshot_upload core calcite-core "$VERSION"
+    artifact_registry_snapshot_upload babel calcite-babel "$VERSION"
+    artifact_registry_snapshot_upload linq4j calcite-linq4j "$VERSION"
+    artifact_registry_snapshot_upload testkit calcite-testkit "$VERSION"
     echo
-    echo "Done uploading version ${VERSION} to Looker Nexus Snapshots!"
+    echo "Done uploading version ${VERSION} to Looker Artifact Registry Snapshots!"
 )

looker-upload-artifact-registry.sh

@@ -19,7 +19,9 @@
 # $1 is the sub-project directory
 # $2 is the artifact ID
 # $3 is the version
-function artifact_registry_upload {
+
+# Note: Redeployment of the same versioned artifact (same name, repeated uploads) is prohibited.
+function artifact_registry_release_upload {
     mvn deploy:deploy-file \
         -DgroupId=org.apache.calcite \
         -DartifactId="$2" \
@@ -32,12 +34,12 @@ function artifact_registry_upload {
         -Durl=https://us-maven.pkg.dev/prow-build-looker/looker-maven-private
 }
 
-./gradlew build -x :redis:test && ./gradlew jar && ./gradlew generatePom && (
+./gradlew build -x test && ./gradlew jar && ./gradlew generatePom && (
     VERSION="$(sed -n 's/^calcite\.version=\([^ ]*\).*/\1/p' gradle.properties)"
-    artifact_registry_upload core calcite-core "$VERSION"
-    artifact_registry_upload babel calcite-babel "$VERSION"
-    artifact_registry_upload linq4j calcite-linq4j "$VERSION"
-    artifact_registry_upload testkit calcite-testkit "$VERSION"
+    artifact_registry_release_upload core calcite-core "$VERSION"
+    artifact_registry_release_upload babel calcite-babel "$VERSION"
+    artifact_registry_release_upload linq4j calcite-linq4j "$VERSION"
+    artifact_registry_release_upload testkit calcite-testkit "$VERSION"
     echo
     echo "Done uploading version ${VERSION} to Looker Artifact Registry!"
 )

looker.md

@@ -27,8 +27,8 @@ Do not merge to Calcite's master branch.
 *Read the instructions* in the `looker-release.sh` script,
 but do not run that script until you're ready to publish a production release.
 
-Looker has poor infrastructure for testing with local builds of Avatica.
-The easiest way is to upload a snapshot version to Looker's Nexus repository and use it.
+Looker has poor infrastructure for testing with local builds of Calcite.
+The easiest way is to upload a snapshot version to Looker's Artifact Registry repository and use it.
 To upload a snapshot version, simply run `./looker-snapshot.sh`,
 which runs `./gradlew build` and, if successful,
 uploads the resulting snapshot artifacts to the repo
@@ -39,48 +39,16 @@ and you're ready to build.
 
 ## Release
 
-Define Looker's Nexus repository in your `~/.gradle/init.gradle.kts`
-file:
 
-```kotlin
-allprojects {
-    plugins.withId("maven-publish") {
-        configure<PublishingExtension> {
-            repositories {
-                maven {
-                    name = "lookerNexus"
-                    val baseUrl = "https://nexusrepo.looker.com"
-                    val releasesUrl = "$baseUrl/repository/maven-releases"
-                    val snapshotsUrl = "$baseUrl/repository/maven-snapshots"
-                    val release = !project.version.toString().endsWith("-SNAPSHOT")
-                    // val release = project.hasProperty("release")
-                    url = uri(if (release) releasesUrl else snapshotsUrl)
-                    credentials {
-                        username = "xxx"
-                        password = "xxx"
-                    }
-                }
-            }
-        }
-    }
-}
-```
-
-In the above fragment, replace the values of the `username` and
-`password` properties with the secret credentials.
-
-*NOTE* This fragment *must* be in a file outside of your git sandbox.
-If the file were in the git sandbox, it would be too easy to
-accidentally commit the secret credentials and expose them on a
-public site.
 
 *Read the instructions* in the `looker-release.sh` script, then run it.
 The script will only make local changes.
-You'll have a chance to review them before pushing anything to Nexus or GitHub.
+You'll have a chance to review them before pushing anything to Artifact Registry or GitHub.
+Upload to Artifact Registry by running `looker-upload-artifact-registry.sh` after checking the release looks right.
 
 Each release will have a name like `1.21.1-looker` (if the most
-recent official Calcite release is `1.21`) and have a git tag
-`calcite-1.21.1-looker`.
+recent official Calcite release is `1.38`) and have a git tag
+`calcite-1.38.0-looker`.
 
 You should make it from a branch that differs from Calcite's
 `master` branch in only minor ways:
@@ -101,5 +69,4 @@ You should make it from a branch that differs from Calcite's
   so the version in trunk is generally decremented
   while adding the `-looker` suffix.
 
-Check the artifacts
-[on Nexus](https://nexusproxy.looker.com/#browse/search=keyword%3Dorg.apache.calcite).
+Check the artifacts on Artifact Registry.