Skip to content

build: package separate runtime and CLI artifacts #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
omer-cengel merged 1 commit into from
Sep 22, 2026
Merged

build: package separate runtime and CLI artifacts #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
134 changes: 80 additions & 54 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,74 +7,121 @@
<groupId>dev.sqlcj</groupId>
<artifactId>sqlcj</artifactId>
<version>0.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>sqlcj</name>
<description>SQL compiler and type-safe code generator for Java</description>

<modules>
<module>sqlcj-runtime</module>
<module>sqlcj-cli</module>
</modules>

<properties>
<maven.compiler.release>21</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spotless.plugin.version>3.10.2</spotless.plugin.version>
<spotless.eclipse.version>4.40</spotless.eclipse.version>
<spotless.java.config>${project.basedir}/config/eclipse-java-formatter.xml</spotless.java.config>
<picocli.version>4.7.7</picocli.version>
<jackson.version>3.2.1</jackson.version>
<jsqlparser.version>5.3</jsqlparser.version>
<junit.version>6.1.2</junit.version>
<h2.version>2.4.240</h2.version>
<testcontainers.version>1.21.4</testcontainers.version>
<postgresql.version>42.7.13</postgresql.version>
<commons-compress.version>1.28.0</commons-compress.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>dev.sqlcj</groupId>
<artifactId>sqlcj-runtime</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>${picocli.version}</version>
</dependency>
<dependency>
<groupId>tools.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.github.jsqlparser</groupId>
<artifactId>jsqlparser</artifactId>
<version>${jsqlparser.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
<scope>test</scope>
</dependency>
<!--
Testcontainers pulls commons-compress 1.24.0, which carries
CVE-2024-25710 and CVE-2024-26308. Both are fixed in 1.26.0.
-->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.28.0</version>
<version>${commons-compress.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
<version>4.7.7</version>
</dependency>
<dependency>
<groupId>tools.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>com.github.jsqlparser</groupId>
<artifactId>jsqlparser</artifactId>
<version>5.3</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>6.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>2.4.240</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<version>1.21.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.7.13</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.6.3</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>com.diffplug.spotless</groupId>
Expand All @@ -84,7 +131,7 @@
<java>
<eclipse>
<version>${spotless.eclipse.version}</version>
<file>${project.basedir}/config/eclipse-java-formatter.xml</file>
<file>${spotless.java.config}</file>
</eclipse>
<removeUnusedImports/>
<importOrder>
Expand All @@ -105,19 +152,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.2</version>
<configuration>
<archive>
<manifest>
<mainClass>dev.sqlcj.Main</mainClass>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand All @@ -131,14 +165,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.6</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.6.3</version>
<configuration>
<mainClass>dev.sqlcj.Main</mainClass>
</configuration>
</plugin>
</plugins>
</build>
</project>
118 changes: 118 additions & 0 deletions sqlcj-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>dev.sqlcj</groupId>
<artifactId>sqlcj</artifactId>
<version>0.1.0-SNAPSHOT</version>
</parent>

<artifactId>sqlcj-cli</artifactId>

<name>sqlcj cli</name>
<description>SQL compiler and type-safe code generator command line tool</description>

<properties>
<spotless.java.config>${project.basedir}/../config/eclipse-java-formatter.xml</spotless.java.config>
</properties>

<dependencies>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
</dependency>
<dependency>
<groupId>tools.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
</dependency>
<dependency>
<groupId>com.github.jsqlparser</groupId>
<artifactId>jsqlparser</artifactId>
</dependency>
<!--
The runtime is not part of the command line tool. Tests use it to
compile and execute generated source.
-->
<dependency>
<groupId>dev.sqlcj</groupId>
<artifactId>sqlcj-runtime</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<mainClass>dev.sqlcj.Main</mainClass>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<id>shade-cli</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>module-info.class</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>dev.sqlcj.Main</mainClass>
<manifestEntries>
<Implementation-Title>${project.name}</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<mainClass>dev.sqlcj.Main</mainClass>
</configuration>
</plugin>
</plugins>
</build>
</project>
0 src/main/java/dev/sqlcj/Main.java → sqlcj-cli/src/main/java/dev/sqlcj/Main.java
View file
Open in desktop
File renamed without changes.
0 ...ava/dev/sqlcj/analysis/QueryAnalyzer.java → ...ava/dev/sqlcj/analysis/QueryAnalyzer.java
View file
Open in desktop
File renamed without changes.
0 .../java/dev/sqlcj/analysis/QueryColumn.java → .../java/dev/sqlcj/analysis/QueryColumn.java
View file
Open in desktop
File renamed without changes.
0 ...n/java/dev/sqlcj/analysis/QueryModel.java → ...n/java/dev/sqlcj/analysis/QueryModel.java
View file
Open in desktop
File renamed without changes.
0 ...va/dev/sqlcj/analysis/QueryParameter.java → ...va/dev/sqlcj/analysis/QueryParameter.java
View file
Open in desktop
File renamed without changes.
0 ...main/java/dev/sqlcj/cli/SqlcjCommand.java → ...main/java/dev/sqlcj/cli/SqlcjCommand.java
View file
Open in desktop
File renamed without changes.
0 ...ev/sqlcj/cli/command/GenerateCommand.java → ...ev/sqlcj/cli/command/GenerateCommand.java
View file
Open in desktop
File renamed without changes.
0 ...dev/sqlcj/cli/command/VersionCommand.java → ...dev/sqlcj/cli/command/VersionCommand.java
View file
Open in desktop
File renamed without changes.
0 .../sqlcj/compiler/CompilationException.java → .../sqlcj/compiler/CompilationException.java
View file
Open in desktop
File renamed without changes.
0 ...v/sqlcj/compiler/DefaultSourceLoader.java → ...v/sqlcj/compiler/DefaultSourceLoader.java
View file
Open in desktop
File renamed without changes.
0 src/main/java/dev/sqlcj/compiler/Source.java → .../main/java/dev/sqlcj/compiler/Source.java
View file
Open in desktop
File renamed without changes.
0 ...java/dev/sqlcj/compiler/SourceLoader.java → ...java/dev/sqlcj/compiler/SourceLoader.java
View file
Open in desktop
File renamed without changes.
0 ...ava/dev/sqlcj/compiler/SqlcjCompiler.java → ...ava/dev/sqlcj/compiler/SqlcjCompiler.java
View file
Open in desktop
File renamed without changes.
0 src/main/java/dev/sqlcj/config/Config.java → ...rc/main/java/dev/sqlcj/config/Config.java
View file
Open in desktop
File renamed without changes.
0 ...n/java/dev/sqlcj/config/ConfigLoader.java → ...n/java/dev/sqlcj/config/ConfigLoader.java
View file
Open in desktop
File renamed without changes.
0 ...ava/dev/sqlcj/config/ConfigValidator.java → ...ava/dev/sqlcj/config/ConfigValidator.java
View file
Open in desktop
File renamed without changes.
0 .../sqlcj/config/ConfigurationException.java → .../sqlcj/config/ConfigurationException.java
View file
Open in desktop
File renamed without changes.
0 ...ain/java/dev/sqlcj/config/JavaConfig.java → ...ain/java/dev/sqlcj/config/JavaConfig.java
View file
Open in desktop
File renamed without changes.
0 ...main/java/dev/sqlcj/config/SqlConfig.java → ...main/java/dev/sqlcj/config/SqlConfig.java
View file
Open in desktop
File renamed without changes.
0 ...va/dev/sqlcj/config/YamlConfigLoader.java → ...va/dev/sqlcj/config/YamlConfigLoader.java
View file
Open in desktop
File renamed without changes.
0 ...va/dev/sqlcj/generator/CodeGenerator.java → ...va/dev/sqlcj/generator/CodeGenerator.java
View file
Open in desktop
File renamed without changes.
0 ...va/dev/sqlcj/generator/GeneratedFile.java → ...va/dev/sqlcj/generator/GeneratedFile.java
View file
Open in desktop
File renamed without changes.
0 ...ev/sqlcj/generator/JavaCodeGenerator.java → ...ev/sqlcj/generator/JavaCodeGenerator.java
View file
Open in desktop
File renamed without changes.
0 ...n/java/dev/sqlcj/generator/JavaNames.java → ...n/java/dev/sqlcj/generator/JavaNames.java
View file
Open in desktop
File renamed without changes.
0 .../java/dev/sqlcj/io/DefaultFileLoader.java → .../java/dev/sqlcj/io/DefaultFileLoader.java
View file
Open in desktop
File renamed without changes.
0 src/main/java/dev/sqlcj/io/FileLoader.java → ...rc/main/java/dev/sqlcj/io/FileLoader.java
View file
Open in desktop
File renamed without changes.
0 ...ava/dev/sqlcj/io/GeneratedFileWriter.java → ...ava/dev/sqlcj/io/GeneratedFileWriter.java
View file
Open in desktop
File renamed without changes.
0 .../dev/sqlcj/parser/DefaultQueryParser.java → .../dev/sqlcj/parser/DefaultQueryParser.java
View file
Open in desktop
File renamed without changes.
0 src/main/java/dev/sqlcj/parser/Query.java → ...src/main/java/dev/sqlcj/parser/Query.java
View file
Open in desktop
File renamed without changes.
0 ...in/java/dev/sqlcj/parser/QueryHeader.java → ...in/java/dev/sqlcj/parser/QueryHeader.java
View file
Open in desktop
File renamed without changes.
0 ...in/java/dev/sqlcj/parser/QueryParser.java → ...in/java/dev/sqlcj/parser/QueryParser.java
View file
Open in desktop
File renamed without changes.
0 ...main/java/dev/sqlcj/parser/QueryType.java → ...main/java/dev/sqlcj/parser/QueryType.java
View file
Open in desktop
File renamed without changes.
0 src/main/java/dev/sqlcj/schema/Column.java → ...rc/main/java/dev/sqlcj/schema/Column.java
View file
Open in desktop
File renamed without changes.
0 ...ain/java/dev/sqlcj/schema/ColumnType.java → ...ain/java/dev/sqlcj/schema/ColumnType.java
View file
Open in desktop
File renamed without changes.
0 ...ain/java/dev/sqlcj/schema/Constraint.java → ...ain/java/dev/sqlcj/schema/Constraint.java
View file
Open in desktop
File renamed without changes.
0 ...java/dev/sqlcj/schema/ConstraintType.java → ...java/dev/sqlcj/schema/ConstraintType.java
View file
Open in desktop
File renamed without changes.
0 src/main/java/dev/sqlcj/schema/Schema.java → ...rc/main/java/dev/sqlcj/schema/Schema.java
View file
Open in desktop
File renamed without changes.
0 src/main/java/dev/sqlcj/schema/Table.java → ...src/main/java/dev/sqlcj/schema/Table.java
View file
Open in desktop
File renamed without changes.
0 ...cj/schema/parser/DefaultSchemaParser.java → ...cj/schema/parser/DefaultSchemaParser.java
View file
Open in desktop
File renamed without changes.
0 ...j/schema/parser/SchemaParseException.java → ...j/schema/parser/SchemaParseException.java
View file
Open in desktop
File renamed without changes.
0 ...dev/sqlcj/schema/parser/SchemaParser.java → ...dev/sqlcj/schema/parser/SchemaParser.java
View file
Open in desktop
File renamed without changes.
0 src/main/java/dev/sqlcj/sql/ParsedSql.java → ...rc/main/java/dev/sqlcj/sql/ParsedSql.java
View file
Open in desktop
File renamed without changes.
0 ...a/dev/sqlcj/sql/SqlParameterCompiler.java → ...a/dev/sqlcj/sql/SqlParameterCompiler.java
View file
Open in desktop
File renamed without changes.
0 ...ain/java/dev/sqlcj/sql/SqlParameters.java → ...ain/java/dev/sqlcj/sql/SqlParameters.java
View file
Open in desktop
File renamed without changes.
0 ...java/dev/sqlcj/sql/SqlParseException.java → ...java/dev/sqlcj/sql/SqlParseException.java
View file
Open in desktop
File renamed without changes.
0 src/main/java/dev/sqlcj/sql/SqlParser.java → ...rc/main/java/dev/sqlcj/sql/SqlParser.java
View file
Open in desktop
File renamed without changes.
0 ...a/dev/sqlcj/type/DefaultTypeResolver.java → ...a/dev/sqlcj/type/DefaultTypeResolver.java
View file
Open in desktop
File renamed without changes.
0 ...ain/java/dev/sqlcj/type/TypeResolver.java → ...ain/java/dev/sqlcj/type/TypeResolver.java
View file
Open in desktop
File renamed without changes.
0 ...dev/sqlcj/analysis/QueryAnalyzerTest.java → ...dev/sqlcj/analysis/QueryAnalyzerTest.java
View file
Open in desktop
File renamed without changes.
0 ...qlcj/cli/command/GenerateCommandTest.java → ...qlcj/cli/command/GenerateCommandTest.java
View file
Open in desktop
File renamed without changes.
0 ...lcj/compiler/DefaultSourceLoaderTest.java → ...lcj/compiler/DefaultSourceLoaderTest.java
View file
Open in desktop
File renamed without changes.
0 ...lcj/compiler/PostgresIntegrationTest.java → ...lcj/compiler/PostgresIntegrationTest.java
View file
Open in desktop
File renamed without changes.
0 ...ompiler/SqlcjCompilerIntegrationTest.java → ...ompiler/SqlcjCompilerIntegrationTest.java
View file
Open in desktop
File renamed without changes.
0 ...ev/sqlcj/config/YamlConfigLoaderTest.java → ...ev/sqlcj/config/YamlConfigLoaderTest.java
View file
Open in desktop
File renamed without changes.
0 ...enerator/JavaCodeGeneratorNamingTest.java → ...enerator/JavaCodeGeneratorNamingTest.java
View file
Open in desktop
File renamed without changes.
0 ...qlcj/generator/JavaCodeGeneratorTest.java → ...qlcj/generator/JavaCodeGeneratorTest.java
View file
Open in desktop
File renamed without changes.
0 ...va/dev/sqlcj/generator/JavaNamesTest.java → ...va/dev/sqlcj/generator/JavaNamesTest.java
View file
Open in desktop
File renamed without changes.
0 ...dev/sqlcj/io/GeneratedFileWriterTest.java → ...dev/sqlcj/io/GeneratedFileWriterTest.java
View file
Open in desktop
File renamed without changes.
0 .../sqlcj/parser/DefaultQueryParserTest.java → .../sqlcj/parser/DefaultQueryParserTest.java
View file
Open in desktop
File renamed without changes.
0 ...chema/parser/DefaultSchemaParserTest.java → ...chema/parser/DefaultSchemaParserTest.java
View file
Open in desktop
File renamed without changes.
0 ...v/sqlcj/sql/SqlParameterCompilerTest.java → ...v/sqlcj/sql/SqlParameterCompilerTest.java
View file
Open in desktop
File renamed without changes.
0 ...est/java/dev/sqlcj/sql/SqlParserTest.java → ...est/java/dev/sqlcj/sql/SqlParserTest.java
View file
Open in desktop
File renamed without changes.
21 changes: 21 additions & 0 deletions sqlcj-runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>dev.sqlcj</groupId>
<artifactId>sqlcj</artifactId>
<version>0.1.0-SNAPSHOT</version>
</parent>

<artifactId>sqlcj-runtime</artifactId>

<name>sqlcj runtime</name>
<description>JDBC runtime used by sqlcj generated code</description>

<properties>
<spotless.java.config>${project.basedir}/../config/eclipse-java-formatter.xml</spotless.java.config>
</properties>
</project>
0 .../dev/sqlcj/runtime/JdbcQueryExecutor.java → .../dev/sqlcj/runtime/JdbcQueryExecutor.java
View file
Open in desktop
File renamed without changes.
0 ...qlcj/runtime/QueryExecutionException.java → ...qlcj/runtime/QueryExecutionException.java
View file
Open in desktop
File renamed without changes.
0 ...java/dev/sqlcj/runtime/QueryExecutor.java → ...java/dev/sqlcj/runtime/QueryExecutor.java
View file
Open in desktop
File renamed without changes.
0 ...ain/java/dev/sqlcj/runtime/RowMapper.java → ...ain/java/dev/sqlcj/runtime/RowMapper.java
View file
Open in desktop
File renamed without changes.
0 .../sqlcj/runtime/JdbcQueryExecutorTest.java → .../sqlcj/runtime/JdbcQueryExecutorTest.java
View file
Open in desktop
File renamed without changes.
Loading