Commit Graph

456 Commits

Author SHA1 Message Date
ljacqu
5f8a19223f Update ConfigMe and Mockito version 2016-12-23 23:22:05 +01:00
Xephi59
de97c60b5d FixMe from Gnat008 : Add PermissionsBukkit groups support 2016-12-20 21:35:26 +01:00
ljacqu
a38d3a25b8 Update Mockito version 2016-12-01 19:41:31 +01:00
ljacqu
de5324bbc6 #685 Fix PBKDF2 implementation
- Fix our PBKDF2 hash implementation and its test class
- Use external dependency as PBKDF2 implementation
2016-11-25 15:51:15 +01:00
Gabriele C
2fbf8b6c71 Use 1.11 2016-11-17 21:53:28 +01:00
ljacqu
44a8764115 Do not use master for experiments that break the build 2016-11-17 20:42:55 +01:00
Gabriele C
92c4c18da4 1.11: does it compile?
I'm from mobile but i'm curious :P
2016-11-17 13:22:12 +01:00
Gabriele C
15ff9ae442 Update dependencies + update README 2016-11-15 17:29:00 +01:00
ljacqu
5cce7e1fae Update version of ConfigMe, Mockito and sqlite-jdbc 2016-10-30 14:05:22 +01:00
Gabriele C
dc5fe64b15 Use Bukkit/Spigot 1.10.2 2016-10-16 23:50:47 +02:00
ljacqu
995d4acda2 Upgrade to ConfigMe 0.2 2016-10-16 20:08:52 +02:00
Gabriele C
c8cbd4e853 Update dependencies 2016-10-02 17:19:50 +02:00
ljacqu
ffc5b77f36 Revert: [RevertMe] Remove essentials hook (currently unavailable using maven) 2016-09-09 21:56:32 +02:00
Gabriele C
93c59555f8 Revert "Test if jenkins is stupid"
This reverts commit 59abf6ecf4.
2016-09-08 14:32:40 +02:00
Gabriele C
71c289f2f3 Revert "Try if jenkins became smarter"
This reverts commit 5045338a83.
2016-09-08 14:32:37 +02:00
Xephi
5045338a83 Try if jenkins became smarter 2016-09-08 11:27:33 +02:00
Xephi
59abf6ecf4 Test if jenkins is stupid 2016-09-08 11:18:46 +02:00
Gabriele C
933f0ba3d6 Update HikariCP version 2016-09-08 10:28:19 +02:00
Gabriele C
f63871600a [RevertMe] Remove essentials hook (currently unavailable using maven) 2016-09-07 16:04:20 +02:00
Gabriele C
0dac0c4b21 #927 Relocate ConfigMe 2016-09-04 16:30:30 +02:00
ljacqu
25780ede89 #927 Use 0.1 version and adjust to changes from ConfigMe 2016-09-04 15:32:58 +02:00
ljacqu
09f403f357 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into configme-integration
Conflicts:
	pom.xml
2016-09-04 15:25:58 +02:00
Gabriele C
5efed1b697 Bump java version requirement 2016-09-04 14:48:13 +02:00
Gabriele C
bc9d67abbd Bye bye java 7! 2016-09-04 14:42:50 +02:00
Gabriele C
6768f5fdce Relocate the injector 2016-09-04 14:16:35 +02:00
Gabriele C
af4e8acc04 Maven cleanup 2016-09-04 14:04:27 +02:00
Gabriele C
7deb75ab85 Deprecate GroupManager handler 2016-09-04 13:29:01 +02:00
Gabriele C
6e5c901c4b Fix build 2016-09-04 12:58:50 +02:00
ljacqu
0d368ef1a2 Revert: Use official bPermissions artifact
- Since 3ea933ffc6 the Jenkins build has been failing and it is no longer possible to build locally. Now Travis and CircleCI are also failing.
2016-09-03 10:05:32 +02:00
ljacqu
c7bb7b460e #927 Integrate ConfigMe into AuthMe (work in progress)
- Replace own code with ConfigMe
2016-08-30 15:28:07 +02:00
Gabriele C
3ea933ffc6 Use official bPermissions artifact 2016-08-29 01:21:40 +02:00
ljacqu
289ce7740f Update injector version and move shutdown logic to separate classes 2016-08-20 21:54:41 +02:00
Gabriele C
af48c2fc2a It doesn't make sense to have 2 alternative dependencies enabled 2016-08-04 20:35:35 +02:00
ljacqu
f0dfd85903 #831 Set Spigot profile to be activated by default
- I want to be able to check out the source and build immediately
2016-08-04 18:19:38 +02:00
Gabriele C
7806466a01 Close #884 2016-08-04 13:00:54 +02:00
Gabriele C
4b81e3b7dc Update vault repository 2016-08-04 02:10:35 +02:00
ljacqu
9a91156000 #835 Replace injector classes with ones from ch.jalu.injector project 2016-07-17 21:50:48 +02:00
Gabriele C
3616c3187e Whoops! 2016-07-13 12:55:23 +02:00
Gabriele C
c53dd5b3a8 Reduce the jar size by using the spigot's gson version 2016-07-13 12:52:55 +02:00
Gabriele C
f88d0bcb70 Update dependencies 2016-07-12 15:18:36 +02:00
ljacqu
491853e0c8 Change github URLs from AuthMe-Team/ to AuthMe/
- Change README sections to use more markdown
2016-07-10 11:42:40 +02:00
Gabriele C
a998354fa2 Project cleanup 2016-06-26 16:19:55 +02:00
Gabriele C
c79857cc14 Add Gnat008 as project author 2016-06-17 02:18:12 +02:00
Gabriele C
df17821e85 Let's switch again to SNAPSHOT 2016-06-16 04:26:30 +02:00
Gabriele C
941d4f09be Beta3! 2016-06-16 04:14:18 +02:00
Gabriele C
209625ab00 Update maven plugins 2016-06-13 20:04:02 +02:00
Gabriele C
01f297919d 1.10 API + cleanup 2016-06-11 17:46:24 +02:00
Gabriele C
a5a796e900 Update coveralls-maven-plugin 2016-06-05 01:47:17 +02:00
ljacqu
3753a0ef96 #565 Allow to skip extended encryption methods
- Set system property via surefire plugin and create profile that modifies the property
- Check for the new property in AbstractEncryptionMethodTest and shorten/skip the tests when necessary
2016-06-05 00:29:31 +02:00
Gabriele C
6c0dec887a try to fix javadoc 2016-06-03 00:27:06 +02:00
Gabriele C
506f32243b Fix pom typo + update h2 test dependency 2016-05-31 00:09:19 +02:00
ljacqu
a355c325c5 #513 Allow to run updateDocs task from command line 2016-05-20 17:15:53 +02:00
Gabriele C
7229a8b02b Update exec plugin, the doc task should run manually 2016-05-18 07:49:37 +02:00
Gabriele C
f784da7c2f Exclude new transitive dependency 2016-05-14 14:33:17 +02:00
Gabriele C
c748501345 Fix Multiverse dependency + fix invalid test in Eclipse 2016-05-14 00:01:26 +02:00
Gabriele C
05f0162a16 Damn HTTPS 2016-05-13 23:29:53 +02:00
Gabriele C
3f5154e3c7 Update api to 1.9.4 2016-05-10 23:58:08 +02:00
ljacqu
662f28ab4f #513 Fix class loading issue when running from mvn exec:java 2016-05-08 17:01:06 +02:00
Gabriele C
5cfb556fda #513 Doesn't work
@ljacqu Could you please check why this isn't working? run the "mvn
exec:java" command
2016-05-05 22:38:17 +02:00
Gabriele C
7de4efc025 Relocate Injection API 2016-05-05 18:46:39 +02:00
Gabriele C
fb4dd260f8 Correct pom properties 2016-05-05 18:39:35 +02:00
games647
917a48074a Try to fix Jenkins builds 2016-05-05 16:07:53 +02:00
Gabriele C
2d0bf08c40 Multiverse was injecting his spigot-api version -_- 2016-05-04 18:10:39 +02:00
Gabriele C
39aaef8f8a Pom enhancements 2016-05-04 17:12:14 +02:00
Gabriele C
2f76e06373 Remove spigot-api 2016-05-04 16:59:02 +02:00
ljacqu
23317caa46 Merge pull request #125 from AuthMe-Team/432-dependency-injection
432 dependency injection
2016-05-03 18:54:35 +02:00
Gabriele C
2a423e6f2f Continue SNAPSHOT development 2016-05-03 12:45:58 +02:00
Gabriele C
552ecb5d8e BETA2 Release 2016-05-03 12:44:35 +02:00
Gabriele C
df6aa0a7a8 Bump hikaricp version 2016-05-02 21:21:02 +02:00
ljacqu
f76a68cb26 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 432-dependency-injection
Conflicts:
	src/main/java/fr/xephi/authme/AuthMe.java
	src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java
	src/main/java/fr/xephi/authme/hooks/PluginHooks.java
	src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
	src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java
	src/test/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommandTest.java
2016-05-02 19:48:12 +02:00
Xephi59
121dd7e6fb Add Spigot API - 1.9 PlayerSpawnLocationEvent 2016-05-02 02:13:19 +02:00
ljacqu
02079f1f5c #432 Create custom dependency injector 2016-04-27 22:49:20 +02:00
Gabriele C
590532e557 the useless commit 2016-04-13 18:47:08 +02:00
Gabriele C
d46ad9ab5e Update hikari logger 2016-04-06 17:36:34 +02:00
Gabriele C
46c6eba3ea Bump API 2016-04-05 23:29:42 +02:00
DNx5
6132743913 Update pom.xml 2016-03-31 15:33:50 +07:00
DNx5
b43e706572 Update Bukkit API to 1.9-R0.1-SNAPSHOT 2016-03-31 14:36:01 +07:00
Gabriele C
379541d3cb Update hikari logger 2016-03-31 02:11:23 +02:00
Gabriele C
881a192413 Update hikaricp 2016-03-21 23:15:34 +01:00
Gabriele C
3ef96cc233 Switch to slf4j-simple (needs testing) 2016-03-20 13:25:02 +01:00
Gabriele C
951adf0b5f Update slf4j version 2016-03-17 21:38:47 +01:00
Gabriele C
af85090aa5 Don't fail if coveralls is down 2016-03-09 15:14:55 +01:00
Gabriele C
a23e0a6d30 Update HikariCP 2016-03-05 13:50:58 +01:00
Gabriele C
8432e67fd8 1.9 API + Fix permissions (CRITICAL)
#573
2016-03-01 17:34:56 +01:00
Gabriele C
6aa22f80ce Update dependencies 2016-02-29 21:34:21 +01:00
Gabriele C
2a9ab60fcd Pom cleanup 2016-02-28 19:11:22 +01:00
Gabriele C
90a0202b49 Fixed, finally!
Was a jenkins side issue!
2016-02-28 03:21:07 +01:00
Gabriele C
aaf17e6272 Damn mvn args 2016-02-28 03:14:36 +01:00
Gabriele C
cfdc99cfe6 Should fix mvn param 2016-02-28 03:04:43 +01:00
Gabriele C
a96a98e4ed Speed up junit 2016-02-28 02:28:37 +01:00
Gabriele C
3c82a5a936 Fix test arguments 2016-02-28 02:02:27 +01:00
Gabriele C
c61345fd43 cleanup + fix test crypts test on windows systems 2016-02-28 00:32:25 +01:00
Gabriele C
4bf8972875 Lombok + Retrolambda expressions support 2016-02-27 16:12:04 +01:00
Gabriele C
6d8e9d413f Switch to Essentials due to issues with the EssentialsX repo 2016-02-26 15:42:54 +01:00
Gabriele C
3f3b1cfde5 Fix EssentialsX dependency 2016-02-26 15:31:14 +01:00
ljacqu
5e16ca1490 #392 Create integration test for MySQL
- Relocate tests to AbstractDataSourceIntegrationTest to reuse tests for SQLite and MySQL
- Add H2 driver and create test class for MySQL
2016-02-22 21:52:10 +01:00
ljacqu
e8d627c0e1 #392 Start integration test for SQLite 2016-02-21 10:46:13 +01:00
Gabriele C
bb0d938141 Update to 1.9 API
No changes to the source are required :D
2016-02-20 18:41:19 +01:00
Gabriele C
1714b41657 Update dependencies 2016-02-19 16:30:31 +01:00
DNx5
edc20debea Going back to GeoIP legacy. :) 2016-02-19 21:55:53 +07:00
DNx
584fe1d67f Merge pull request #103 from AuthMe-Team/realname-update 2016-02-18 10:32:09 +07:00
DNx5
7b8e5f8e4f GeoIP2 update 2016-02-16 08:31:47 +07:00
DNx5
7c1dd888cc Fix real name update. 2016-02-16 07:14:40 +07:00
Gabriele C
76e7728b37 Don't relocate email dependency atm
Fix https://github.com/Xephi/AuthMeReloaded/issues/522
2016-02-14 19:19:05 +01:00
games647
c28a6922c0 Relocate libraries correctly (Related #467) 2016-02-12 17:37:24 +01:00
Gabriele C
dd8795a1bf Fix google libs relocation 2016-02-11 18:13:43 +01:00
Gabriele C
a74eeb5e44 update compiler 2016-02-11 11:36:54 +01:00
Gabriele C
e1b7303f61 Spaces please! + we need to shade gson because we are using version 2.5, bukkit's one is 2.2.4 (api conflicts)! 2016-02-10 22:43:28 +01:00
games647
0cb0bbcd37 Don't relocate libraries that are available in spigot 2016-02-10 22:22:53 +01:00
Gabriele C
62d55a512e Update geoip library 2016-02-10 13:56:56 +01:00
Gabriele C
0f13206a75 Provide a jar with shaded guava!
Fix #505 #467
2016-02-09 21:31:17 +01:00
Gabriele C
e5fd0d2025 Fix pex dependency 2016-02-07 23:21:34 +01:00
Gabriele C
960723e13d FIx twice javadoc generation 2016-02-07 22:26:29 +01:00
Gabriele C
eee594543b Disable pex repo, now pex is hosted on our jenkins server. 2016-02-07 22:11:10 +01:00
Gabriele C
dd54de4826 Try to fix pex repo 2016-02-07 22:00:58 +01:00
ljacqu
92f81c32c9 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 450-new-settings-rewrite 2016-02-06 17:17:45 +01:00
ljacqu
99b7b80f1d #450 Fix copying of JAR files to plugin folder
- Create SettingsMigrationService#copyFileFromResource (inspired from CustomSettings)
- Use new method to copy missing files in plugin folder from JAR
- Create YamlFileConfiguration inside NewSetting: FileConfiguration object provided by JavaPlugin#getConfig() sets default values from the JAR's config.yml :(
- Change ConsoleLogger to take logger from plugin (work in progress)
2016-02-06 17:10:00 +01:00
games647
9a07cadaa4 Re add bukkit version variable 2016-02-06 14:12:46 +01:00
games647
aff6858251 Change to spigot's repository link to https to fix building (fixes #451) 2016-02-06 14:08:34 +01:00
Gabriele C
11a03e5c46 Update dependencies 2016-02-01 13:24:45 +01:00
Gabriele C
3c88482e22 Maven enhancements 2016-01-21 16:12:39 +01:00
Xephi59
5573e7449d Force UTF-8 2015-12-31 01:27:40 +01:00
Xephi59
e1a84448a2 Fix the whole Javadoc syntax 2015-12-31 01:06:09 +01:00
Xephi59
ebb4f2bd3e Fix Javadoc generation 2015-12-30 23:57:30 +01:00
Xephi59
5354a6913f Use theses packages 2015-12-30 23:51:53 +01:00
Xephi59
1246bf4b4c Add Javadoc Goal 2015-12-30 23:46:38 +01:00
Gabriele C
300a621e1c cleanup 2015-12-30 22:28:45 +01:00
Gabriele C
4395d2ad87 never edit pom file from notepad++ 2015-12-30 22:21:09 +01:00
Gabriele C
3bc64917fa javadoc exclusions 2015-12-30 22:20:02 +01:00
Gabriele C
fc6c120f69 Add jacoco to maven 2015-12-28 13:43:22 +01:00
Gabriele C
66378eeccd Coveralls support 2015-12-28 13:36:02 +01:00
Gabriele C
f1557b29c3 Bye bye system scope dependencies! 2015-12-21 22:34:04 +01:00
Gabriele C
7614b263b0 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded 2015-12-18 17:11:33 +01:00
Gabriele C
7e6abf0441 Clean permission/group providers 2015-12-18 17:10:57 +01:00
Xephi
21d25e5ad3 Add email.html to resources 2015-12-17 18:56:58 +01:00
Gabriele C
9cbe57015e Update gson 2015-12-10 15:28:40 +01:00
Gabriele C
330a275725 Bump version: too many changes 2015-12-08 21:02:22 +01:00
Gabriele C
6ee07160bb cleanup and update deps 2015-12-08 20:07:10 +01:00
Gabriele C
a1f963adf8 update hikari 2015-12-04 13:23:17 +01:00
Gabriele C
22c22ba784 fix invalid plugin.yml version timestamp 2015-11-29 14:29:38 +01:00
Gabriele C
109c85f4dd Auto build number + helpHeader config 2015-11-29 14:27:44 +01:00
Gabriele C
594d4f7b30 revert broken maven features 2015-11-26 22:14:31 +01:00
Gabriele C
6e3fa6957f wrong phase 2015-11-26 19:37:57 +01:00
Gabriele C
84c3b44f82 try to fix auto version code 2015-11-26 19:32:40 +01:00
Gabriele C
db67c77b33 auto build number 2015-11-26 19:20:25 +01:00
DNx5
b6f6599779 Cleanup maven transitive dependencies
test to add jenkins build number in plugin version
2015-11-26 23:55:57 +07:00
ljacqu
e4c82e04ff Merge upstream/master into ljacqu/enums 2015-11-24 21:59:55 +01:00
Gabriele C
43b9462ddc cleanup 2015-11-24 21:13:09 +01:00
ljacqu
6422f90114 Create Wrapper for instances / revise MockUtils
- Add test resources folder
- Create basic test for Messages (todo: add concrete tests)
- Create WrapperMock
- Change UtilsTest (todo: make it work)
2015-11-23 23:25:03 +01:00
AuthMe-Team
9ec2d6d059 Stuff from the common floobits workspace
Author:    AuthMe-Team <AuthMeTeam@123NoEmail.com>
2015-11-23 20:23:52 +01:00