Merge branch 'development'

This commit is contained in:
Brianna 2019-11-19 16:10:31 -05:00
commit 86b4841e97
2 changed files with 13 additions and 1 deletions

View File

@ -4,7 +4,7 @@ stages:
variables: variables:
name: "UltimateKits" name: "UltimateKits"
path: "/builds/$CI_PROJECT_PATH" path: "/builds/$CI_PROJECT_PATH"
version: "2.4.11" version: "2.4.12"
build: build:
stage: build stage: build

12
pom.xml
View File

@ -57,6 +57,8 @@
<includes> <includes>
<include>com.songoda:SongodaCore</include> <include>com.songoda:SongodaCore</include>
<include>com.zaxxer:HikariCP</include> <include>com.zaxxer:HikariCP</include>
<include>org.slf4j:slf4j-api</include>
<include>org.slf4j:slf4j-nop</include>
</includes> </includes>
</artifactSet> </artifactSet>
<filters> <filters>
@ -219,5 +221,15 @@
<artifactId>sqlite-jdbc</artifactId> <artifactId>sqlite-jdbc</artifactId>
<version>3.23.1</version> <version>3.23.1</version>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
<version>1.7.25</version>
</dependency>
</dependencies> </dependencies>
</project> </project>