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

@@ -105,6 +105,7 @@
         <directory>src/main/resources</directory>
         <filtering>true</filtering>
         <includes>
+            <include>**/*.dat</include>
             <include>**/*.properties</include>
         </includes>
       </resource>
@@ -123,8 +124,7 @@
             </goals>
             <configuration>
               <url>https://publicsuffix.org/list/effective_tld_names.dat</url>
-              <outputDirectory>${project.build.outputDirectory}/mozilla</outputDirectory>
-              <outputFileName>public-suffix-list.txt</outputFileName>
+              <outputDirectory>${project.basedir}/src/main/resources/org/publicsuffix/list</outputDirectory>
             </configuration>
           </execution>
         </executions>

httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java

@@ -51,6 +51,8 @@
 @Contract(threading = ThreadingBehavior.SAFE)
 public final class PublicSuffixMatcherLoader {
 
+    private static final String PUBLIC_SUFFIX_LIST = "org/publicsuffix/list/effective_tld_names.dat";
+
     private static final Logger LOG = LoggerFactory.getLogger(PublicSuffixMatcherLoader.class);
 
     private static final ReentrantLock lock = new ReentrantLock();
@@ -81,9 +83,8 @@ public static PublicSuffixMatcher getDefault() {
         if (DEFAULT_INSTANCE == null) {
             lock.lock();
             try {
-                if (DEFAULT_INSTANCE == null){
-                    final URL url = PublicSuffixMatcherLoader.class.getResource(
-                            "/mozilla/public-suffix-list.txt");
+                if (DEFAULT_INSTANCE == null) {
+                    final URL url = PublicSuffixMatcherLoader.class.getResource(PUBLIC_SUFFIX_LIST);
                     if (url != null) {
                         try {
                             DEFAULT_INSTANCE = load(url);