mirror of https://github.com/webbukkit/dynmap.git
Add postgres JDBC to uberjar, shadow to avoid global conflicts
This commit is contained in:
parent
d91a98abc3
commit
b7e7039c38
|
@ -8,6 +8,7 @@ dependencies {
|
||||||
compile 'com.googlecode.json-simple:json-simple:1.1.1'
|
compile 'com.googlecode.json-simple:json-simple:1.1.1'
|
||||||
compile 'org.yaml:snakeyaml:1.23'
|
compile 'org.yaml:snakeyaml:1.23'
|
||||||
compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1'
|
compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1'
|
||||||
|
compile 'org.postgresql:postgresql:42.2.18'
|
||||||
}
|
}
|
||||||
|
|
||||||
processResources {
|
processResources {
|
||||||
|
@ -40,6 +41,7 @@ shadowJar {
|
||||||
include(dependency('javax.servlet::'))
|
include(dependency('javax.servlet::'))
|
||||||
include(dependency('org.eclipse.jetty::'))
|
include(dependency('org.eclipse.jetty::'))
|
||||||
include(dependency('org.eclipse.jetty.orbit:javax.servlet:'))
|
include(dependency('org.eclipse.jetty.orbit:javax.servlet:'))
|
||||||
|
include(dependency('org.postgresql:postgresql:'))
|
||||||
include(dependency(':DynmapCoreAPI'))
|
include(dependency(':DynmapCoreAPI'))
|
||||||
}
|
}
|
||||||
relocate('org.json.simple', 'org.dynmap.json.simple')
|
relocate('org.json.simple', 'org.dynmap.json.simple')
|
||||||
|
@ -47,6 +49,7 @@ shadowJar {
|
||||||
relocate('org.eclipse.jetty', 'org.dynmap.jetty')
|
relocate('org.eclipse.jetty', 'org.dynmap.jetty')
|
||||||
relocate('org.owasp.html', 'org.dynmap.org.owasp.html')
|
relocate('org.owasp.html', 'org.dynmap.org.owasp.html')
|
||||||
relocate('javax.servlet', 'org.dynmap.javax.servlet' )
|
relocate('javax.servlet', 'org.dynmap.javax.servlet' )
|
||||||
|
relocate('org.postgresql', 'org.dynmap.org.postgresql')
|
||||||
destinationDir = file '../target'
|
destinationDir = file '../target'
|
||||||
classifier = ''
|
classifier = ''
|
||||||
}
|
}
|
||||||
|
|
|
@ -296,7 +296,7 @@ public class PostgreSQLMapStorage extends MapStorage {
|
||||||
connectionString = "jdbc:postgresql://" + hostname + ":" + port + "/" + database + flags;
|
connectionString = "jdbc:postgresql://" + hostname + ":" + port + "/" + database + flags;
|
||||||
Log.info("Opening PostgreSQL database " + hostname + ":" + port + "/" + database + " as map store");
|
Log.info("Opening PostgreSQL database " + hostname + ":" + port + "/" + database + " as map store");
|
||||||
try {
|
try {
|
||||||
Class.forName("org.postgresql.Driver");
|
Class.forName("org.dynmap.org.postgresql.Driver"); // Use shaded name for our bundled driver
|
||||||
// Initialize/update tables, if needed
|
// Initialize/update tables, if needed
|
||||||
if(!initializeTables()) {
|
if(!initializeTables()) {
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in New Issue