Update dependencies

patrickfav · Mar 12, 2023 · 4eebca3 · 4eebca3
1 parent a9bc7b5
commit 4eebca3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 41 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>at.favre.lib</groupId>
         <artifactId>common-parent</artifactId>
-        <version>12</version>
+        <version>20</version>
     </parent>
 
     <artifactId>bkdf</artifactId>
@@ -17,25 +17,14 @@
     <name>BCrypt Key Derivation Function</name>
     <description>A extension of the BCrypt password hashing protocol to fix many of its issues and
     </description>
-    <url>https://github.com/patrickfav/bkdf</url>
+    <url>https://favr.dev/opensource/bkdf</url>
     <inceptionYear>2018</inceptionYear>
 
     <properties>
         <!-- set this to true if fail because of missing credentials -->
         <commonConfig.jarSign.skip>false</commonConfig.jarSign.skip>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>jcenter</id>
-            <name>jcenter</name>
-            <url>https://jcenter.bintray.com</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <build>
         <plugins>
             <plugin>
@@ -58,10 +47,6 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.eluder.coveralls</groupId>
-                <artifactId>coveralls-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jarsigner-plugin</artifactId>
@@ -81,12 +66,12 @@
         <dependency>
             <groupId>at.favre.lib</groupId>
             <artifactId>hkdf</artifactId>
-            <version>1.1.0</version>
+            <version>2.0.0</version>
         </dependency>
         <dependency>
             <groupId>at.favre.lib</groupId>
             <artifactId>bcrypt</artifactId>
-            <version>0.9.0</version>
+            <version>0.10.2</version>
         </dependency>
         <!-- test -->
         <dependency>
@@ -97,18 +82,9 @@
 
     </dependencies>
 
-    <distributionManagement>
-        <repository>
-            <id>bintray-patrickfav</id>
-            <name>patrickfav-bkdf</name>
-            <url>https://api.bintray.com/maven/patrickfav/maven/bkdf/;publish=1</url>
-        </repository>
-    </distributionManagement>
-
     <scm>
-        <connection>https://github.com/patrickfav/bkdf.git</connection>
-        <developerConnection>https://github.com/patrickfav/bkdf.git</developerConnection>
-        <tag>HEAD</tag>
+        <connection>scm:git:https://github.com/patrickfav/bkdf.git</connection>
+        <developerConnection>scm:git:https://github.com/patrickfav/bkdf.git</developerConnection>
         <url>https://github.com/patrickfav/bkdf</url>
     </scm>
 
@@ -118,7 +94,7 @@
     </issueManagement>
 
     <ciManagement>
-        <system>Travis</system>
-        <url>https://travis-ci.org/patrickfav/bkdf</url>
+        <system>Github Actions</system>
+        <url>https://github.com/patrickfav/bkdf/actions</url>
     </ciManagement>
 </project>
diff --git a/src/main/java/at/favre/lib/crypto/bkdf/KeyDerivationFunction.java b/src/main/java/at/favre/lib/crypto/bkdf/KeyDerivationFunction.java
@@ -1,15 +1,11 @@
 package at.favre.lib.crypto.bkdf;
 
 import at.favre.lib.bytes.Bytes;
-import at.favre.lib.crypto.HKDF;
 import at.favre.lib.crypto.bcrypt.BCrypt;
+import at.favre.lib.hkdf.HKDF;
 
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * Key Derivation protocol of BKDF. Used for derived high entropy secret keys from user passwords with a given cost factor.

diff --git a/src/main/java/at/favre/lib/crypto/bkdf/PasswordHashUpgrader.java b/src/main/java/at/favre/lib/crypto/bkdf/PasswordHashUpgrader.java
@@ -1,7 +1,7 @@
 package at.favre.lib.crypto.bkdf;
 
 import at.favre.lib.bytes.Bytes;
-import at.favre.lib.crypto.HKDF;
+import at.favre.lib.hkdf.HKDF;
 
 import java.security.SecureRandom;
 import java.util.ArrayList;

diff --git a/src/main/java/at/favre/lib/crypto/bkdf/Version.java b/src/main/java/at/favre/lib/crypto/bkdf/Version.java
@@ -1,7 +1,7 @@
 package at.favre.lib.crypto.bkdf;
 
 import at.favre.lib.bytes.Bytes;
-import at.favre.lib.crypto.HKDF;
+import at.favre.lib.hkdf.HKDF;
 
 import java.util.Arrays;
 import java.util.Collections;

diff --git a/src/test/java/at/favre/lib/crypto/bkdf/VersionTest.java b/src/test/java/at/favre/lib/crypto/bkdf/VersionTest.java
@@ -1,6 +1,6 @@
 package at.favre.lib.crypto.bkdf;
 
-import at.favre.lib.crypto.HKDF;
+import at.favre.lib.hkdf.HKDF;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;