Update bStats (#868 )

Support newer JDKs for building
Apparently the ancient version of lombok used by a dependency is not compatible with newer versions of java. As Vault proper did not make use of lombok, it can be safely removed without declaring an alternative. This commit allows Vault to build under Java 17.
2022-06-27 15:34:40 -07:00 · 2022-06-27 11:33:51 -07:00 · 2022-06-27 10:58:59 -07:00 · 2022-06-27 10:50:08 -07:00
6 changed files with 113 additions and 95 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -5,7 +5,16 @@ env:
  global:
    - secure: "WGObsHmjnqn5e0nbXLGetwpUHU0UgvNk02+f0m3jIS7hSdBy5m1JK2K6NXV13brY0C9i0DLy0e7JKabqmqTxI94dT0LrYBxcvfmtZ/7PujOn/D9CzVimGj6g20hBDYwAXL6KAIR7JL8qexQBwIkVZPdwaA+k+UHLM9XVoIQdFgU="
    - secure: "XfBov3Z4Rk2AvS1v7o31Qr2XrO/oqQvl+Eksx9DO3XbGcLjT9wfGxGcYgP9IJO+Aa5AQo3Xud7EV4gqNpMa2PByzDdgg/nfyqSvrRvsG2aH1zm5N5bAHxCVlPimVdNtyeub6QBPCIGaWBp1R8x3Ak7F79mA5BdJuT9j5FBogC5U="
-script: .utility/do-build.sh
+
+deploy:
+  - provider: script
+    script: .utility/build.sh
+    on:
+      all_branches: true
+  - provider: script
+    script: .utility/deploy.sh
+    on:
+      branch: master

 cache:
  directories:
--- a/.utility/do-build.sh
+++ b/.utility/do-build.sh
@ -4,11 +4,5 @@ then
        echo 'Travis can only publish docs for release builds.'
        return 0
 fi
-if [[ $TRAVIS_PULL_REQUEST == true || "$TRAVIS_BRANCH" != "master" ]]
-then
-	mvn test
-else
-	mvn clean deploy --settings .utility/settings.xml
-fi
-
+mvn test
 exit $?
--- a/.utility/deploy.sh
+++ b/.utility/deploy.sh
@ -0,0 +1,8 @@
+#!/bin/bash
+if [[ "$TRAVIS_REPO_SLUG" != "MilkBowl/Vault" ]]
+then
+        echo 'Travis can only publish docs for release builds.'
+        return 0
+fi
+mvn clean deploy --settings .utility/settings.xml
+exit $?
--- a/README.md
+++ b/README.md
@ -1,43 +1,43 @@
 # Vault - Abstraction Library for Bukkit - [![](https://travis-ci.org/MilkBowl/Vault.svg?branch=master)](https://travis-ci.org/MilkBowl/Vault)

 ## For Developers:
-Please see the [VaultAPI](http://www.github.com/MilkBowl/VaultAPI) page for 
-information on developing with Vault's API.  In the past you would use the same
-artifact as servers installed, but the API has now been split from the main 
-project and is under a different artifact name.  Please make sure you accommodate
-for this change in your build process.
+Please see the [VaultAPI](https://www.github.com/MilkBowl/VaultAPI) page for
+information on developing with Vault's API. In the past, you would use the same
+artifact as servers installed, but the API has now been split from the main
+project and is under a different artifact name. Please make sure you accommodate
+this change in your build process.

 ## Installing
 Installing Vault is as simple as copying the provided "Vault.jar" to your
-"<bukkit-install-dir>/plugins" directory and the rest is automatic!  If you
+"<bukkit-install-dir>/plugins" directory, and the rest is automatic! If you
 wish to perform configuration changes, this can be done via a configuration
-file but should not be necessary in most cases.  See the "Advanced
+file but should not be necessary in most cases. See the "Advanced
 Configuration" section for more information.


 ## Why Vault?
 I have no preference which library suits your plugin and development efforts
-best.  Really, I thought a central suite (rather...Vault) of solutions was the
-the proper avenue than focusing on a single category of plugin.  That's where
+best. Really, I thought a central suite (rather...Vault) of solutions was the
+proper avenue than focusing on a single category of plugin. That's where
 the idea for Vault came into play.

 So, what features do I _think_ you'll like the most?

- * No need to include my source code in your plugin
-   All of Vault is run in its own plugin, so all you need to do is obtain an
-   instance of it!  This simplifies issues with multiple plugins using the same
-   namespaces.  Just simply add Vault.jar to your download zip file!
- * Broad range of supported plugins
-   I wanted an abstraction layer not only for Economic plugins but also
-   Permission plugins as well.
- * Choice!
-   That's half the fun of Bukkit, we get to choose what to use!  More choice
-   has never hurt developers so here's to choice!
+* No need to include my source code in your plugin
+  All of Vault is run in its own plugin, so all you need to do is obtain an
+  instance of it! This simplifies issues with multiple plugins using the same
+  namespaces. Just simply add Vault.jar to your download zip file!
+* Broad range of supported plugins
+  I wanted an abstraction layer not only for Economic plugins but also
+  Permission plugins as well.
+* Choice!
+  That's half the fun of Bukkit! We get to choose what to use. More choice
+  has never hurt developers, so here's to choice!


 ## Permissions
- * vault.admin
-   - Determines if a player should recieve the update notices
+* vault.admin
+  - Determines if a player should receive the update notices

 ## License
 Copyright (C) 2011-2018 Morgan Humes <morgan@lanaddict.com>
@ -49,11 +49,11 @@ the Free Software Foundation, either version 3 of the License, or

 Vault is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 GNU Lesser General Public License for more details.

 You should have received a copy of the GNU Lesser General Public License
-along with Vault.  If not, see <http://www.gnu.org/licenses/>.
+with Vault. If not, see <http://www.gnu.org/licenses/>.

 ## Building
 Vault comes with all libraries needed to build from the current branch and
@ -63,74 +63,74 @@ also comes with an Apache Ant build file (build.xml) and a Maven build file

 ## Dependencies
 Because Vault provides a bridge to other plugins, their binaries will be
-required to build from.  To ease this, they have been included in the lib
-folder and will be updated from time to time.  For plugin developers, it
-is not necessary to use these libraries when implementing Vault.  You will
+required to build from. To ease this, they have been included in the lib
+folder and will be updated from time to time. For plugin developers, it
+is not necessary to use these libraries when implementing Vault. You will
 only need to compile against Vault.


 ## Supported Plugins
-Vault provides abstraction for the following categories and plugins.  If 
-you have your own plugin that you believe should be supported you'll need 
+Vault provides abstraction for the following categories and plugins. If
+you have your own plugin that you believe should be supported, you'll need
 to add your own connector within your plugin as Vault no longer maintains
 new plugin connectors.

 * Economy
-   - 3co (http://forums.bukkit.org/threads/22461/)
-   - AEco
-   - BOSEconomy 6 (http://forums.bukkit.org/threads/19025/)
-   - BOSEconomy 7
-   - CommandsEX Economy (http://dev.bukkit.org/projects/commandsex)
-   - CraftConomy2 (http://dev.bukkit.org/projects/craftconomy)
-   - CraftConomy3 (http://dev.bukkit.org/projects/craftconomy)
-   - CurrencyCore (http://dev.bukkit.org/projects/currency)
-   - Dosh
-   - EconXP (http://dev.bukkit.org/projects/econxp)
-   - Essentials Economy (http://forums.bukkit.org/threads/15312/)
-   - eWallet (http://dev.bukkit.org/projects/ewallet)
-   - GoldIsMoney
-   - GoldIsMoney2
-   - Gringotts
-   - iConomy 4 (http://forums.bukkit.org/threads/40/)
-   - iConomy 5 (http://forums.bukkit.org/threads/40/)
-   - iConomy 6 (http://forums.bukkit.org/threads/40/)
-   - McMoney
-   - Miconomy
-   - MineConomy (http://dev.bukkit.org/projects/mineconomy)
-   - MineFaconomy2
-   - MultiCurrency
-   - SDFEconomy
-   - TAEcon
-   - XPBank
+  - 3co (https://forums.bukkit.org/threads/22461/)
+  - AEco
+  - BOSEconomy 6 (https://forums.bukkit.org/threads/19025/)
+  - BOSEconomy 7
+  - CommandsEX Economy (https://dev.bukkit.org/projects/commandsex)
+  - CraftConomy2 (https://dev.bukkit.org/projects/craftconomy)
+  - CraftConomy3 (https://dev.bukkit.org/projects/craftconomy)
+  - CurrencyCore (https://dev.bukkit.org/projects/currency)
+  - Dosh
+  - EconXP (https://dev.bukkit.org/projects/econxp)
+  - Essentials Economy (https://forums.bukkit.org/threads/15312/)
+  - eWallet (https://dev.bukkit.org/projects/ewallet)
+  - GoldIsMoney
+  - GoldIsMoney2
+  - Gringotts
+  - iConomy 4 (https://forums.bukkit.org/threads/40/)
+  - iConomy 5 (https://forums.bukkit.org/threads/40/)
+  - iConomy 6 (https://forums.bukkit.org/threads/40/)
+  - McMoney
+  - Miconomy
+  - MineConomy (https://dev.bukkit.org/projects/mineconomy)
+  - MineFaconomy2
+  - MultiCurrency
+  - SDFEconomy
+  - TAEcon
+  - XPBank

 * Permissions
-   - bPermissions
-   - bPermissions 2 (http://dev.bukkit.org/projects/bpermissions)
-   - DroxPerms
-   - Group Manager (Essentials) (http://forums.bukkit.org/threads/15312/)
-   - LuckPerms (https://www.spigotmc.org/resources/luckperms-an-advanced-permissions-plugin.28140/)
-   - OverPermissions (http://dev.bukkit.org/projects/overpermissions)
-   - Permissions 3 (http://forums.bukkit.org/threads/18430/)
-   - PermissionsBukkit
-   - Permissions Ex (PEX) (http://forums.bukkit.org/threads/18140/)
-   - Privileges
-   - rscPermissions
-   - SimplyPerms
-   - SuperPerms (Bukkit's default)
-   - TotalPermissions (http://dev.bukkit.org/projects/totalpermissions)
-   - XPerms
-   - zPermissions
+  - bPermissions
+  - bPermissions 2 (https://dev.bukkit.org/projects/bpermissions)
+  - DroxPerms
+  - Group Manager (Essentials) (https://forums.bukkit.org/threads/15312/)
+  - LuckPerms (https://www.spigotmc.org/resources/luckperms-an-advanced-permissions-plugin.28140/)
+  - OverPermissions (https://dev.bukkit.org/projects/overpermissions)
+  - Permissions 3 (https://forums.bukkit.org/threads/18430/)
+  - PermissionsBukkit
+  - Permissions Ex (PEX) (https://forums.bukkit.org/threads/18140/)
+  - Privileges
+  - rscPermissions
+  - SimplyPerms
+  - SuperPerms (Bukkit's default)
+  - TotalPermissions (https://dev.bukkit.org/projects/totalpermissions)
+  - XPerms
+  - zPermissions

 * Chat
-   - bPermissions
-   - Group Manager (Essentials) (http://forums.bukkit.org/threads/15312/)
-   - iChat
-   - LuckPerms (https://www.spigotmc.org/resources/luckperms-an-advanced-permissions-plugin.28140/)
-   - mChat
-   - mChatSuite
-   - OverPermissions (http://dev.bukkit.org/projects/overpermissions)
-   - Permissions 3 (http://forums.bukkit.org/threads/18430/)
-   - Permissions Ex (PEX) (http://forums.bukkit.org/threads/18140/)
-   - rscPermissions
-   - TotalPermissions (http://dev.bukkit.org/projects/totalpermissions)
-   - zPermissions
+  - bPermissions
+  - Group Manager (Essentials) (https://forums.bukkit.org/threads/15312/)
+  - iChat
+  - LuckPerms (https://www.spigotmc.org/resources/luckperms-an-advanced-permissions-plugin.28140/)
+  - mChat
+  - mChatSuite
+  - OverPermissions (https://dev.bukkit.org/projects/overpermissions)
+  - Permissions 3 (https://forums.bukkit.org/threads/18430/)
+  - Permissions Ex (PEX) (https://forums.bukkit.org/threads/18140/)
+  - rscPermissions
+  - TotalPermissions (https://dev.bukkit.org/projects/totalpermissions)
+  - zPermissions
--- a/pom.xml
+++ b/pom.xml
@ -85,7 +85,7 @@ Vault currently supports the following: Permissions 3, PEX, GroupManager, bPerms
 		<dependency>
 			<groupId>org.bstats</groupId>
 			<artifactId>bstats-bukkit</artifactId>
-			<version>1.5</version>
+			<version>3.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.gmail.bleedobsidian.miconomy</groupId>
@ -324,6 +324,12 @@ Vault currently supports the following: Permissions 3, PEX, GroupManager, bPerms
 			<artifactId>craftconomy3</artifactId>
 			<version>3.2.2-SNAPSHOT</version>
 			<optional>true</optional>
+			<exclusions>
+				<exclusion>
+					<groupId>org.projectlombok</groupId>
+					<artifactId>lombok</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>net.crystalyx.bukkit.simplyperms</groupId>
--- a/src/net/milkbowl/vault/Vault.java
+++ b/src/net/milkbowl/vault/Vault.java
@ -78,6 +78,7 @@ import net.milkbowl.vault.permission.plugins.Permission_rscPermissions;
 import net.milkbowl.vault.permission.plugins.Permission_KPerms;

 import org.bstats.bukkit.Metrics;
+import org.bstats.charts.SimplePie;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
@ -185,7 +186,7 @@ public class Vault extends JavaPlugin {
        });

        // Load up the Plugin metrics
-        Metrics metrics = new Metrics(this);
+        Metrics metrics = new Metrics(this, 887);
        findCustomData(metrics);

        log.info(String.format("Enabled Version %s", getDescription().getVersion()));
@ -581,7 +582,7 @@ public class Vault extends JavaPlugin {
            econ = rspEcon.getProvider();
        }
        final String econName = econ != null ? econ.getName() : "No Economy";
-        metrics.addCustomChart(new Metrics.SimplePie("economy", new Callable<String>() {
+        metrics.addCustomChart(new SimplePie("economy", new Callable<String>() {
            @Override
            public String call() {
                return econName;
@ -590,7 +591,7 @@ public class Vault extends JavaPlugin {

        // Create our Permission Graph and Add our permission Plotters
        final String permName = Bukkit.getServer().getServicesManager().getRegistration(Permission.class).getProvider().getName();
-        metrics.addCustomChart(new Metrics.SimplePie("permission", new Callable<String>() {
+        metrics.addCustomChart(new SimplePie("permission", new Callable<String>() {
            @Override
            public String call() {
                return permName;
@ -604,7 +605,7 @@ public class Vault extends JavaPlugin {
            chat = rspChat.getProvider();
        }
        final String chatName = chat != null ? chat.getName() : "No Chat";
-        metrics.addCustomChart(new Metrics.SimplePie("chat", new Callable<String>() {
+        metrics.addCustomChart(new SimplePie("chat", new Callable<String>() {
            @Override
            public String call() {
                return chatName;
Author	SHA1	Message	Date
Leonardo Di Gianfelice Stornelli	3f20655f0b	Update bStats (#868 )	2022-06-27 15:34:40 -07:00
Geolykt	2022cb0892	Support newer JDKs for building Apparently the ancient version of lombok used by a dependency is not compatible with newer versions of java. As Vault proper did not make use of lombok, it can be safely removed without declaring an alternative. This commit allows Vault to build under Java 17.	2022-06-27 11:33:51 -07:00
Jack	8e7ca81a40	fix spelling and grammar and use HTTPS in README (#890 )	2022-06-27 10:58:59 -07:00
Morgan	8c963f39da	build: use travis for config for conditionals instead of scripts (#893 )	2022-06-27 10:50:08 -07:00