From 904522367dca6705906b88af5e8930adeea2034e Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@wasteofplastic.com>
Date: Wed, 7 Aug 2019 08:08:11 -0700
Subject: [PATCH] Updates POM to show build numbers in final name

https://github.com/BentoBoxWorld/Level/issues/74

Also updates to latest PowerMockito and Mockito2
---
 pom.xml                                       | 142 +++++++++++++-----
 .../bentobox/level/LevelPresenterTest.java    |   6 +-
 .../java/world/bentobox/level/TopTenTest.java |   2 +-
 3 files changed, 108 insertions(+), 42 deletions(-)

diff --git a/pom.xml b/pom.xml
index d92b547..88003e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,13 +6,24 @@
 
 	<groupId>world.bentobox</groupId>
 	<artifactId>level</artifactId>
-	<version>1.6.0-SNAPSHOT</version>
+    <version>${revision}</version>
 
 	<name>Level</name>
 	<description>Level is an add-on for BentoBox, an expandable Minecraft Bukkit plugin for island-type games like SkyBlock or AcidIsland.</description>
 	<url>https://github.com/BentoBoxWorld/Level</url>
 	<inceptionYear>2017</inceptionYear>
 
+    <developers>
+         <developer>
+            <id>tastybento</id>
+            <email>tastybento@bentobox.world</email>
+            <timezone>-8</timezone>
+            <roles>
+                <role>Lead Developer</role>
+            </roles>
+        </developer>
+    </developers>
+    
 	<scm>
 		<connection>scm:git:https://github.com/BentoBoxWorld/Level.git</connection>
 		<developerConnection>scm:git:git@github.com:BentoBoxWorld/Level.git</developerConnection>
@@ -41,12 +52,59 @@
 	</distributionManagement>
 
 	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
-		<powermock.version>1.7.4</powermock.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <!-- Non-minecraft related dependencies -->
+        <powermock.version>2.0.2</powermock.version>
+        <!-- More visible way how to change dependency versions -->
+        <spigot.version>1.13.2-R0.1-SNAPSHOT</spigot.version>
+        <bentobox.version>1.6.0-SNAPSHOT</bentobox.version>
+        <!-- Revision variable removes warning about dynamic version -->
+        <revision>${build.version}-SNAPSHOT</revision>
+        <!-- Do not change unless you want different name for local builds. -->
+        <build.number>-LOCAL</build.number>
+        <!-- This allows to change between versions. -->
+        <build.version>1.6.0</build.version>
 	</properties>
 
+    <!-- Profiles will allow to automatically change build version. -->
+    <profiles>
+        <profile>
+            <!-- ci profile is activated if exist environment variable BUILD_NUMBER.  -->
+            <!-- It replaces ${build.number} that is currently '-LOCAL' with correct build number from JENKINS machine.  -->
+            <id>ci</id>
+            <activation>
+                <property>
+                    <name>env.BUILD_NUMBER</name>
+                </property>
+            </activation>
+            <properties>
+                <!-- Override only if necessary -->
+                <build.number>-b${env.BUILD_NUMBER}</build.number>
+            </properties>
+        </profile>
+        <profile>
+            <!-- Master profile is activated if exist environment variable GIT_BRANCH and its value is origin/master. -->
+            <!-- It will replace 'revision' with '${build.version}' so it removes '-SNAPSHOT' string at the end. -->
+            <!-- Also, as this is release build, build number can be set to empty string. -->
+            <!-- This profile will be used only if exist environment variable GIT_BRANCH with value origin/master. -->
+            <id>master</id>
+            <activation>
+                <property>
+                    <name>env.GIT_BRANCH</name>
+                    <value>origin/master</value>
+                </property>
+            </activation>
+            <properties>
+                <!-- Override only if necessary -->
+                <revision>${build.version}</revision>
+                <!-- Empties build number variable.-->
+                <build.number></build.number>
+            </properties>
+        </profile>
+    </profiles>
+    
 	<repositories>
 		<repository>
 			<id>spigot-repo</id>
@@ -62,40 +120,50 @@
 		</repository>
 	</repositories>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.spigotmc</groupId>
-			<artifactId>spigot-api</artifactId>
-			<version>1.13.2-R0.1-SNAPSHOT</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.10.19</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4</artifactId>
-			<version>${powermock.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-api-mockito</artifactId>
-			<version>${powermock.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>world.bentobox</groupId>
-			<artifactId>bentobox</artifactId>
-			<version>1.6.0-SNAPSHOT</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
+    <dependencies>
+        <!-- Spigot API -->
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>${spigot.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- Mockito (Unit testing) -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>3.0.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>${powermock.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <version>${powermock.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>world.bentobox</groupId>
+            <artifactId>bentobox</artifactId>
+            <version>${bentobox.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 
 	<build>
+        <!-- By default ${revision} is ${build.version}-SNAPSHOT -->
+        <!-- If GIT_BRANCH variable is set to origin/master, then it will be only ${build.version}. -->
+
+        <!-- By default ${build.number} is -LOCAL. -->
+        <!-- If the BUILD_NUMBER variable is set, then it will be -b[number]. -->
+        <!-- If GIT_BRANCH variable is set to origin/master, then it will be the empty string. -->
+        <finalName>${project.name}-${revision}${build.number}</finalName>
+        
 		<defaultGoal>clean package</defaultGoal>
 		<resources>
 			<resource>
diff --git a/src/test/java/world/bentobox/level/LevelPresenterTest.java b/src/test/java/world/bentobox/level/LevelPresenterTest.java
index 51293e5..e701c72 100644
--- a/src/test/java/world/bentobox/level/LevelPresenterTest.java
+++ b/src/test/java/world/bentobox/level/LevelPresenterTest.java
@@ -48,7 +48,7 @@ public class LevelPresenterTest {
         when(im.inTeam(Mockito.any(), Mockito.any())).thenReturn(true);
         // team leader
         when(im.getOwner(Mockito.any(), Mockito.any())).thenReturn(UUID.randomUUID());
-        
+
         pl = mock(PlayerLevel.class);
         PowerMockito.whenNew(PlayerLevel.class).withAnyArguments().thenReturn(pl);
 
@@ -72,10 +72,8 @@ public class LevelPresenterTest {
         User sender = mock(User.class);
         UUID targetPlayer = UUID.randomUUID();
         lp.calculateIslandLevel(world, sender, targetPlayer);
-        
+
         Mockito.verify(sender).sendMessage("island.level.calculating");
-        // Verify PlayerLevel was called
-        Mockito.verify(pl);
     }
 
 }
diff --git a/src/test/java/world/bentobox/level/TopTenTest.java b/src/test/java/world/bentobox/level/TopTenTest.java
index d242e0e..47cee5c 100644
--- a/src/test/java/world/bentobox/level/TopTenTest.java
+++ b/src/test/java/world/bentobox/level/TopTenTest.java
@@ -116,7 +116,7 @@ public class TopTenTest {
         when(plugin.getIWM()).thenReturn(iwm);
 
         // User
-        when(user.getTranslation(anyString())).thenAnswer((Answer<String>) invocation -> invocation.getArgumentAt(0, String.class));
+        when(user.getTranslation(anyString())).thenAnswer((Answer<String>) invocation -> invocation.getArgument(0, String.class));
         when(user.getTranslation(eq("island.top.gui-heading"), eq("[name]"), anyString(), eq("[rank]"), anyString())).thenReturn("gui-heading");
         when(user.getTranslation(eq("island.top.island-level"),eq("[level]"), anyString())).thenReturn("island-level");
         when(user.getPlayer()).thenReturn(player);