revert #545

googleapis · Mar 13, 2019 · e808917 · e808917
1 parent 50db8c9
commit e808917
Show file tree

Hide file tree

Showing 15 changed files with 1 addition and 200 deletions.
diff --git a/clirr-ignored-differences.xml b/clirr-ignored-differences.xml
@@ -7,8 +7,4 @@
     <differenceType>8001</differenceType>
     <className>com/google/api/client/repackaged/**</className>
   </difference>
-  <difference>
-    <differenceType>8001</differenceType>
-    <className>com/google/api/client/http/apache/**</className>
-  </difference>
 </differences>
diff --git a/google-http-client-android/pom.xml b/google-http-client-android/pom.xml
@@ -48,9 +48,5 @@
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.http-client</groupId>
-      <artifactId>google-http-client-apache</artifactId>
-    </dependency>
   </dependencies>
 </project>
diff --git a/...ttp-client-apache/src/main/java/com/google/api/client/http/apache/ApacheHttpResponse.java b/...ttp-client-apache/src/main/java/com/google/api/client/http/apache/ApacheHttpResponse.java
diff --git a/...tp-client-apache/src/main/java/com/google/api/client/http/apache/HttpExtensionMethod.java b/...tp-client-apache/src/main/java/com/google/api/client/http/apache/HttpExtensionMethod.java
diff --git a/google-http-client-apache/src/main/java/com/google/api/client/http/apache/package-info.java b/google-http-client-apache/src/main/java/com/google/api/client/http/apache/package-info.java
diff --git a/...client/http/apache/ApacheHttpRequest.java → ...client/http/apache/ApacheHttpRequest.java b/...client/http/apache/ApacheHttpRequest.java → ...client/http/apache/ApacheHttpRequest.java
diff --git a/...lient/http/apache/ApacheHttpResponse.java → ...lient/http/apache/ApacheHttpResponse.java b/...lient/http/apache/ApacheHttpResponse.java → ...lient/http/apache/ApacheHttpResponse.java
diff --git a/...ient/http/apache/ApacheHttpTransport.java → ...ient/http/apache/ApacheHttpTransport.java b/...ient/http/apache/ApacheHttpTransport.java → ...ient/http/apache/ApacheHttpTransport.java
diff --git a/...api/client/http/apache/ContentEntity.java → ...api/client/http/apache/ContentEntity.java b/...api/client/http/apache/ContentEntity.java → ...api/client/http/apache/ContentEntity.java
diff --git a/...ient/http/apache/HttpExtensionMethod.java → ...ient/http/apache/HttpExtensionMethod.java b/...ient/http/apache/HttpExtensionMethod.java → ...ient/http/apache/HttpExtensionMethod.java
diff --git a/...ttp/apache/SSLSocketFactoryExtension.java → ...ttp/apache/SSLSocketFactoryExtension.java b/...ttp/apache/SSLSocketFactoryExtension.java → ...ttp/apache/SSLSocketFactoryExtension.java
diff --git a/.../api/client/http/apache/package-info.java → .../api/client/http/apache/package-info.java b/.../api/client/http/apache/package-info.java → .../api/client/http/apache/package-info.java
diff --git a/.../http/apache/ApacheHttpTransportTest.java → .../http/apache/ApacheHttpTransportTest.java b/.../http/apache/ApacheHttpTransportTest.java → .../http/apache/ApacheHttpTransportTest.java
diff --git a/pom.xml b/pom.xml
@@ -57,8 +57,6 @@
     <module>google-http-client-assembly</module>
     <module>google-http-client-appengine</module>
     <module>google-http-client-android</module>
-    <module>google-http-client-apache</module>
-    <module>google-http-client-apache-legacy</module>
     <module>google-http-client-protobuf</module>
     <module>google-http-client-gson</module>
     <module>google-http-client-jackson</module>
@@ -174,11 +172,6 @@
         <artifactId>google-http-client</artifactId>
         <version>${project.http-client.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.google.http-client</groupId>
-        <artifactId>google-http-client-apache</artifactId>
-        <version>${project.http-client-apache.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-appengine</artifactId>

diff --git a/versions.txt b/versions.txt
@@ -18,3 +18,4 @@ google-http-client-jdo:1.28.0:1.28.1-SNAPSHOT
 google-http-client-protobuf:1.28.0:1.28.1-SNAPSHOT
 google-http-client-test:1.28.0:1.28.1-SNAPSHOT
 google-http-client-xml:1.28.0:1.28.1-SNAPSHOT
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,4 @@ google-http-client-jdo:1.28.0:1.28.1-SNAPSHOT
		google-http-client-protobuf:1.28.0:1.28.1-SNAPSHOT
		google-http-client-test:1.28.0:1.28.1-SNAPSHOT
		google-http-client-xml:1.28.0:1.28.1-SNAPSHOT