Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix upperbound and jdk 11 build 

Signed-off-by: Olivier Lamy <olamy@apache.org>
This commit is contained in:
Olivier Lamy 2022-06-06 09:46:02 +10:00
parent 235196f471
commit f150f42042
15 changed files with 62 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archiva-modules/archiva-base/archiva-checksum/pom.xml
View File

@ -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>

11
archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/Checksum.java
View File

@ -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);
}
}
}

55
archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/Hex.java
View File

@ -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];
}
}
}

1
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
View File

@ -123,7 +123,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.9</version>
<scope>test</scope>
</dependency>

2
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
View File

@ -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>

4
archiva-modules/archiva-base/archiva-policies/pom.xml
View File

@ -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>

2
archiva-modules/archiva-base/archiva-proxy/pom.xml
View File

@ -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>

4
archiva-modules/archiva-base/archiva-transaction/pom.xml
View File

@ -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>

2
archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
View File

@ -267,7 +267,7 @@
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
</dependencies>
</profile>

4
archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
View File

@ -377,13 +377,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>

2
archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
View File

@ -154,7 +154,7 @@
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
</dependencies>
</profile>

23
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
View File

@ -564,4 +564,27 @@
</plugins>
</build>
<profiles>
<profile>
<id>jdk9+</id>
<activation>
<jdk>[1.9,)</jdk>
</activation>
<dependencies>
<!-- Needed for JDK >= 9 -->
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>
</project>

2
archiva-modules/archiva-web/archiva-web-common/pom.xml
View File

@ -611,7 +611,7 @@
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
</dependencies>
</profile>

4
archiva-modules/plugins/problem-reports/pom.xml
View File

@ -168,13 +168,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>

12
pom.xml
View File

@ -75,7 +75,7 @@
<jakarta.servlet.version>4.0.4</jakarta.servlet.version>
<jakarta.inject.version>1.0</jakarta.inject.version>
<jakarta.annotation.version>1.3.5</jakarta.annotation.version>
<jakarta.xml.bind.version>3.0.0</jakarta.xml.bind.version>
<jakarta.xml.bind.version>2.3.3</jakarta.xml.bind.version>
<jakarta.transaction.version>1.3.3</jakarta.transaction.version>
<jakarta.validation.version>2.0.2</jakarta.validation.version>
<jakarta.ws.rs.version>2.1.6</jakarta.ws.rs.version>
@ -1706,6 +1706,16 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
<version>2.6.0</version>
</dependency>
<dependency>
<groupId>org.ehcache</groupId>