From cbdbba0ab06898cd7ab6d69e33d2db990d8b8799 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Thu, 15 Feb 2024 09:36:18 +0700 Subject: Globally replace "http:" by "https:" in non-XML files Maybe, the XML files and Maven wrapper files will follow. First, let us find out if this breaks the build, maybe some tests are asserting on "http:". But there, the replacement would also have taken place, so probably it just works. Signed-off-by: Alexander Kriegisch --- .../java/org/aspectj/weaver/loadtime/definition/DocumentParser.java | 6 +++--- .../org/aspectj/weaver/tools/cache/DefaultCacheKeyResolverTest.java | 2 +- weaver/testinputdata/org/aspectj/weaver/test/Aspect.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'weaver') diff --git a/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/DocumentParser.java b/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/DocumentParser.java index eddc5bd32..4a48895e6 100644 --- a/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/DocumentParser.java +++ b/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/DocumentParser.java @@ -137,17 +137,17 @@ public class DocumentParser extends DefaultHandler { xmlReader.setErrorHandler(parser); try { - xmlReader.setFeature("http://xml.org/sax/features/validation", false); + xmlReader.setFeature("https://xml.org/sax/features/validation", false); } catch (SAXException e) { // fine, the parser don't do validation } try { - xmlReader.setFeature("http://xml.org/sax/features/external-general-entities", false); + xmlReader.setFeature("https://xml.org/sax/features/external-general-entities", false); } catch (SAXException e) { // fine, the parser don't do validation } try { - xmlReader.setFeature("http://xml.org/sax/features/external-parameter-entities", false); + xmlReader.setFeature("https://xml.org/sax/features/external-parameter-entities", false); } catch (SAXException e) { // fine, the parser don't do validation } diff --git a/weaver/src/test/java/org/aspectj/weaver/tools/cache/DefaultCacheKeyResolverTest.java b/weaver/src/test/java/org/aspectj/weaver/tools/cache/DefaultCacheKeyResolverTest.java index 3a8f58d8b..c62983c24 100644 --- a/weaver/src/test/java/org/aspectj/weaver/tools/cache/DefaultCacheKeyResolverTest.java +++ b/weaver/src/test/java/org/aspectj/weaver/tools/cache/DefaultCacheKeyResolverTest.java @@ -46,7 +46,7 @@ public class DefaultCacheKeyResolverTest extends TestCase { } public void testCreateURLClassLoaderScope() throws Exception { - URL testURLA = new URL("http://example.com"); + URL testURLA = new URL("https://example.com"); URL testURLB = new URL("file:///tmp"); URL testURLC = new URL("ftp://ftp.example.com"); URLTestCL A = new URLTestCL(testURLA); diff --git a/weaver/testinputdata/org/aspectj/weaver/test/Aspect.java b/weaver/testinputdata/org/aspectj/weaver/test/Aspect.java index cd4430283..04b4e193b 100644 --- a/weaver/testinputdata/org/aspectj/weaver/test/Aspect.java +++ b/weaver/testinputdata/org/aspectj/weaver/test/Aspect.java @@ -1,10 +1,10 @@ /* This file is part of the compiler and core tools for the AspectJ(tm) - * programming language; see http://aspectj.org + * programming language; see https://aspectj.org * * The contents of this file are subject to the Mozilla Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at - * either http://www.mozilla.org/MPL/ or http://aspectj.org/MPL/. + * either https://www.mozilla.org/MPL/ or https://aspectj.org/MPL/. * * Software distributed under the License is distributed on an "AS IS" basis, * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -- cgit v1.2.3