mirror of
https://github.com/DreamExposure/DisCal-Discord-Bot.git
synced 2026-04-24 18:38:54 -05:00
Update R2DBC Connection pools dependency
I must have forgotten to update it because it and spring are no longer getting along. Hopefully its fixed now. Also changed the indents in the pom files to spaces to match our guidelines
This commit is contained in:
NovaFox161
+28
-29
@@ -1,29 +1,28 @@
|
||||
<?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>
|
||||
<packaging>jar</packaging>
|
||||
<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>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<parent>
|
||||
<groupId>org.dreamexposure</groupId>
|
||||
<artifactId>DisCal</artifactId>
|
||||
<version>${revision}</version>
|
||||
</parent>
|
||||
<parent>
|
||||
<groupId>org.dreamexposure</groupId>
|
||||
<artifactId>DisCal</artifactId>
|
||||
<version>${revision}</version>
|
||||
</parent>
|
||||
|
||||
<groupId>org.dreamexposure.discal</groupId>
|
||||
<artifactId>core</artifactId>
|
||||
<version>${revision}</version>
|
||||
<groupId>org.dreamexposure.discal</groupId>
|
||||
<artifactId>core</artifactId>
|
||||
<version>${revision}</version>
|
||||
|
||||
<dependencies>
|
||||
<!--Discord4J API-->
|
||||
<dependency>
|
||||
<groupId>com.discord4j</groupId>
|
||||
<artifactId>discord4j-core</artifactId>
|
||||
<version>${discord4j.version}</version>
|
||||
</dependency>
|
||||
<!--Discord4J Redis Stores-->
|
||||
<dependency>
|
||||
<dependencies>
|
||||
<!--Discord4J API-->
|
||||
<dependency>
|
||||
<groupId>com.discord4j</groupId>
|
||||
<artifactId>discord4j-core</artifactId>
|
||||
<version>${discord4j.version}</version>
|
||||
</dependency>
|
||||
<!--Discord4J Redis Stores-->
|
||||
<dependency>
|
||||
<groupId>com.discord4j</groupId>
|
||||
<artifactId>stores-redis</artifactId>
|
||||
<version>${discord4j.version}</version>
|
||||
@@ -34,12 +33,12 @@
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<finalName>DisCal-Core</finalName>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<build>
|
||||
<finalName>DisCal-Core</finalName>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-shade-plugin</artifactId>
|
||||
<version>${maven.plugin.shade.version}</version>
|
||||
@@ -64,6 +63,6 @@
|
||||
</archive>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
@@ -30,7 +30,7 @@
|
||||
<google.client-api.oauth.version>1.30.6</google.client-api.oauth.version>
|
||||
|
||||
<r2dbc.mysql.version>0.8.1.RELEASE</r2dbc.mysql.version>
|
||||
<r2dbc.pool.version>0.8.2.RELEASE</r2dbc.pool.version>
|
||||
<r2dbc.pool.version>0.8.3.RELEASE</r2dbc.pool.version>
|
||||
|
||||
<netty.version.forced>4.1.44.Final</netty.version.forced>
|
||||
|
||||
|
||||
+61
-62
@@ -1,60 +1,59 @@
|
||||
<?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>
|
||||
<packaging>jar</packaging>
|
||||
<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>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
|
||||
<maven.compiler.testSource>1.8</maven.compiler.testSource>
|
||||
<properties>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
|
||||
<maven.compiler.testSource>1.8</maven.compiler.testSource>
|
||||
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<project.build.targetEncoding>UTF-8</project.build.targetEncoding>
|
||||
</properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<project.build.targetEncoding>UTF-8</project.build.targetEncoding>
|
||||
</properties>
|
||||
|
||||
<parent>
|
||||
<groupId>org.dreamexposure</groupId>
|
||||
<artifactId>DisCal</artifactId>
|
||||
<version>${revision}</version>
|
||||
</parent>
|
||||
<parent>
|
||||
<groupId>org.dreamexposure</groupId>
|
||||
<artifactId>DisCal</artifactId>
|
||||
<version>${revision}</version>
|
||||
</parent>
|
||||
|
||||
<groupId>org.dreamexposure.discal</groupId>
|
||||
<artifactId>server</artifactId>
|
||||
<version>${revision}</version>
|
||||
<groupId>org.dreamexposure.discal</groupId>
|
||||
<artifactId>server</artifactId>
|
||||
<version>${revision}</version>
|
||||
|
||||
<dependencies>
|
||||
<!--DisCal Core-->
|
||||
<dependency>
|
||||
<groupId>org.dreamexposure.discal</groupId>
|
||||
<artifactId>core</artifactId>
|
||||
<version>${revision}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<!--JSch for SSH Tunneling-->
|
||||
<dependency>
|
||||
<groupId>com.jcraft</groupId>
|
||||
<artifactId>jsch</artifactId>
|
||||
<version>0.1.55</version>
|
||||
</dependency>
|
||||
<!--FlywayDB API for Database Migrations-->
|
||||
<dependency>
|
||||
<dependencies>
|
||||
<!--DisCal Core-->
|
||||
<dependency>
|
||||
<groupId>org.dreamexposure.discal</groupId>
|
||||
<artifactId>core</artifactId>
|
||||
<version>${revision}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<!--JSch for SSH Tunneling-->
|
||||
<dependency>
|
||||
<groupId>com.jcraft</groupId>
|
||||
<artifactId>jsch</artifactId>
|
||||
<version>0.1.55</version>
|
||||
</dependency>
|
||||
<!--FlywayDB API for Database Migrations-->
|
||||
<dependency>
|
||||
<groupId>org.flywaydb</groupId>
|
||||
<artifactId>flyway-core</artifactId>
|
||||
<version>6.4.4</version>
|
||||
</dependency>
|
||||
<!--MySQL Driver-->
|
||||
<!--MySQL Driver-->
|
||||
<dependency>
|
||||
<groupId>mysql</groupId>
|
||||
<artifactId>mysql-connector-java</artifactId>
|
||||
<version>8.0.20</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<build>
|
||||
<directory>../target</directory>
|
||||
<finalName>DisCal-Server</finalName>
|
||||
|
||||
@@ -77,26 +76,26 @@
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>${maven.plugin.jar.version}</version>
|
||||
<configuration>
|
||||
<archive>
|
||||
<manifest>
|
||||
<addClasspath>true</addClasspath>
|
||||
<mainClass>org.dreamexposure.discal.server.DisCalServer</mainClass>
|
||||
</manifest>
|
||||
</archive>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<archive>
|
||||
<manifest>
|
||||
<addClasspath>true</addClasspath>
|
||||
<mainClass>org.dreamexposure.discal.server.DisCalServer</mainClass>
|
||||
</manifest>
|
||||
</archive>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<version>${spring.maven-plugin.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-deploy-plugin</artifactId>
|
||||
@@ -105,6 +104,6 @@
|
||||
<skip>true</skip>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
+89
-90
@@ -1,44 +1,43 @@
|
||||
<?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">
|
||||
<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>
|
||||
|
||||
<packaging>jar</packaging>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
|
||||
<maven.compiler.testSource>1.8</maven.compiler.testSource>
|
||||
<properties>
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
|
||||
<maven.compiler.testSource>1.8</maven.compiler.testSource>
|
||||
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<project.build.targetEncoding>UTF-8</project.build.targetEncoding>
|
||||
</properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<project.build.targetEncoding>UTF-8</project.build.targetEncoding>
|
||||
</properties>
|
||||
|
||||
<parent>
|
||||
<groupId>org.dreamexposure</groupId>
|
||||
<artifactId>DisCal</artifactId>
|
||||
<version>${revision}</version>
|
||||
</parent>
|
||||
<parent>
|
||||
<groupId>org.dreamexposure</groupId>
|
||||
<artifactId>DisCal</artifactId>
|
||||
<version>${revision}</version>
|
||||
</parent>
|
||||
|
||||
<groupId>org.dreamexposure.discal</groupId>
|
||||
<artifactId>web</artifactId>
|
||||
<version>${revision}</version>
|
||||
<groupId>org.dreamexposure.discal</groupId>
|
||||
<artifactId>web</artifactId>
|
||||
<version>${revision}</version>
|
||||
|
||||
<dependencies>
|
||||
<!--DisCal Core-->
|
||||
<dependency>
|
||||
<groupId>org.dreamexposure.discal</groupId>
|
||||
<artifactId>core</artifactId>
|
||||
<version>${revision}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependencies>
|
||||
<!--DisCal Core-->
|
||||
<dependency>
|
||||
<groupId>org.dreamexposure.discal</groupId>
|
||||
<artifactId>core</artifactId>
|
||||
<version>${revision}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<build>
|
||||
<directory>../target</directory>
|
||||
<finalName>DisCal-Web</finalName>
|
||||
|
||||
@@ -61,26 +60,26 @@
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>${maven.plugin.jar.version}</version>
|
||||
<configuration>
|
||||
<archive>
|
||||
<manifest>
|
||||
<addClasspath>true</addClasspath>
|
||||
<mainClass>org.dreamexposure.discal.web.DisCalWeb</mainClass>
|
||||
</manifest>
|
||||
</archive>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<archive>
|
||||
<manifest>
|
||||
<addClasspath>true</addClasspath>
|
||||
<mainClass>org.dreamexposure.discal.web.DisCalWeb</mainClass>
|
||||
</manifest>
|
||||
</archive>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<version>${spring.maven-plugin.version}</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>repackage</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>exec-maven-plugin</artifactId>
|
||||
@@ -95,44 +94,44 @@
|
||||
<configuration>
|
||||
<executable>npm</executable>
|
||||
<commandlineArgs>install</commandlineArgs>
|
||||
<workingDirectory>..</workingDirectory>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>Compile Website Styles</id>
|
||||
<phase>generate-sources</phase>
|
||||
<goals>
|
||||
<goal>exec</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<executable>gulp</executable>
|
||||
<commandlineArgs>build</commandlineArgs>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>Compile Website Javascript</id>
|
||||
<phase>generate-sources</phase>
|
||||
<goals>
|
||||
<goal>exec</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<executable>webpack</executable>
|
||||
<workingDirectory>..</workingDirectory>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>Clean Website</id>
|
||||
<phase>clean</phase>
|
||||
<goals>
|
||||
<goal>exec</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<executable>gulp</executable>
|
||||
<commandlineArgs>clean:all</commandlineArgs>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<workingDirectory>..</workingDirectory>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>Compile Website Styles</id>
|
||||
<phase>generate-sources</phase>
|
||||
<goals>
|
||||
<goal>exec</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<executable>gulp</executable>
|
||||
<commandlineArgs>build</commandlineArgs>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>Compile Website Javascript</id>
|
||||
<phase>generate-sources</phase>
|
||||
<goals>
|
||||
<goal>exec</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<executable>webpack</executable>
|
||||
<workingDirectory>..</workingDirectory>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>Clean Website</id>
|
||||
<phase>clean</phase>
|
||||
<goals>
|
||||
<goal>exec</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<executable>gulp</executable>
|
||||
<commandlineArgs>clean:all</commandlineArgs>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-deploy-plugin</artifactId>
|
||||
@@ -141,6 +140,6 @@
|
||||
<skip>true</skip>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
Reference in New Issue
Block a user