From 1f20f35689113100fa17d6de1a64358ae9833e43 Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Wed, 22 Mar 2023 12:55:04 +0200
Subject: [PATCH] [JAVA-18135] Moved apache-httpclient related modules to
 jdk9-and-above profile (#13656)

Co-authored-by: Dhawal Kapil <dhawalkapil@gmail.com>
---
 .../HttpClientGettingCookieValueUnitTest.java     |  2 +-
 apache-httpclient4/pom.xml                        |  1 +
 pom.xml                                           | 15 ++++++++-------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/apache-httpclient-2/src/test/java/com/baeldung/httpclient/cookies/HttpClientGettingCookieValueUnitTest.java b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/cookies/HttpClientGettingCookieValueUnitTest.java
index 265fa39816..ef57406705 100644
--- a/apache-httpclient-2/src/test/java/com/baeldung/httpclient/cookies/HttpClientGettingCookieValueUnitTest.java
+++ b/apache-httpclient-2/src/test/java/com/baeldung/httpclient/cookies/HttpClientGettingCookieValueUnitTest.java
@@ -23,7 +23,7 @@ import java.io.IOException;
 class HttpClientGettingCookieValueUnitTest {
     private static Logger log = LoggerFactory.getLogger(HttpClientGettingCookieValueUnitTest.class);
 
-    private static final String SAMPLE_URL = "http://www.baeldung.com/";
+    private static final String SAMPLE_URL = "http://www.github.com/";
 
     @Test
     void whenSettingCustomCookieOnTheRequest_thenGettingTheSameCookieFromTheResponse() throws IOException {
diff --git a/apache-httpclient4/pom.xml b/apache-httpclient4/pom.xml
index 140dc0fbdb..1485c94c8c 100644
--- a/apache-httpclient4/pom.xml
+++ b/apache-httpclient4/pom.xml
@@ -292,6 +292,7 @@
         <mockserver.version>5.11.2</mockserver.version>
         <!-- maven plugins -->
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7cd5522063..8b82f73cb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -339,8 +339,7 @@
                 <module>gradle-modules/gradle/maven-to-gradle</module>
                 <!-- <module>grails</module> --> <!-- Not a maven project -->
                 <!-- <module>guest</module> --> <!-- not to be built as its for guest articles  -->
-                <module>apache-httpclient</module>
-                <module>apache-httpclient4</module>
+
                 <module>java-jdi</module>
 
                 <module>jetbrains</module>
@@ -537,8 +536,7 @@
                 <module>gradle-modules/gradle/maven-to-gradle</module>
                 <!-- <module>grails</module> --> <!-- Not a maven project -->
                 <!-- <module>guest</module> --> <!-- not to be built as its for guest articles  -->
-                <module>apache-httpclient</module>
-                <module>apache-httpclient4</module>
+
                 <module>java-jdi</module>
 
                 <module>jhipster-5</module>
@@ -734,6 +732,9 @@
             </build>
 
             <modules>
+                <module>apache-httpclient</module>
+                <module>apache-httpclient4</module>
+                <module>apache-httpclient-2</module>
                 <module>spring-mobile</module>
                 <module>microservices-modules</module>
                 <module>spring-ejb-modules</module>
@@ -833,7 +834,6 @@
                 <module>docker-modules</module>
                 <module>drools</module>
                 <module>guava-modules</module>
-                <module>apache-httpclient-2</module>
                 <module>kubernetes-modules</module>
                 <module>libraries-concurrency</module>
                 <module>libraries-testing</module>
@@ -867,7 +867,6 @@
 
                 <module>akka-modules</module>
                 <module>annotations</module>
-                <module>apache-httpclient</module>
                 <module>httpclient-simple</module>
                 <module>antlr</module>
                 <module>apache-kafka</module>
@@ -1007,6 +1006,9 @@
             </build>
 
             <modules>
+                <module>apache-httpclient</module>
+                <module>apache-httpclient4</module>
+                <module>apache-httpclient-2</module>
                 <module>spring-mobile</module>
                 <module>microservices-modules</module>
                 <module>spring-ejb-modules</module>
@@ -1138,7 +1140,6 @@
 
                 <module>akka-modules</module>
                 <module>annotations</module>
-                <module>apache-httpclient</module>
                 <module>antlr</module>
                 <module>apache-kafka</module>
                 <module>apache-kafka-2</module>