rename project variable to apache-httpxxx-4

googleapis · Aug 19, 2024 · 663e7fc · 663e7fc
1 parent e472ce6
commit 663e7fc
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/google-http-client-apache-v5/pom.xml b/google-http-client-apache-v5/pom.xml
@@ -102,12 +102,10 @@
     <dependency>
       <groupId>org.apache.httpcomponents.client5</groupId>
       <artifactId>httpclient5</artifactId>
-      <version>5.3.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents.core5</groupId>
       <artifactId>httpcore5</artifactId>
-      <version>5.2.4</version>
     </dependency>
     <dependency>
       <groupId>com.google.api-client</groupId>

diff --git a/google-http-client-assembly/classpath-include b/google-http-client-assembly/classpath-include
@@ -7,8 +7,8 @@
 	<classpathentry kind="lib" path="libs/google-http-client-xml-${project.version}.jar" sourcepath="libs-sources/google-http-client-xml-${project.version}-sources.jar"/>
 	<classpathentry kind="lib" path="libs/commons-logging-${project.commons-logging.version}.jar" sourcepath="libs-sources/commons-logging-${project.commons-logging.version}-sources.jar"/>
 	<classpathentry kind="lib" path="libs/gson-${project.gson.version}.jar" sourcepath="libs-sources/gson-${project.gson.version}-sources.jar"/>
-	<classpathentry kind="lib" path="libs/httpclient-${project.httpclient.version}.jar" sourcepath="libs-sources/httpclient-${project.httpclient.version}-sources.jar"/>
-	<classpathentry kind="lib" path="libs/httpcore-${project.httpcore.version}.jar" sourcepath="libs-sources/httpcore-${project.httpcore.version}-sources.jar"/>
+	<classpathentry kind="lib" path="libs/httpclient-${project.apache-httpclient-4.version}.jar" sourcepath="libs-sources/httpclient-${project.apache-httpclient-4.version}-sources.jar"/>
+	<classpathentry kind="lib" path="libs/httpcore-${project.apache-httpcore-4.version}.jar" sourcepath="libs-sources/httpcore-${project.apache-httpcore-4.version}-sources.jar"/>
 	<classpathentry kind="lib" path="libs/jackson-core-asl-${project.jackson-core-asl.version}.jar" sourcepath="libs-sources/jackson-core-asl-${project.jackson-core-asl.version}-sources.jar"/>
 	<classpathentry kind="lib" path="libs/jackson-core-${project.jackson-core2.version}.jar" sourcepath="libs-sources/jackson-core-${project.jackson-core2.version}-sources.jar"/>
 	<classpathentry kind="lib" path="libs/jsr305-${project.jsr305.version}.jar"/>

diff --git a/google-http-client-assembly/readme.html b/google-http-client-assembly/readme.html
@@ -135,8 +135,8 @@ <h3>General Purpose Java Environment Dependencies</h3>
   required for general purpose Java applications :
   <ul>
     <li>commons-logging-${project.commons-logging.version}.jar</li>
-    <li>httpclient-${project.httpclient.version}.jar</li>
-    <li>httpcore-${project.httpcore.version}.jar</li>
+    <li>httpclient-${project.apache-httpclient-4.version}.jar</li>
+    <li>httpcore-${project.apache-httpcore-4.version}.jar</li>
   </ul>
 
 </body>

diff --git a/pom.xml b/pom.xml
@@ -157,12 +157,22 @@
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>
-        <version>${project.httpclient.version}</version>
+        <version>${project.apache-httpclient-4.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpcore</artifactId>
-        <version>${project.httpcore.version}</version>
+        <version>${project.apache-httpcore-4.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents.client5</groupId>
+        <artifactId>httpclient5</artifactId>
+        <version>${project.apache-httpclient-5.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents.core5</groupId>
+        <artifactId>httpcore5</artifactId>
+        <version>${project.apache-httpcore-5.version}</version>
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
@@ -602,8 +612,10 @@
     <project.protobuf-java.version>3.21.12</project.protobuf-java.version>
     <project.guava.version>30.1.1-android</project.guava.version>
     <project.xpp3.version>1.1.4c</project.xpp3.version>
-    <project.httpclient.version>4.5.14</project.httpclient.version>
-    <project.httpcore.version>4.4.16</project.httpcore.version>
+    <project.apache-httpclient-4.version>4.5.14</project.apache-httpclient-4.version>
+    <project.apache-httpcore-4.version>4.4.16</project.apache-httpcore-4.version>
+    <project.apache-httpclient-5.version>5.3.1</project.apache-httpclient-5.version>
+    <project.apache-httpcore-5.version>5.2.4</project.apache-httpcore-5.version>
     <project.opencensus.version>0.31.1</project.opencensus.version>
     <project.root-directory>..</project.root-directory>
     <project.surefire.version>3.2.5</project.surefire.version>