update groupid, update deps, release 1.8.0

Author: MiniDigger

.github/workflows/deploy.yml

@@ -5,8 +5,8 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'adopt'

README.md

@@ -32,22 +32,42 @@ To add this library to your java project using Maven, add the following dependen
 
 ```xml
 <dependency>
-  <groupId>dev.samstevens.totp</groupId>
-  <artifactId>totp-hangar</artifactId>
-  <version>1.7.2-SNAPSHOT</version>
+  <groupId>io.papermc.hangar.totp</groupId>
+  <artifactId>totp</artifactId>
+  <version>1.8.0</version>
 </dependency>
 ```
 
+You will also need to add the following repository to your POM:
+
+```xml
+<repositories>
+  <repository>
+    <id>papermc-repo</id>
+    <url>https://repo.papermc.io/repository/maven-public/</url>
+  </repository>
+</repositories>
+```
+
 #### Gradle
 
 To add the dependency using Gradle, add the following to the build script:
 
 ```
 dependencies {
-  compile 'dev.samstevens.totp:totp-hangar:1.7.2-SNAPSHOT'
+  compile 'io.papermc.hangar.totp:totp:1.8.0'
 }
 ```
 
+You will also need to add the following repository to your build script:
+
+```
+repositories {
+  maven {
+    url "https://repo.papermc.io/repository/maven-public/"
+  }
+}
+```
 
 
 ## Usage

pom.xml

@@ -2,10 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>dev.samstevens.totp</groupId>
-    <artifactId>totp-parent-hangar</artifactId>
+    <groupId>io.papermc.hangar.totp</groupId>
+    <artifactId>totp-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.7.2-SNAPSHOT</version>
+    <version>1.8.0</version>
     <properties>
         <!-- compiling -->
         <java.version>17</java.version>
@@ -16,10 +16,10 @@
         <project.reporting.outputEncoding>${encoding}</project.reporting.outputEncoding>
 
         <!-- plugins -->
-        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
-        <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
-        <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
-        <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
+        <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
+        <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
+        <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
+        <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
     </properties>
 
     <name>${project.groupId}:${project.artifactId}</name>

totp-spring-boot-starter/pom.xml

@@ -4,24 +4,24 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>dev.samstevens.totp</groupId>
-        <artifactId>totp-parent-hangar</artifactId>
-        <version>1.7.2-SNAPSHOT</version>
+        <groupId>io.papermc.hangar.totp</groupId>
+        <artifactId>totp-parent</artifactId>
+        <version>1.8.0</version>
     </parent>
 
     <name>${project.groupId}:${project.artifactId}</name>
-    <artifactId>totp-spring-boot-starter-hangar</artifactId>
+    <artifactId>totp-spring-boot-starter</artifactId>
 
     <description>A Spring Boot starter to autoconfigure the Java-TOTP library.</description>
 
     <properties>
-        <spring.version>3.0.5</spring.version>
+        <spring.version>3.4.4</spring.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>totp-hangar</artifactId>
+            <artifactId>totp</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

totp/pom.xml

@@ -4,12 +4,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>dev.samstevens.totp</groupId>
-        <artifactId>totp-parent-hangar</artifactId>
-        <version>1.7.2-SNAPSHOT</version>
+        <groupId>io.papermc.hangar.totp</groupId>
+        <artifactId>totp-parent</artifactId>
+        <version>1.8.0</version>
     </parent>
 
-    <artifactId>totp-hangar</artifactId>
+    <artifactId>totp</artifactId>
     <name>${project.groupId}:${project.artifactId}</name>
 
     <description>A library to help implement time-based one time passwords to enable MFA.</description>
@@ -18,47 +18,47 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.9.2</version>
+            <version>5.13.0-M2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.2</version>
+            <version>5.13.0-M2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>5.9.2</version>
+            <version>5.13.0-M2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>5.2.0</version>
+            <version>5.16.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.15</version>
+            <version>1.18.0</version>
         </dependency>
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
-            <version>3.9.0</version>
+            <version>3.11.1</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>com.google.zxing</groupId>
             <artifactId>core</artifactId>
-            <version>3.5.1</version>
+            <version>3.5.3</version>
         </dependency>
         <dependency>
             <groupId>com.google.zxing</groupId>
             <artifactId>javase</artifactId>
-            <version>3.5.1</version>
+            <version>3.5.3</version>
         </dependency>
     </dependencies>
 </project>

totp/src/main/java/dev/samstevens/totp/time/NtpTimeProvider.java

@@ -5,6 +5,7 @@
 import org.apache.commons.net.ntp.TimeInfo;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.time.Duration;
 
 public class NtpTimeProvider implements TimeProvider {
 
@@ -31,7 +32,7 @@ private NtpTimeProvider(String ntpHostname, int timeout, String dependentClass)
         checkHasDependency(dependentClass);
 
         client = new NTPUDPClient();
-        client.setDefaultTimeout(timeout);
+        client.setDefaultTimeout(Duration.ofMillis(timeout));
         ntpHost = InetAddress.getByName(ntpHostname);
     }
 

totp/src/test/java/dev/samstevens/totp/qr/ZxingPngQrGeneratorTest.java

@@ -4,10 +4,12 @@
 import com.google.zxing.WriterException;
 import dev.samstevens.totp.exceptions.QrGenerationException;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
 import static dev.samstevens.totp.IOUtils.*;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
@@ -37,13 +39,13 @@ public void testMimeType() {
     }
 
     @Test
-    public void testImageSize() throws QrGenerationException, IOException {
+    public void testImageSize(@TempDir Path tempDir) throws QrGenerationException, IOException {
         ZxingPngQrGenerator generator = new ZxingPngQrGenerator();
         generator.setImageSize(500);
         byte[] data = generator.generate(getData());
 
         // Write the data to a temp file and read it into a BufferedImage to get the dimensions
-        String filename = "/tmp/test_qr.png";
+        String filename = tempDir.resolve("test_qr.png").toAbsolutePath().toString();
         writeFile(data, filename);
         File file = new File(filename);
         BufferedImage image = ImageIO.read(file);