From 6251aeabe4cfa9811ef911b40fa478e8619e2811 Mon Sep 17 00:00:00 2001 From: Kirill Kurdyukov Date: Fri, 22 May 2026 11:34:13 +0300 Subject: [PATCH 1/2] build: fix Kotlin Exposed Maven publishing artifacts --- .github/workflows/ci-exposed-ydb-dialect.yaml | 7 +- .../publish-kotlin-exposed-dialect.yaml | 6 +- kotlin-exposed-dialect/pom.xml | 89 ++++++++----------- 3 files changed, 43 insertions(+), 59 deletions(-) diff --git a/.github/workflows/ci-exposed-ydb-dialect.yaml b/.github/workflows/ci-exposed-ydb-dialect.yaml index 22890d45..e96537f4 100644 --- a/.github/workflows/ci-exposed-ydb-dialect.yaml +++ b/.github/workflows/ci-exposed-ydb-dialect.yaml @@ -38,10 +38,13 @@ jobs: working-directory: ./kotlin-exposed-dialect run: mvn $MAVEN_ARGS dependency:go-offline - - name: Build & verify (unit + integration tests with testcontainers) + - name: Build & verify working-directory: ./kotlin-exposed-dialect run: mvn $MAVEN_ARGS verify - name: Compile demo working-directory: ./kotlin-exposed-dialect - run: mvn clean install -DskipTests && cd example && mvn --batch-mode --update-snapshots compile + run: | + mvn $MAVEN_ARGS install -DskipTests + cd example + mvn $MAVEN_ARGS compile diff --git a/.github/workflows/publish-kotlin-exposed-dialect.yaml b/.github/workflows/publish-kotlin-exposed-dialect.yaml index 8dcd5339..87da3b0a 100644 --- a/.github/workflows/publish-kotlin-exposed-dialect.yaml +++ b/.github/workflows/publish-kotlin-exposed-dialect.yaml @@ -46,10 +46,10 @@ jobs: cd kotlin-exposed-dialect mvn $MAVEN_ARGS dependency:go-offline - - name: Build (no integration tests, requires testcontainers) + - name: Build run: | cd kotlin-exposed-dialect - mvn $MAVEN_ARGS -DskipITs package + mvn $MAVEN_ARGS package publish: name: Publish Kotlin Exposed YDB Dialect @@ -77,7 +77,7 @@ jobs: - name: Publish package run: | cd kotlin-exposed-dialect - mvn $MAVEN_ARGS -DskipTests -DskipITs -Possrh-s01 -Dgpg.passphrase=${{ secrets.MAVEN_OSSRH_GPG_PASSWORD }} clean deploy + mvn $MAVEN_ARGS -DskipTests -Possrh-s01 -Dgpg.passphrase=${{ secrets.MAVEN_OSSRH_GPG_PASSWORD }} clean deploy env: MAVEN_USERNAME: ${{ secrets.MAVEN_OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.MAVEN_OSSRH_TOKEN }} diff --git a/kotlin-exposed-dialect/pom.xml b/kotlin-exposed-dialect/pom.xml index 745713fd..e5048edd 100644 --- a/kotlin-exposed-dialect/pom.xml +++ b/kotlin-exposed-dialect/pom.xml @@ -33,6 +33,7 @@ Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0 + repo @@ -40,6 +41,7 @@ https://github.com/ydb-platform/ydb-java-dialects scm:git:https://github.com/ydb-platform/ydb-java-dialects.git scm:git:https://github.com/ydb-platform/ydb-java-dialects.git + HEAD @@ -57,6 +59,8 @@ 2.4.3 2.3.22 + + 2.0.0 @@ -78,13 +82,6 @@ ${kotlin.version} - - org.jetbrains.kotlin - kotlin-reflect - ${kotlin.version} - test - - org.jetbrains.exposed exposed-core @@ -95,7 +92,14 @@ exposed-jdbc - + + + org.jetbrains.kotlin + kotlin-reflect + ${kotlin.version} + test + + tech.ydb.jdbc ydb-jdbc-driver @@ -172,10 +176,11 @@ 17 - src/main/kotlin + ${project.basedir}/src/main/kotlin + test-compile test-compile @@ -185,84 +190,59 @@ 17 - src/test/kotlin + ${project.basedir}/src/test/kotlin + org.apache.maven.plugins - maven-javadoc-plugin - 3.5.0 - - 17 - + maven-source-plugin + 3.3.1 - attach-javadocs + attach-sources + package - jar + jar-no-fork + - org.apache.maven.plugins - maven-source-plugin - 3.2.1 + org.jetbrains.dokka + dokka-maven-plugin + ${dokka.version} - attach-sources + attach-dokka-javadocs + package - jar-no-fork + javadocJar - + org.apache.maven.plugins maven-surefire-plugin 3.1.0 false - - **/*Test.* - - - **/*IT.* - + + true + ydbplatform/local-ydb:trunk + - - - - org.apache.maven.plugins - maven-failsafe-plugin - 3.1.0 - - - integration-tests - - integration-test - verify - - - - **/*IT.* - - - true - ydbplatform/local-ydb:trunk - - - - - @@ -295,6 +275,7 @@ + org.sonatype.central central-publishing-maven-plugin From 2cb86828b50c1ea620c79567d1bcaf19c66b46c0 Mon Sep 17 00:00:00 2001 From: Kirill Kurdyukov Date: Fri, 22 May 2026 12:17:16 +0300 Subject: [PATCH 2/2] build: fix Kotlin Exposed Maven publishing artifacts --- kotlin-exposed-dialect/pom.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/kotlin-exposed-dialect/pom.xml b/kotlin-exposed-dialect/pom.xml index e5048edd..5e24c147 100644 --- a/kotlin-exposed-dialect/pom.xml +++ b/kotlin-exposed-dialect/pom.xml @@ -61,6 +61,7 @@ 2.3.22 2.0.0 + 3.2.5 @@ -213,8 +214,7 @@ - + org.jetbrains.dokka dokka-maven-plugin @@ -230,13 +230,16 @@ - org.apache.maven.plugins maven-surefire-plugin 3.1.0 false + + **/*Test.* + **/*IT.* + true ydbplatform/local-ydb:trunk