From ea9bc071317c497bfaa0df1ffaf4fc3118e480f3 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Sat, 6 Jun 2026 08:31:15 +0200 Subject: [PATCH 1/3] bump copyright year --- NOTICE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index ca421a2c..5647f3f1 100644 --- a/NOTICE +++ b/NOTICE @@ -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/). From f711904dd2729301c8d373286b4bd859fecdc4a1 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Sat, 6 Jun 2026 09:19:32 +0200 Subject: [PATCH 2/3] reminder of what to change for a release --- asciidoc/dev/makerelease.adoc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/asciidoc/dev/makerelease.adoc b/asciidoc/dev/makerelease.adoc index ea522039..35ccbb2a 100644 --- a/asciidoc/dev/makerelease.adoc +++ b/asciidoc/dev/makerelease.adoc @@ -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 From df64393433edab2ff6fb27435214ec7acad2a676 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Sat, 6 Jun 2026 16:54:04 +0200 Subject: [PATCH 3/3] skip tests if test server is not reachable --- test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java | 2 ++ test/java/org/apache/ivy/util/url/HttpClientHandlerTest.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java b/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java index 132cf404..68a0f29a 100644 --- a/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java +++ b/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java @@ -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( diff --git a/test/java/org/apache/ivy/util/url/HttpClientHandlerTest.java b/test/java/org/apache/ivy/util/url/HttpClientHandlerTest.java index 06dd7f04..eed0882f 100644 --- a/test/java/org/apache/ivy/util/url/HttpClientHandlerTest.java +++ b/test/java/org/apache/ivy/util/url/HttpClientHandlerTest.java @@ -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(