From 0e5332e4ac1e82328a11b091fc3ff9739040946a Mon Sep 17 00:00:00 2001
From: Alan Cai <caialan@amazon.com>
Date: Wed, 20 Sep 2023 11:31:30 -0700
Subject: [PATCH] Add partiql-planner Maven publishing plugin v0.10.1 (#1214)

---
 CHANGELOG.md                  |  5 +++++
 README.md                     |  2 +-
 gradle.properties             |  2 +-
 partiql-lang/build.gradle.kts | 19 +------------------
 partiql-plan/build.gradle.kts |  7 +++++++
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1c398b90..fbe6cf8a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security
 
+## [0.10.1] - 2023-09-19
+
+### Fixes
+- Fixes build failure for version `0.10.0` by publishing `partiql-plan` as an independent artifact. Please note that `partiql-plan` is experimental.
+
 ## [0.10.0] - 2023-05-05
 
 ### Added
diff --git a/README.md b/README.md
index 0abbd6db8..af799bfe4 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ This project is published to [Maven Central](https://search.maven.org/artifact/o
 
 | Group ID      | Artifact ID           | Recommended Version |
 |---------------|-----------------------|---------------------|
-| `org.partiql` | `partiql-lang-kotlin` | `0.10.0`             | 
+| `org.partiql` | `partiql-lang-kotlin` | `0.10.1`            | 
 
 
 For Maven builds, add the following to your `pom.xml`:
diff --git a/gradle.properties b/gradle.properties
index ad3ad9da1..cff2e71b7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 group=org.partiql
-version=0.10.0
+version=0.10.1
 
 ossrhUsername=EMPTY
 ossrhPassword=EMPTY
diff --git a/partiql-lang/build.gradle.kts b/partiql-lang/build.gradle.kts
index 9fe77606d..432d489a2 100644
--- a/partiql-lang/build.gradle.kts
+++ b/partiql-lang/build.gradle.kts
@@ -22,22 +22,15 @@ plugins {
     id(Plugins.publish)
 }
 
-val libs: Configuration by configurations.creating
-
-configurations {
-    api.get().extendsFrom(libs)
-}
-
 dependencies {
     antlr(Deps.antlr)
     api(project(":lib:isl"))
     api(project(":partiql-spi"))
     api(project(":partiql-types"))
+    api(project(":partiql-plan"))
     api(Deps.ionElement)
     api(Deps.ionJava)
     api(Deps.pigRuntime)
-    // libs are included in partiql-lang-kotlin JAR
-    libs(project(":partiql-plan"))
     implementation(Deps.antlrRuntime)
     implementation(Deps.csv)
     implementation(Deps.kotlinReflect)
@@ -102,13 +95,3 @@ tasks.processResources {
         into("org/partiql/type-domains/")
     }
 }
-
-tasks.jar {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    // adds all `libs(project(...))` to the partiql-lang-kotlin jar
-    from(
-        libs.dependencies.filterIsInstance<ProjectDependency>().map {
-            it.dependencyProject.sourceSets.main.get().output.classesDirs
-        }
-    )
-}
diff --git a/partiql-plan/build.gradle.kts b/partiql-plan/build.gradle.kts
index f61296b49..97e5b02f4 100644
--- a/partiql-plan/build.gradle.kts
+++ b/partiql-plan/build.gradle.kts
@@ -16,6 +16,7 @@
 
 plugins {
     id(Plugins.conventions)
+    id(Plugins.publish)
     id(Plugins.library)
 }
 
@@ -25,6 +26,12 @@ dependencies {
     implementation(Deps.kotlinReflect)
 }
 
+publish {
+    artifactId = "partiql-plan"
+    name = "PartiQL Plan"
+    description = "PartiQL Plan experimental data structures"
+}
+
 val generate = tasks.register<Exec>("generate") {
     dependsOn(":lib:sprout:install")
     workingDir(projectDir)