Collapse into top-level module

src/common/pom.xml

@@ -1,112 +0,0 @@
-<?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>
-
-    <groupId>solutions.bitbadger.documents</groupId>
-    <artifactId>common</artifactId>
-    <version>4.0-ALPHA</version>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <kotlin.code.style>official</kotlin.code.style>
-        <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
-        <kotlin.version>2.1.0</kotlin.version>
-        <serialization.version>1.8.0</serialization.version>
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>mavenCentral</id>
-            <url>https://repo1.maven.org/maven2/</url>
-        </repository>
-    </repositories>
-
-    <build>
-        <sourceDirectory>src/main/kotlin</sourceDirectory>
-        <testSourceDirectory>src/test/kotlin</testSourceDirectory>
-        <plugins>
-            <plugin>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-maven-plugin</artifactId>
-                <version>${kotlin.version}</version>
-                <executions>
-                    <execution>
-                        <id>compile</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>test-compile</id>
-                        <phase>test-compile</phase>
-                        <goals>
-                            <goal>test-compile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <compilerPlugins>
-                        <plugin>kotlinx-serialization</plugin>
-                    </compilerPlugins>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.jetbrains.kotlin</groupId>
-                        <artifactId>kotlin-maven-serialization</artifactId>
-                        <version>${kotlin.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-            <plugin>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.6.0</version>
-                <configuration>
-                    <mainClass>MainKt</mainClass>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <version>5.11.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-test-junit5</artifactId>
-            <version>${kotlin.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-reflect</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlinx</groupId>
-            <artifactId>kotlinx-serialization-json</artifactId>
-            <version>${serialization.version}</version>
-        </dependency>
-    </dependencies>
-
-</project>

src/main/kotlin/AutoId.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import kotlin.reflect.full.*
 

src/main/kotlin/Comparison.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * A comparison against a field in a JSON document

src/main/kotlin/Configuration.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import kotlinx.serialization.json.Json
 import java.sql.Connection

src/main/kotlin/ConnectionExtensions.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import java.sql.Connection
 import java.sql.ResultSet

src/main/kotlin/Dialect.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * The SQL dialect to use when building queries

src/main/kotlin/DocumentException.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * An exception caused by invalid operations in the document library

src/main/kotlin/Field.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * A field and its comparison

src/main/kotlin/FieldFormat.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * The data format for a document field retrieval

src/main/kotlin/FieldMatch.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * How fields should be matched in by-field queries

src/main/kotlin/Op.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * A comparison operator used for fields

src/main/kotlin/Parameter.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * A parameter to use for a query

src/main/kotlin/ParameterName.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * Derive parameter names; each instance wraps a counter to provide names for anonymous fields

src/main/kotlin/ParameterType.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 /**
  * The types of parameters supported by the document library

src/main/kotlin/Parameters.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import java.sql.Connection
 import java.sql.PreparedStatement

src/main/kotlin/Query.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 object Query {
 

src/main/kotlin/Results.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import java.sql.PreparedStatement
 import java.sql.ResultSet

src/test/kotlin/AutoIdTest.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test

src/test/kotlin/ConfigurationTest.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test

src/test/kotlin/FieldMatchTest.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test

src/test/kotlin/FieldTest.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test

src/test/kotlin/OpTest.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test

src/test/kotlin/ParameterNameTest.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test

src/test/kotlin/ParameterTest.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.assertThrows

src/test/kotlin/ParametersTest.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import kotlin.test.Test

src/test/kotlin/QueryTest.kt

@@ -1,4 +1,4 @@
-package solutions.bitbadger.documents.common
+package solutions.bitbadger.documents
 
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test