8000 http issue 237: Move XML support to separate google-http-client-xml jar · rohitvvv/google-http-java-client@c623c9f · GitHub
[go: up one dir, main page]
Skip to content

Commit c623c9f

Browse files
author
Yaniv Inbar
committed
http issue 237: Move XML support to separate google-http-client-xml jar
https://code.google.com/p/google-http-java-client/issues/detail?id=237 https://codereview.appspot.com/12786043/
1 parent c3b317f commit c623c9f

31 files changed

+731
-7
lines changed

‎clirr-ignored-differences.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
<!-- see http://mojo.codehaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
33
<differences>
44
<!-- 8001 (Class removed): className -->
5+
<difference>
6+
<differenceType>8001</differenceType>
7+
<className>com/google/api/client/**/xml/**</className>
8+
</difference>
59
<difference>
610
<differenceType>8001</differenceType>
711
<className>com/google/api/client/repackaged/**</className>

‎google-http-client-assembly/android-properties/google-http-client-xml-1.17.0-rc-SNAPSHOT.jar.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src=../libs-sources/google-http-client-xml-${project.version}-sources.jar

‎google-http-client-assembly/classpath-include

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<classpathentry kind="lib" path="libs/google-http-client-jackson-${project.version}.jar" sourcepath="libs-sources/google-http-client-jackson-${project.version}-sources.jar"/>
77
<classpathentry kind="lib" path="libs/google-http-client-jackson2-${project.version}.jar" sourcepath="libs-sources/google-http-client-jackson2-${project.version}-sources.jar"/>
88
<classpathentry kind="lib" path="libs/google-http-client-jdo-${project.version}.jar" sourcepath="libs-sources/google-http-client-jdo-${project.version}-sources.jar"/>
9+
<classpathentry kind="lib" path="libs/google-http-client-xml-${project.version}.jar" sourcepath="libs-sources/google-http-client-xml-${project.version}-sources.jar"/>
910
<classpathentry kind="lib" path="libs/commons-logging-${project.commons-logging.version}.jar" sourcepath="libs-sources/commons-logging-${project.commons-logging.version}-sources.jar"/>
1011
<classpathentry kind="lib" path="libs/gson-${project.gson.version}.jar" sourcepath="libs-sources/gson-${project.gson.version}-sources.jar"/>
1112
<classpathentry kind="lib" path="libs/httpclient-${project.httpclient.version}.jar" sourcepath="libs-sources/httpclient-${project.httpclient.version}-sources.jar"/>

‎google-http-client-assembly/dependencies/google-http-client-xml-dependencies.html

Lines changed: 95 additions & 0 deletions
Large diffs are not rendered by default.

‎google-http-client-assembly/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
<groupId>com.google.http-client</groupId>
4646
<artifactId>google-http-client-jdo</artifactId>
4747
</dependency>
48+
<dependency>
49+
<groupId>com.google.http-client</groupId>
50+
<artifactId>google-http-client-xml</artifactId>
51+
</dependency>
4852
</dependencies>
4953

5054
<build>

‎google-http-client-assembly/readme.html

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ <h3>Dependencies and Licenses</h3>
4646
href='dependencies/google-http-client-jackson2-dependencies.html'>google-http-client-jackson2-dependencies.html</a></li>
4747
<li>google-http-client-jdo: <a
4848
href='dependencies/google-http-client-jdo-dependencies.html'>google-http-client-jdo-dependencies.html</a></li>
49+
<li>google-http-client-xml: <a
50+
href='dependencies/google-http-client-xml-dependencies.html'>google-http-client-xml-dependencies.html</a></li>
4951
</ul>
5052

5153
<h3>Maven Usage</h3>
@@ -106,6 +108,11 @@ <h3>Dependencies for all Platforms</h3>
106108
</ul>
107109
</li>
108110
<li>jdo2-api-${project.jdo2-api.version}.jar (when using JDO)</li>
111+
<li>google-http-client-xml-${project.version}.jar (when using XML)
112+
<ul>
113+
<li>xpp3-${project.xpp3.version}.jar (when NOT on Android)</li>
114+
</ul>
115+
</li>
109116
</ul>
110117

111118
<h3>Android Dependencies</h3>
@@ -128,7 +135,6 @@ <h3>Google App Engine Dependencies</h3>
128135
a newer compatible version:
129136
<ul>
130137
<li>google-http-client-appengine-${project.version}.jar</li>
131-
<li>xpp3-${project.xpp3.version}.jar</li>
132138
</ul>
133139
Please see the
134140
<a
@@ -143,7 +149,6 @@ <h3>General Purpose Java 5 Environment Dependencies</h3>
143149
<li>commons-logging-${project.commons-logging.version}.jar</li>
144150
<li>httpclient-${project.httpclient.version}.jar</li>
145151
<li>httpcore-${project.httpcore.version}.jar</li>
146-
<li>xpp3-${project.xpp3.version}.jar</li>
147152
</ul>
148153

149154
</body>

‎google-http-client-xml/.classpath

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" path="src/main/java"/>
4+
<classpathentry kind="src" path="src/test/java"/>
5+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
6+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
7+
<classpathentry kind="output" path="bin"/>
8+
</classpath>

‎google-http-client-xml/.project

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>google-http-client-xml</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
22+
</natures>
23+
</projectDescription>

0 commit comments

Comments
 (0)
0