Skip to content

Commit

Permalink
Merge pull request #360 from vincent4vx/chore-prepare-v0-12
Browse files Browse the repository at this point in the history 
chore: update dependencies and prepare v0.12
  • Loading branch information
@vincent4vx
vincent4vx authored Jul 20, 2024
2 parents a95bf62 + 2b55002 commit bee02a4
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 26 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ Launch the built jar.
To run the server, your working directory should contain the `config.ini` file.

```
java -jar target/araknemu-0.11-alpha-jar-with-dependencies.jar
java -jar target/araknemu-0.12-alpha-jar-with-dependencies.jar
```

## About the project
Expand Down
50 changes: 25 additions & 25 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,27 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<errorProneJavac>${com.google.errorprone:javac:jar}</errorProneJavac>
<checkerframework.version>3.42.0</checkerframework.version>
</properties>

<groupId>fr.quatrevieux.araknemu</groupId>
<artifactId>araknemu</artifactId>
<version>0.11-alpha</version>
<version>0.12-alpha</version>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.1.104.Final</version>
<version>4.1.111.Final</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
<version>3.15.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.11.0</version>
<version>1.12.0</version>
</dependency>
<dependency>
<groupId>args4j</groupId>
Expand All @@ -59,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.22.1</version>
<version>2.23.1</version>
</dependency>
<dependency>
<groupId>org.ini4j</groupId>
Expand All @@ -69,13 +70,12 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>3.3.2</version>
<version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<!-- TODO See: https://github.com/xerial/sqlite-jdbc/pull/1035 -->
<version>3.42.0.1</version>
<version>3.46.0.0</version>
</dependency>
<dependency>
<groupId>fr.arakne</groupId>
Expand All @@ -90,32 +90,32 @@
<dependency>
<groupId>com.github.seancfoley</groupId>
<artifactId>ipaddress</artifactId>
<version>5.4.0</version>
<version>5.5.0</version>
</dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>4.0.17</version>
<version>4.0.22</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>io.github.cdimascio</groupId>
<artifactId>dotenv-java</artifactId>
<version>2.3.1</version>
<version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version>3.42.0</version> <!-- TODO property -->
<version>${checkerframework.version}</version>
</dependency>
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-util</artifactId>
<version>3.42.0</version>
<version>${checkerframework.version}</version>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
Expand All @@ -127,13 +127,13 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.10.1</version>
<version>5.10.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.10.1</version>
<version>5.10.3</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -155,7 +155,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.3</version>
<version>3.3.1</version>
<configuration>
<parallel>classes</parallel>
<forkCount>4</forkCount>
Expand All @@ -164,7 +164,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.2</version>
<configuration>
<archive>
<manifest>
Expand All @@ -178,7 +178,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.6.0</version>
<version>3.7.1</version>
<configuration>
<archive>
<manifest>
Expand All @@ -205,7 +205,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.11</version>
<version>0.8.12</version>

<executions>
<execution>
Expand All @@ -227,7 +227,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.3.1</version>
<version>3.4.0</version>
<configuration>
<configLocation>checkstyle.xml</configLocation>
</configuration>
Expand Down Expand Up @@ -282,14 +282,14 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
<version>3.13.0</version>
<configuration>
<fork>true</fork> <!-- Must fork or else JVM arguments are ignored. -->
<annotationProcessorPaths>
<path>
<groupId>org.checkerframework</groupId>
<artifactId>checker</artifactId>
<version>3.42.0</version>
<version>${checkerframework.version}</version>
</path>
</annotationProcessorPaths>
<annotationProcessors>
Expand All @@ -309,7 +309,7 @@
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker</artifactId>
<version>3.42.0</version>
<version>${checkerframework.version}</version>
</dependency>
</dependencies>
</profile>
Expand All @@ -335,7 +335,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
<version>3.13.0</version>
<configuration>
<fork>true</fork>
<compilerArgs combine.children="append">
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/fr/quatrevieux/araknemu/game/fight/ai/factory/type/SupportTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import fr.quatrevieux.araknemu.game.fight.ai.simulation.Simulator;
import fr.quatrevieux.araknemu.game.fight.fighter.Fighter;
import fr.quatrevieux.araknemu.game.fight.fighter.invocation.DoubleFighter;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

Expand All @@ -41,6 +42,7 @@ public void setUp() throws Exception {
dataSet.pushFunctionalSpells();
}

@AfterEach
@Override
public void tearDown() throws ContainerException {
super.tearDown();
Expand Down

0 comments on commit bee02a4

Please sign in to comment.