Skip to content

Queue async operations on a per-player basis [WIP] #2005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 44 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
2e72162
Queue async operations on a per-player basis (fixes the order of asyn…
sgdc3 Feb 3, 2020
6308351
Bump checker-qual from 3.1.0 to 3.1.1 (#2007)
dependabot-preview[bot] Feb 4, 2020
214f0b5
Bump postgresql from 42.2.9 to 42.2.10 (#2010)
dependabot-preview[bot] Feb 8, 2020
f7911ed
#1448 Create AuthMePlayer to get player data from API with (#2000)
ljacqu Feb 12, 2020
cb82e03
Bump maven-shade-plugin from 3.2.1 to 3.2.2 (#2016)
dependabot-preview[bot] Feb 13, 2020
3417027
Pom cleanup
sgdc3 Feb 16, 2020
f3cb8af
Bump mockito-core from 3.2.4 to 3.3.0
dependabot-preview[bot] Feb 24, 2020
7d4dfe3
Fix failing tests after Mockito upgrade
ljacqu Mar 3, 2020
1c86004
Bump maxmind-db-gson from 2.0.2-SNAPSHOT to 2.0.3 (#2034)
dependabot-preview[bot] Mar 4, 2020
e055bee
Bump checker-qual from 3.1.1 to 3.2.0 (#2033)
dependabot-preview[bot] Mar 4, 2020
3e9b78d
Bump maven-site-plugin from 3.8.2 to 3.9.0 (#2041)
dependabot-preview[bot] Mar 11, 2020
5fc1a68
Bump postgresql from 42.2.10 to 42.2.11 (#2040)
dependabot-preview[bot] Mar 11, 2020
d3ebf69
Update messages_fr.yml (#2035)
Twonox Mar 12, 2020
e02eee2
Update messages_tr.yml (#2052)
Legion64 Mar 30, 2020
6fb6728
Update messages_pt.yml (#2047)
1337god Mar 30, 2020
59157fb
Update checkstyle config
ljacqu Mar 30, 2020
d8a07ae
Bump googleauth from 1.4.0 to 1.5.0 (#2062)
dependabot-preview[bot] Apr 6, 2020
e2509da
Bump checker-qual from 3.2.0 to 3.3.0 (#2058)
dependabot-preview[bot] Apr 6, 2020
9e8e595
Merge branch 'master' into player-task-queue
sgdc3 Apr 8, 2020
4481a50
Merge branch 'master' into player-task-queue
sgdc3 Apr 8, 2020
20cad6f
Bump maven-javadoc-plugin from 3.1.1 to 3.2.0 (#2044)
dependabot-preview[bot] Apr 22, 2020
345a7c1
Bump mockito-core from 3.3.0 to 3.3.3 (#2045)
dependabot-preview[bot] Apr 22, 2020
223e3a5
Bump postgresql from 42.2.11 to 42.2.12 (#2056)
dependabot-preview[bot] Apr 22, 2020
a9e4700
Bump maven-shade-plugin from 3.2.2 to 3.2.3 (#2076)
dependabot-preview[bot] Apr 22, 2020
510dfbd
Bump argon2-jvm-nolibs from 2.6 to 2.7 (#2077)
dependabot-preview[bot] Apr 22, 2020
35a3ad1
Fixed unrestricted inventories (#2080)
DevLeoko Apr 22, 2020
d2c2d0f
Update messages_ru.yml (#2079)
Apr 22, 2020
d51781f
Fix failing tests
ljacqu May 2, 2020
5744aa9
Bump HikariCP from 3.4.2 to 3.4.4 (#2101)
dependabot-preview[bot] May 8, 2020
4c1b209
Bump sqlite-jdbc from 3.30.1 to 3.31.1 (#2100)
dependabot-preview[bot] May 8, 2020
3c9b107
Bump checker-qual from 3.3.0 to 3.4.0 (#2097)
dependabot-preview[bot] May 8, 2020
33f66d3
Bump HikariCP from 3.4.4 to 3.4.5 (#2107)
dependabot-preview[bot] May 16, 2020
d802de6
Bump api from 5.0 to 5.1 (#2106)
dependabot-preview[bot] May 16, 2020
8dad073
Estonian improvements (#2081)
Madis0 May 16, 2020
afff3e4
Update messages_br.yml (#2086)
Yudi May 16, 2020
fedcc44
Update docs
sgdc3 May 16, 2020
d5e47d7
Bump commons-email version
sgdc3 May 16, 2020
0c12ad2
Bump checker-qual from 3.4.0 to 3.4.1 (#2123)
dependabot-preview[bot] Jun 11, 2020
ca9c05a
Bump maven-shade-plugin from 3.2.3 to 3.2.4 (#2124)
dependabot-preview[bot] Jun 11, 2020
1b9d5bc
Bump postgresql from 42.2.12 to 42.2.14 (#2131)
dependabot-preview[bot] Jun 11, 2020
aaae85b
Bump sqlite-jdbc from 3.31.1 to 3.32.3 (#2136)
dependabot-preview[bot] Jun 25, 2020
29e6a45
Bump maven-site-plugin from 3.9.0 to 3.9.1 (#2139)
dependabot-preview[bot] Jun 25, 2020
5544fd0
Update Euskara (basque) translation (#2138)
galaipa Jun 25, 2020
e441d9d
Merge branch 'master' into player-task-queue
sgdc3 Jun 26, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@
</module>
<module name="JavadocMethod">
<property name="scope" value="package"/>
<property name="allowMissingThrowsTags" value="true"/>
<property name="allowedAnnotations" value="Override, Test, SectionComments, EventHandler, Before, BeforeClass"/>
<property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF"/> <!-- exclude CTOR_DEF -->
</module>
Expand All @@ -162,7 +161,6 @@
</module>
<module name="JavadocMethod">
<property name="scope" value="private"/>
<property name="allowMissingThrowsTags" value="true"/>
<property name="allowedAnnotations" value="Override, Test, SectionComments, EventHandler"/>
<property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF"/> <!-- exclude CTOR_DEF -->
</module>
Expand Down
9 changes: 4 additions & 5 deletions docs/commands.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- AUTO-GENERATED FILE! Do not edit this directly -->
<!-- File auto-generated on Fri Aug 02 16:25:51 CEST 2019. See docs/commands/commands.tpl.md -->
<!-- File auto-generated on Sat May 16 15:10:08 CEST 2020. See docs/commands/commands.tpl.md -->

## AuthMe Commands
You can use the following commands to use the features of AuthMe. Mandatory arguments are marked with `< >`
Expand All @@ -24,9 +24,9 @@ brackets; optional arguments are enclosed in square brackets (`[ ]`).
<br />Requires `authme.admin.changemail`
- **/authme getip** &lt;player>: Get the IP address of the specified online player.
<br />Requires `authme.admin.getip`
- **/authme totp** &lt;player>: Returns whether the specified player has enabled two-factor authentication
- **/authme totp** &lt;player>: Returns whether the specified player has enabled two-factor authentication.
<br />Requires `authme.admin.totpviewstatus`
- **/authme disabletotp** &lt;player>: Disable two-factor authentication for a player
- **/authme disabletotp** &lt;player>: Disable two-factor authentication for a player.
<br />Requires `authme.admin.totpdisable`
- **/authme spawn**: Teleport to the spawn.
<br />Requires `authme.admin.spawn`
Expand Down Expand Up @@ -105,7 +105,6 @@ brackets; optional arguments are enclosed in square brackets (`[ ]`).
<br />Requires `authme.player.security.verificationcode`
- **/verification help** [query]: View detailed help for /verification commands.


---

This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Fri Aug 02 16:25:51 CEST 2019
This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sat May 16 15:10:08 CEST 2020
12 changes: 6 additions & 6 deletions docs/translations.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- AUTO-GENERATED FILE! Do not edit this directly -->
<!-- File auto-generated on Sat Dec 28 12:03:51 CET 2019. See docs/translations/translations.tpl.md -->
<!-- File auto-generated on Sat May 16 15:10:13 CEST 2020. See docs/translations/translations.tpl.md -->

# AuthMe Translations
The following translations are available in AuthMe. Set `messagesLanguage` to the language code
Expand All @@ -14,10 +14,10 @@ Code | Language | Translated | &nbsp;
[de](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_de.yml) | German | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
[eo](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_eo.yml) | Esperanto | 79% | <img src="https://via.placeholder.com/79x7/bb9900?text=%20" alt="79" />
[es](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_es.yml) | Spanish | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
[et](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_et.yml) | Estonian | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
[et](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_et.yml) | Estonian | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
[eu](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_eu.yml) | Basque | 42% | <img src="https://via.placeholder.com/42x7/aa5500?text=%20" alt="42" />
[fi](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_fi.yml) | Finnish | 45% | <img src="https://via.placeholder.com/45x7/aa5500?text=%20" alt="45" />
[fr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_fr.yml) | French | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
[fr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_fr.yml) | French | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
[gl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_gl.yml) | Galician | 48% | <img src="https://via.placeholder.com/48x7/aa5500?text=%20" alt="48" />
[hu](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_hu.yml) | Hungarian | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
[id](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_id.yml) | Indonesian | 93% | <img src="https://via.placeholder.com/93x7/77dd44?text=%20" alt="93" />
Expand All @@ -26,13 +26,13 @@ Code | Language | Translated | &nbsp;
[lt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_lt.yml) | Lithuanian | 36% | <img src="https://via.placeholder.com/36x7/aa4400?text=%20" alt="36" />
[nl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_nl.yml) | Dutch | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
[pl](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pl.yml) | Polish | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
[pt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pt.yml) | Portuguese | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
[pt](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_pt.yml) | Portuguese | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
[ro](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ro.yml) | Romanian | 79% | <img src="https://via.placeholder.com/79x7/bb9900?text=%20" alt="79" />
[ru](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_ru.yml) | Russian | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
[si](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_si.yml) | Slovenian | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
[sk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_sk.yml) | Slovakian | 79% | <img src="https://via.placeholder.com/79x7/bb9900?text=%20" alt="79" />
[sr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_sr.yml) | Serbian | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
[tr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_tr.yml) | Turkish | 99% | <img src="https://via.placeholder.com/99x7/66ee55?text=%20" alt="99" />
[tr](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_tr.yml) | Turkish | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
[uk](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_uk.yml) | Ukrainian | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
[vn](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_vn.yml) | Vietnamese | 77% | <img src="https://via.placeholder.com/77x7/bb9900?text=%20" alt="77" />
[zhcn](https://github.com/AuthMe/AuthMeReloaded/blob/master/src/main/resources/messages/messages_zhcn.yml) | Chinese (China) | 100% | <img src="https://via.placeholder.com/100x7/66ff66?text=%20" alt="100" />
Expand All @@ -42,4 +42,4 @@ Code | Language | Translated | &nbsp;

---

This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sat Dec 28 12:03:51 CET 2019
This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sat May 16 15:10:13 CEST 2020
87 changes: 39 additions & 48 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<ciManagement>
<system>jenkins</system>
<url>http://ci.codemc.org/job/AuthMe/job/AuthMeReloaded/</url>
<url>https://ci.codemc.io/job/AuthMe/job/AuthMeReloaded/</url>
</ciManagement>

<issueManagement>
Expand All @@ -37,18 +37,18 @@
<distributionManagement>
<snapshotRepository>
<id>codemc-snapshots</id>
<url>https://repo.codemc.org/repository/maven-snapshots/</url>
<url>https://repo.codemc.io/repository/maven-snapshots/</url>
</snapshotRepository>
<repository>
<id>codemc-releases</id>
<url>https://repo.codemc.org/repository/maven-releases/</url>
<url>https://repo.codemc.io/repository/maven-releases/</url>
</repository>
</distributionManagement>

<licenses>
<license>
<name>The GNU General Public Licence version 3 (GPLv3)</name>
<url>http://www.gnu.org/licenses/gpl-3.0.html</url>
<url>https://www.gnu.org/licenses/gpl-3.0.html</url>
<distribution>repo</distribution>
</license>
</licenses>
Expand All @@ -64,7 +64,7 @@
<maven.minimumVersion>3.3.9</maven.minimumVersion>

<!-- Dependencies versions -->
<spigot.version>1.15-R0.1-SNAPSHOT</spigot.version>
<spigot.version>1.15.2-R0.1-SNAPSHOT</spigot.version>

<!-- Versioning properties -->
<project.outputName>AuthMe</project.outputName>
Expand Down Expand Up @@ -151,7 +151,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<version>3.2.0</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down Expand Up @@ -282,7 +282,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>3.2.4</version>
<executions>
<execution>
<phase>package</phase>
Expand Down Expand Up @@ -358,6 +358,7 @@
<shadedPattern>fr.xephi.authme.libs.org.bstats</shadedPattern>
</relocation>
</relocations>

<filters>
<!-- Ignore manifest signatures for shading the project into an uber-jar to fix -->
<!-- "Invalid signature file digest for Manifest main attributes" -->
Expand Down Expand Up @@ -388,7 +389,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.8.2</version>
<version>3.9.1</version>
</plugin>
<!-- Publish coveralls test coverage reports, not included in the build cycle by default -->
<plugin>
Expand All @@ -404,6 +405,18 @@
</build>

<repositories>
<!-- Apache snapshots repo -->
<repository>
<id>apache-snapshots</id>
<url>https://repository.apache.org/content/repositories/snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>

<!-- SpigotAPI Repo -->
<repository>
<id>spigotmc-repo</id>
Expand All @@ -419,7 +432,7 @@
<!-- CodeMC Repo (Contains many required libraries) -->
<repository>
<id>codemc-repo</id>
<url>https://repo.codemc.org/repository/maven-public/</url>
<url>https://repo.codemc.io/repository/maven-public/</url>
<releases>
<enabled>true</enabled>
</releases>
Expand All @@ -443,7 +456,7 @@
<!-- ProtocolLib Repo -->
<repository>
<id>dmulloy2-repo-releases</id>
<url>http://repo.dmulloy2.net/nexus/repository/releases/</url>
<url>https://repo.dmulloy2.net/nexus/repository/releases/</url>
<releases>
<enabled>true</enabled>
</releases>
Expand All @@ -453,7 +466,7 @@
</repository>
<repository>
<id>dmulloy2-repo-snapshots</id>
<url>http://repo.dmulloy2.net/nexus/repository/snapshots/</url>
<url>https://repo.dmulloy2.net/nexus/repository/snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
Expand All @@ -465,7 +478,7 @@
<!-- Multiverse Repo -->
<repository>
<id>onarandombox-repo-releases</id>
<url>http://repo.onarandombox.com/content/repositories/multiverse/</url>
<url>https://repo.onarandombox.com/content/repositories/multiverse/</url>
<releases>
<enabled>true</enabled>
</releases>
Expand All @@ -475,29 +488,7 @@
</repository>
<repository>
<id>onarandombox-repo-snapshots</id>
<url>http://repo.onarandombox.com/content/repositories/multiverse-snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>

<!-- Vault Repo -->
<repository>
<id>vault-repo-releases</id>
<url>http://nexus.hc.to/content/repositories/pub_releases</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>vault-repo-snapshots</id>
<url>http://nexus.hc.to/content/repositories/pub_snapshots</url>
<url>https://repo.onarandombox.com/content/repositories/multiverse-snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
Expand Down Expand Up @@ -531,7 +522,7 @@
<dependency>
<groupId>com.maxmind.db</groupId>
<artifactId>maxmind-db-gson</artifactId>
<version>2.0.2-SNAPSHOT</version>
<version>2.0.3</version>
<optional>true</optional>
<exclusions>
<exclusion>
Expand All @@ -553,7 +544,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-email</artifactId>
<version>1.5</version>
<version>1.6-SNAPSHOT</version>
<optional>true</optional>
</dependency>

Expand All @@ -569,7 +560,7 @@
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.4.2</version>
<version>3.4.5</version>
<optional>true</optional>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -598,19 +589,19 @@
<dependency>
<groupId>de.mkammerer</groupId>
<artifactId>argon2-jvm-nolibs</artifactId>
<version>2.6</version>
<version>2.7</version>
<optional>true</optional>
</dependency>

<!-- TOTP client -->
<dependency>
<groupId>com.warrenstrange</groupId>
<artifactId>googleauth</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<optional>true</optional>
</dependency>

<!-- Spigot API, http://www.spigotmc.org/ -->
<!-- Spigot API, https://www.spigotmc.org/ -->
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
Expand Down Expand Up @@ -692,7 +683,7 @@
<dependency>
<groupId>net.luckperms</groupId>
<artifactId>api</artifactId>
<version>5.0</version>
<version>5.1</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -728,7 +719,7 @@
</exclusions>
</dependency>

<!-- Vault, http://dev.bukkit.org/bukkit-plugins/vault/ -->
<!-- Vault, https://dev.bukkit.org/bukkit-plugins/vault/ -->
<dependency>
<groupId>net.milkbowl.vault</groupId>
<artifactId>VaultAPI</artifactId>
Expand All @@ -746,7 +737,7 @@
</exclusions>
</dependency>

<!-- Multi World plugin, http://www.spigotmc.org/resources/multiverse-core.390/ -->
<!-- Multi World plugin, https://www.spigotmc.org/resources/multiverse-core.390/ -->
<dependency>
<groupId>com.onarandombox.multiversecore</groupId>
<artifactId>Multiverse-Core</artifactId>
Expand Down Expand Up @@ -877,7 +868,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.2.9</version>
<version>42.2.14</version>
</dependency>

<!-- Unit Testing Libraries -->
Expand All @@ -900,7 +891,7 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
<version>3.2.4</version>
<version>3.3.3</version>
<exclusions>
<exclusion>
<artifactId>hamcrest-core</artifactId>
Expand All @@ -913,15 +904,15 @@
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version>3.1.0</version>
<version>3.4.1</version>
<scope>test</scope>
</dependency>

<!-- JDBC drivers for datasource integration tests -->
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.30.1</version>
<version>3.32.3</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/fr/xephi/authme/AuthMe.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import fr.xephi.authme.listener.PlayerListener19Spigot;
import fr.xephi.authme.listener.ServerListener;
import fr.xephi.authme.output.ConsoleLoggerFactory;
import fr.xephi.authme.process.AsyncUserScheduler;
import fr.xephi.authme.security.crypts.Sha256;
import fr.xephi.authme.service.BackupService;
import fr.xephi.authme.service.BukkitService;
Expand Down Expand Up @@ -67,6 +68,7 @@ public class AuthMe extends JavaPlugin {
private Settings settings;
private DataSource database;
private BukkitService bukkitService;
private AsyncUserScheduler asyncUserScheduler;
private Injector injector;
private BackupService backupService;
private ConsoleLogger logger;
Expand Down Expand Up @@ -249,6 +251,7 @@ private void initialize() {
void instantiateServices(Injector injector) {
database = injector.getSingleton(DataSource.class);
bukkitService = injector.getSingleton(BukkitService.class);
asyncUserScheduler = injector.getSingleton(AsyncUserScheduler.class);
commandHandler = injector.getSingleton(CommandHandler.class);
backupService = injector.getSingleton(BackupService.class);

Expand Down
Loading