Merge branch 'master' into cyclonedx

This commit is contained in:
Stefan Bodewig 2026-06-06 16:54:58 +02:00
commit 4b4576e48a
No known key found for this signature in database
GPG Key ID: 23738DFD7C40DE43
4 changed files with 9 additions and 2 deletions

2
NOTICE
View File

@ -1,5 +1,5 @@
Apache Ivy (TM)
Copyright 2007-2025 The Apache Software Foundation
Copyright 2007-2026 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

View File

@ -29,7 +29,10 @@ Requirements for making a release are similar to the requirements for building f
On the master, check that files which require update for the release are up to date.
This includes particularly:
`asciidoc/release-notes.adoc`
- `asciidoc/release-notes.adoc`
- `version.properties` (`target.ivy.bundle.version.qualifier` shoud be `final`)
- `ivy.xml` (`status` should be `release`)
==== 2. Check out a clean copy of the branch

View File

@ -28,6 +28,7 @@ import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
/**
* Test BasicURLHandler
@ -67,6 +68,7 @@ public class BasicURLHandlerTest {
@Test
public void testContentEncoding() throws Exception {
assumeTrue(handler.isReachable(new URL("http://carsten.codimi.de/"), 5000));
assertDownloadOK(new URL("http://carsten.codimi.de/gzip.yaws/daniels.html"), new File(
testDir, "gzip.txt"));
assertDownloadOK(new URL(

View File

@ -42,6 +42,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
public class HttpClientHandlerTest {
@ -98,6 +99,7 @@ public class HttpClientHandlerTest {
@Test
public void testContentEncoding() throws Exception {
assumeTrue(handler.isReachable(new URL("http://carsten.codimi.de/"), 5000));
assertDownloadOK(new URL("http://carsten.codimi.de/gzip.yaws/daniels.html"), new File(
testDir, "gzip.txt"));
assertDownloadOK(new URL(