Skip to content

Commit e1dbcc2

Browse files
committed
fix classloading issues, build uber-jar
1 parent 73c82e7 commit e1dbcc2

File tree

5 files changed

+55
-6
lines changed

5 files changed

+55
-6
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ hs_err_pid*
2424
replay_pid*
2525

2626

27-
target/
27+
target/
28+
dependency-reduced-pom.xml

pom.xml

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
</exclusions>
4242
</dependency>
4343
<dependency>
44-
<groupId>mysql</groupId>
45-
<artifactId>mysql-connector-java</artifactId>
44+
<groupId>com.mysql</groupId>
45+
<artifactId>mysql-connector-j</artifactId>
4646
<version>8.0.33</version>
4747
</dependency>
4848
<dependency>
@@ -51,6 +51,11 @@
5151
<version>${orbital.version}</version>
5252
<scope>provided</scope>
5353
</dependency>
54+
<dependency>
55+
<groupId>com.orbitalhq</groupId>
56+
<artifactId>plugin-api</artifactId>
57+
<version>${orbital.version}</version>
58+
</dependency>
5459

5560

5661
<dependency>
@@ -207,8 +212,30 @@
207212
<version>2.22.2</version>
208213
</plugin>
209214
<plugin>
210-
<artifactId>maven-failsafe-plugin</artifactId>
211-
<version>2.22.2</version>
215+
<groupId>org.apache.maven.plugins</groupId>
216+
<artifactId>maven-shade-plugin</artifactId>
217+
<version>3.5.2</version> <!-- Use the latest version -->
218+
<executions>
219+
<execution>
220+
<phase>package</phase>
221+
<goals>
222+
<goal>shade</goal>
223+
</goals>
224+
<configuration>
225+
<artifactSet>
226+
<includes>
227+
<include>com.mysql:mysql-connector-j</include>
228+
<include>us.fatehi:schemacrawler-mysql</include>
229+
</includes>
230+
</artifactSet>
231+
<transformers>
232+
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
233+
<mainClass>com.yourcompany.MainClass</mainClass>
234+
</transformer>
235+
</transformers>
236+
</configuration>
237+
</execution>
238+
</executions>
212239
</plugin>
213240
</plugins>
214241
</build>

src/main/kotlin/com/orbitalhq/connectors/jdbc/mysql/MySqlDbSupport.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.orbitalhq.connectors.jdbc.mysql
22

3+
import com.mysql.cj.jdbc.Driver
34
import com.orbitalhq.connectors.config.jdbc.DatabaseDriverName
45
import com.orbitalhq.connectors.config.jdbc.JdbcMetadataParams
56
import com.orbitalhq.connectors.config.jdbc.JdbcUrlBuilder
@@ -8,11 +9,14 @@ import com.orbitalhq.connectors.jdbc.drivers.DatabaseDriverRegistry
89
import com.orbitalhq.connectors.jdbc.drivers.DatabaseSupport
910
import com.orbitalhq.connectors.jdbc.sql.dml.SqlOperation
1011
import com.orbitalhq.connectors.jdbc.sql.dml.SqlQuery
12+
import com.orbitalhq.plugins.jdbc.DriverProxy
1113
import com.orbitalhq.schemas.AttributeName
1214
import org.jooq.DSLContext
1315
import org.jooq.Field
1416
import org.jooq.RowN
1517
import org.jooq.impl.DSL
18+
import schemacrawler.tools.databaseconnector.DatabaseConnectorRegistry
19+
import java.sql.DriverManager
1620

1721
/**
1822
* Documenting known issues:
@@ -31,7 +35,8 @@ import org.jooq.impl.DSL
3135
object MySqlDbSupport : DatabaseSupport{
3236

3337
fun register() {
34-
DatabaseSupport.register(MySqlDbSupport)
38+
DatabaseConnectorRegistry.getDatabaseConnectorRegistry()
39+
DriverManager.registerDriver(DriverProxy(Driver()))
3540
}
3641

3742
override val driverName: DatabaseDriverName = "MYSQL"
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.orbitalhq.connectors.jdbc.mysql
2+
3+
import com.mysql.jdbc.Driver
4+
import com.orbitalhq.plugins.Plugin
5+
import com.orbitalhq.plugins.jdbc.DriverProxy
6+
import java.sql.DriverManager
7+
8+
class MySqlPlugin : Plugin {
9+
override val name: String = "com.orbitalhq.MySql"
10+
11+
override fun initialize() {
12+
MySqlDbSupport.register()
13+
14+
}
15+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
com.orbitalhq.connectors.jdbc.mysql.MySqlPlugin

0 commit comments

Comments
 (0)