Includes a copy of in

https://publicsuffix.org/list/effective_tld_names.dat
in httpclient5/src/test/resources/org/publicsuffix/list/effective_tld_names.dat

Author: garydgregory

NOTICE.txt

@@ -4,3 +4,8 @@ Copyright 1999-2023 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
+This product includes a copy of in https://publicsuffix.org/list/effective_tld_names.dat
+in httpclient5/src/test/resources/org/publicsuffix/list/effective_tld_names.dat 
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at https://mozilla.org/MPL/2.0/.

httpclient5/pom.xml

@@ -123,7 +123,7 @@
             </goals>
             <configuration>
               <url>https://publicsuffix.org/list/effective_tld_names.dat</url>
-              <outputDirectory>${project.build.outputDirectory}/mozilla</outputDirectory>
+              <outputDirectory>${project.build.outputDirectory}/src/test/resources/org/publicsuffix/list</outputDirectory>
               <outputFileName>public-suffix-list.txt</outputFileName>
             </configuration>
           </execution>

httpclient5/src/test/java/org/apache/hc/client5/http/psl/TestPublicSuffixMatcher.java

@@ -40,11 +40,17 @@
 class TestPublicSuffixMatcher {
 
     private static final String SOURCE_FILE = "suffixlistmatcher.txt";
-    private static final String PUBLIC_SUFFIX_LIST_FILE = "mozilla/public-suffix-list.txt";
+    private static final String PUBLIC_SUFFIX_LIST_FILE = "org/publicsuffix/list/effective_tld_names.dat";
 
     private PublicSuffixMatcher matcher;
     private PublicSuffixMatcher pslMatcher;
 
+    /**
+     * Create a matcher using the public suffix list file provided by Mozilla.
+     *
+     * This test a copy of in https://publicsuffix.org/list/effective_tld_names.dat in
+     * httpclient5/src/test/resources/org/publicsuffix/list/effective_tld_names.dat
+     */
     @BeforeEach
     void setUp() throws Exception {
         final ClassLoader classLoader = getClass().getClassLoader();
@@ -54,9 +60,6 @@ void setUp() throws Exception {
             final List<PublicSuffixList> lists = PublicSuffixListParser.INSTANCE.parseByType(new InputStreamReader(in, StandardCharsets.UTF_8));
             matcher = new PublicSuffixMatcher(lists);
         }
-        // Create a matcher using the public suffix list file provided by Mozilla
-        // Note: the test requires `mvn generate-resources` to have been called to fetch the Mozilla file into
-        // target/classes so that it is on the classpath
         final URL publicSuffixListUrl = classLoader.getResource(PUBLIC_SUFFIX_LIST_FILE);
         pslMatcher = PublicSuffixMatcherLoader.load(publicSuffixListUrl);
     }