Change bundled copy of MIT license from html to txt

GeorgH93 · Jun 17, 2023 · c70e500 · c70e500
1 parent b2a1f8a
commit c70e500
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/MarriageMaster/pom.xml b/MarriageMaster/pom.xml
@@ -469,6 +469,12 @@
 							<excludedScopes>test,provided,system</excludedScopes>
 							<generateBundle>true</generateBundle>
 							<licensesOutputFile>${project.build.directory}/generated-resources/licenses-THIRD-PARTY.xml</licensesOutputFile>
+							<licenseUrlReplacements>
+								<licenseUrlReplacement>
+									<regexp>https?://(www\.)?opensource\.org/licenses/mit-license\.php</regexp>
+									<replacement>https://ci.pcgamingfreaks.at/download/mit.txt</replacement>
+								</licenseUrlReplacement>
+							</licenseUrlReplacements>
 						</configuration>
 						<executions>
 							<execution>

diff --git a/...ageMaster/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Management/MarriageManagerImpl.java b/...ageMaster/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Management/MarriageManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2022 GeorgH93
+ *   Copyright (C) 2023 GeorgH93
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -44,7 +44,6 @@
 import at.pcgamingfreaks.Message.Placeholder.Processors.PassthroughMessageComponentPlaceholderProcessor;
 
 import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Contract;
@@ -112,8 +111,8 @@ public MarriageManagerImpl(final @NotNull MarriageMaster plugin)
 
 		messageSurnameSuccess          = getMSG("Ingame.Surname.SetSuccessful");
 		messageSurnameFailed           = getMSG("Ingame.Surname.SetFailed");
-		messageSurnameToShort          = getMSG("Ingame.Surname.ToShort").replaceAll("\\{MinLength}", surnameMinLength + "").replaceAll("\\{MaxLength}", surnameMaxLength + "");
-		messageSurnameToLong           = getMSG("Ingame.Surname.ToLong").replaceAll("\\{MinLength}", surnameMinLength + "").replaceAll("\\{MaxLength}", surnameMaxLength + "");
+		messageSurnameToShort          = getMSG("Ingame.Surname.ToShort").replaceAll("\\{MinLength}", String.valueOf(surnameMinLength)).replaceAll("\\{MaxLength}", String.valueOf(surnameMaxLength));
+		messageSurnameToLong           = getMSG("Ingame.Surname.ToLong").replaceAll("\\{MinLength}", String.valueOf(surnameMinLength)).replaceAll("\\{MaxLength}", String.valueOf(surnameMaxLength));
 		messageSurnameAlreadyUsed      = getMSG("Ingame.Surname.AlreadyUsed");
 
 		messageAlreadySamePair         = getMSG("Ingame.Marry.AlreadySamePair").placeholders(Placeholders.PLAYER1_NAME).placeholders(Placeholders.PLAYER2_NAME);

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<revision>2.7.0.1</revision>
+		<revision>2.7.0.2</revision>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<bukkitVersion>1.15.2-R0.1-SNAPSHOT</bukkitVersion>