locusworks/eight-track
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated libraries
All checks were successful
Locusworks Team/eight-track/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Isaac Parenteau
2021-09-14 23:17:06 -05:00
parent 599052a235
commit a24810a53a
2 changed files with 52 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
pom.xml
View File

@ -18,18 +18,18 @@
</scm>
<properties>
<flyway.version>7.0.4</flyway.version>
<mysql.version>8.0.22</mysql.version>
<hibernate.version>5.4.22.Final</hibernate.version>
<spring.version>5.2.9.RELEASE</spring.version>
<spring.boot.version>2.3.4.RELEASE</spring.boot.version>
<spring.data.version>2.3.4.RELEASE</spring.data.version>
<jackson.version>2.11.3</jackson.version>
<log4j.version>2.13.3</log4j.version>
<slf4j.version>1.7.30</slf4j.version>
<maven.enforcer.version>3.0.0-M3</maven.enforcer.version>
<dep.check.version>5.3.2</dep.check.version>
<license-maven-plugin.version>3.0</license-maven-plugin.version>
<flyway.version>7.15.0</flyway.version>
<mysql.version>8.0.26</mysql.version>
<hibernate.version>5.5.7.Final</hibernate.version>
<spring.version>5.3.9</spring.version>
<spring.boot.version>2.5.4</spring.boot.version>
<spring.data.version>2.5.4</spring.data.version>
<jackson.version>2.12.5</jackson.version>
<log4j.version>2.14.1</log4j.version>
<slf4j.version>1.7.32</slf4j.version>
<maven.enforcer.version>3.0.0</maven.enforcer.version>
<dep.check.version>6.3.1</dep.check.version>
<license-maven-plugin.version>4.1</license-maven-plugin.version>
<nexus.repo>https://nexus.locusworks.net</nexus.repo>
</properties>
@ -93,13 +93,14 @@
<artifactId>license-maven-plugin</artifactId>
<version>${license-maven-plugin.version}</version>
<configuration>
<quiet>false</quiet>
<header>${basedir}/licenses/LICENSE.template</header>
<strictCheck>true</strictCheck>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
<include>**/*.java</include>
</includes>
<licenseSets>
<licenseSet>
<header>${project.baseUri}/licenses/LICENSE.template</header>
<includes>
<include>**/*.java</include>
</includes>
</licenseSet>
</licenseSets>
</configuration>
<dependencies>
<!-- this dependency allows ${license.git.copyrightLastYear} in the
@ -141,20 +142,20 @@
<dependency>
<groupId>net.locusworks</groupId>
<artifactId>applogger</artifactId>
<version>1.0.1-RELEASE</version>
<version>1.0.3-RELEASE</version>
</dependency>
<dependency>
<groupId>net.locusworks</groupId>
<artifactId>crypto</artifactId>
<version>1.0.1-RELEASE</version>
<version>1.0.2-RELEASE</version>
</dependency>
<!-- https://mvnrepository.com/artifact/net.dv8tion/JDA2 -->
<dependency>
<groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId>
<version>4.2.0_209</version>
<version>4.3.0_277</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
@ -174,9 +175,34 @@
<dependency>
<groupId>com.sedmelluq</groupId>
<artifactId>lavaplayer</artifactId>
<version>1.3.50</version>
<version>1.3.77</version>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
<exclusion>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.jsoup/jsoup -->
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.14.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.flywaydb/flyway-core -->
<dependency>
<groupId>org.flywaydb</groupId>

11
src/main/java/net/locusworks/discord/eighttrack/database/config/EightTrackDataSource.java
View File

@ -75,18 +75,13 @@ public class EightTrackDataSource {
@Bean
public DataSource dataSource() throws Exception {
logger.debug("Getting datasource");
return getDataSource(confService.getDatabaseUsername(),
confService.getDatabasePassword(),
"/eighttrack");
return getDataSource(confService.getDatabaseUsername(), confService.getDatabasePassword(), "/eighttrack");
}
@Bean
public DataSource flywayDataSource() throws Exception {
logger.debug("Logging in with flyway for migrations");
return getDataSource(confService.getDatabaseRootUsername(),
confService.getDatabaseRootPassword(),
"");
logger.debug("Logging in with flyway for migrations");;
return getDataSource(confService.getDatabaseRootUsername(), confService.getDatabaseRootPassword(), "");
}
private DataSource getDataSource(String user, String passwd, String db) throws Exception {