Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Add postgres JDBC to uberjar, shadow to avoid global conflicts

Browse source
This commit is contained in:
Mike Primm 2021-02-07 22:50:41 -06:00
parent dd5b781cd3
commit a25b22409d
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
DynmapCore/build.gradle
View file

@ -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 = ''
} }

2
DynmapCore/src/main/java/org/dynmap/storage/postgresql/PostgreSQLMapStorage.java
View file

@ -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;