diff options
Diffstat (limited to 'archiva-modules/archiva-base')
8 files changed, 21 insertions, 66 deletions
diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml index f376623a3..bd8c9c89d 100644 --- a/archiva-modules/archiva-base/archiva-checksum/pom.xml +++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml @@ -54,6 +54,10 @@ <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> </dependencies> @@ -83,13 +87,13 @@ <!-- Needed for JDK >= 9 --> <dependency> <groupId>jakarta.annotation</groupId> - <artifactId>jakarta.annotation-api</artifactId> + <artifactId>jakarta.annotation-api</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</artifactId> + <artifactId>jakarta.xml.bind-api</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/Checksum.java b/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/Checksum.java index d32e5fb5e..5c9e2f0fa 100644 --- a/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/Checksum.java +++ b/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/Checksum.java @@ -19,6 +19,9 @@ package org.apache.archiva.checksum; * under the License. */ +import org.apache.commons.codec.DecoderException; +import org.apache.commons.codec.binary.Hex; + import java.nio.ByteBuffer; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -55,7 +58,7 @@ public class Checksum if (this.result.length==0) { finish(); } - return Hex.encode( this.result ); + return Hex.encodeHexString( this.result ); } public byte[] getChecksumBytes() { @@ -110,6 +113,10 @@ public class Checksum if (this.result == null || this.result.length==0) { finish(); } - return MessageDigest.isEqual(this.result, Hex.decode( hexString )); + try { + return MessageDigest.isEqual(this.result, Hex.decodeHex( hexString )); + } catch (DecoderException e) { + throw new RuntimeException(e); + } } } diff --git a/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/Hex.java b/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/Hex.java deleted file mode 100644 index 6353a87f1..000000000 --- a/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/Hex.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.apache.archiva.checksum; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import javax.xml.bind.DatatypeConverter; - -/** - * Hex - simple hex conversions. - * - * - */ -public class Hex -{ - - public static String encode( byte[] data ) - { - try - { - return DatatypeConverter.printHexBinary( data ).trim( ).toLowerCase( ); - } catch (IllegalArgumentException e) { - return ""; - } - } - - public static String encode( String raw ) - { - return encode( raw.getBytes() ); - } - - public static byte[] decode( String data ) { - try - { - return DatatypeConverter.parseHexBinary( data.trim( ) ); - } catch (IllegalArgumentException e) { - return new byte[0]; - } - } -} diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml index 6e2f82f47..e049ce2d5 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml @@ -123,7 +123,6 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.9</version> <scope>test</scope> </dependency> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index abad21899..310ff577f 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -343,7 +343,7 @@ Using provided scope to avoid adding it to packaging. <dependencies> <dependency> <groupId>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</artifactId> + <artifactId>jakarta.xml.bind-api</artifactId> </dependency> </dependencies> </profile> diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index 59a7642af..9dc186ec9 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -147,13 +147,13 @@ <!-- Needed for JDK >= 9 --> <dependency> <groupId>jakarta.annotation</groupId> - <artifactId>jakarta.annotation-api</artifactId> + <artifactId>jakarta.annotation-api</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</artifactId> + <artifactId>jakarta.xml.bind-api</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index dc3c7da0d..840b829f1 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -181,7 +181,7 @@ <!-- Needed for JDK >= 9 --> <dependency> <groupId>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</artifactId> + <artifactId>jakarta.xml.bind-api</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index d6bf57fda..69f933c31 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -69,13 +69,13 @@ <!-- Needed for JDK >= 9 --> <dependency> <groupId>jakarta.annotation</groupId> - <artifactId>jakarta.annotation-api</artifactId> + <artifactId>jakarta.annotation-api</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</artifactId> + <artifactId>jakarta.xml.bind-api</artifactId> <scope>test</scope> </dependency> </dependencies> |