Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions .github/workflows/ci-exposed-ydb-dialect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions .github/workflows/publish-kotlin-exposed-dialect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
86 changes: 35 additions & 51 deletions kotlin-exposed-dialect/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,15 @@
<license>
<name>Apache License, Version 2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<url>https://github.com/ydb-platform/ydb-java-dialects</url>
<connection>scm:git:https://github.com/ydb-platform/ydb-java-dialects.git</connection>
<developerConnection>scm:git:https://github.com/ydb-platform/ydb-java-dialects.git</developerConnection>
<tag>HEAD</tag>
</scm>

<properties>
Expand All @@ -57,6 +59,9 @@

<ydb.sdk.version>2.4.3</ydb.sdk.version>
<ydb.jdbc.version>2.3.22</ydb.jdbc.version>

<dokka.version>2.0.0</dokka.version>
<surefire.version>3.2.5</surefire.version>
</properties>

<dependencyManagement>
Expand All @@ -78,13 +83,6 @@
<version>${kotlin.version}</version>
</dependency>

<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jetbrains.exposed</groupId>
<artifactId>exposed-core</artifactId>
Expand All @@ -95,7 +93,14 @@
<artifactId>exposed-jdbc</artifactId>
</dependency>

<!-- Test -->
<!-- Test dependencies -->
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>tech.ydb.jdbc</groupId>
<artifactId>ydb-jdbc-driver</artifactId>
Expand Down Expand Up @@ -172,10 +177,11 @@
<configuration>
<jvmTarget>17</jvmTarget>
<sourceDirs>
<sourceDir>src/main/kotlin</sourceDir>
<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
</sourceDirs>
</configuration>
</execution>

<execution>
<id>test-compile</id>
<phase>test-compile</phase>
Expand All @@ -185,45 +191,45 @@
<configuration>
<jvmTarget>17</jvmTarget>
<sourceDirs>
<sourceDir>src/test/kotlin</sourceDir>
<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
</sourceDirs>
</configuration>
</execution>
</executions>
</plugin>

<!-- Sources jar required by Maven Central -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.5.0</version>
<configuration>
<source>17</source>
</configuration>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<id>attach-sources</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- Javadocs jar required by Maven Central -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<groupId>org.jetbrains.dokka</groupId>
<artifactId>dokka-maven-plugin</artifactId>
<version>${dokka.version}</version>
<executions>
<execution>
<id>attach-sources</id>
<id>attach-dokka-javadocs</id>
<phase>package</phase>
<goals>
<goal>jar-no-fork</goal>
<goal>javadocJar</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- Unit tests (no YDB needed) -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand All @@ -232,37 +238,14 @@
<useModulePath>false</useModulePath>
<includes>
<include>**/*Test.*</include>
<include>**/*IT.*</include>
</includes>
<excludes>
<exclude>**/*IT.*</exclude>
</excludes>
<environmentVariables>
<TESTCONTAINERS_REUSE_ENABLE>true</TESTCONTAINERS_REUSE_ENABLE>
<YDB_DOCKER_IMAGE>ydbplatform/local-ydb:trunk</YDB_DOCKER_IMAGE>
</environmentVariables>
</configuration>
</plugin>

<!-- Integration tests (YDB via testcontainers) -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>integration-tests</id>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<configuration>
<includes>
<include>**/*IT.*</include>
</includes>
<environmentVariables>
<TESTCONTAINERS_REUSE_ENABLE>true</TESTCONTAINERS_REUSE_ENABLE>
<YDB_DOCKER_IMAGE>ydbplatform/local-ydb:trunk</YDB_DOCKER_IMAGE>
</environmentVariables>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down Expand Up @@ -295,6 +278,7 @@
</gpgArguments>
</configuration>
</plugin>

<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
Expand Down
Loading