Skip to content

Commit bf4a8da

Browse files
authored
Split http apache artifact (#543)
* Split apache transport into 2 artifacts, current and legacy * Fix poms to make tests pass
1 parent 79ed2fe commit bf4a8da

File tree

23 files changed

+1153
-0
lines changed

23 files changed

+1153
-0
lines changed

clirr-ignored-differences.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,8 @@
77
<differenceType>8001</differenceType>
88
<className>com/google/api/client/repackaged/**</className>
99
</difference>
10+
<difference>
11+
<differenceType>8001</differenceType>
12+
<className>com/google/api/client/http/apache/**</className>
13+
</difference>
1014
</differences>

google-http-client-android/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,9 @@
4848
<groupId>com.google.http-client</groupId>
4949
<artifactId>google-http-client</artifactId>
5050
</dependency>
51+
<dependency>
52+
<groupId>com.google.http-client</groupId>
53+
<artifactId>google-http-client-apache</artifactId>
54+
</dependency>
5155
</dependencies>
5256
</project>
Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>com.google.http-client</groupId>
6+
<artifactId>google-http-client-parent</artifactId>
7+
<version>1.27.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
8+
<relativePath>../pom.xml</relativePath>
9+
</parent>
10+
<artifactId>google-http-client-apache-legacy</artifactId>
11+
<version>1.27.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-apache-legacy:current} -->
12+
<name>Apache HTTP transport for the Google HTTP Client Library for Java.</name>
13+
14+
<build>
15+
<plugins>
16+
<plugin>
17+
<artifactId>maven-javadoc-plugin</artifactId>
18+
<configuration>
19+
<links>
20+
<link>http://download.oracle.com/javase/6/docs/api/</link>
21+
<link>https://jar-download.com/artifacts/org.codehaus.jackson/jackson-core-asl/${project.jackson-core-asl.version}/documentation</link>
22+
</links>
23+
<doctitle>${project.name} ${project.version}</doctitle>
24+
<windowtitle>${project.artifactId} ${project.version}</windowtitle>
25+
</configuration>
26+
</plugin>
27+
<plugin>
28+
<artifactId>maven-source-plugin</artifactId>
29+
<executions>
30+
<execution>
31+
<id>source-jar</id>
32+
<phase>compile</phase>
33+
<goals>
34+
<goal>jar</goal>
35+
</goals>
36+
</execution>
37+
</executions>
38+
</plugin>
39+
<plugin>
40+
<groupId>org.codehaus.mojo</groupId>
41+
<artifactId>build-helper-maven-plugin</artifactId>
42+
<version>1.5</version>
43+
<executions>
44+
<execution>
45+
<id>add-test-source</id>
46+
<phase>generate-test-sources</phase>
47+
<goals>
48+
<goal>add-test-source</goal>
49+
</goals>
50+
<configuration>
51+
<sources>
52+
<source>target/generated-test-sources</source>
53+
</sources>
54+
</configuration>
55+
</execution>
56+
</executions>
57+
</plugin>
58+
<plugin>
59+
<artifactId>maven-jar-plugin</artifactId>
60+
<configuration>
61+
<archive>
62+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
63+
<manifestEntries>
64+
<Automatic-Module-Name>com.google.api.client.http.apache</Automatic-Module-Name>
65+
</manifestEntries>
66+
</archive>
67+
</configuration>
68+
</plugin>
69+
<plugin>
70+
<groupId>org.apache.felix</groupId>
71+
<artifactId>maven-bundle-plugin</artifactId>
72+
<version>2.5.4</version>
73+
<executions>
74+
<execution>
75+
<id>bundle-manifest</id>
76+
<phase>process-classes</phase>
77+
<goals>
78+
<goal>manifest</goal>
79+
</goals>
80+
</execution>
81+
</executions>
82+
</plugin>
83+
</plugins>
84+
</build>
85+
<dependencies>
86+
<dependency>
87+
<groupId>com.google.http-client</groupId>
88+
<artifactId>google-http-client</artifactId>
89+
</dependency>
90+
<dependency>
91+
<groupId>com.google.http-client</groupId>
92+
<artifactId>google-http-client-test</artifactId>
93+
<scope>test</scope>
94+
</dependency>
95+
<dependency>
96+
<groupId>junit</groupId>
97+
<artifactId>junit</artifactId>
98+
<scope>test</scope>
99+
</dependency>
100+
<dependency>
101+
<groupId>com.google.guava</groupId>
102+
<artifactId>guava</artifactId>
103+
<scope>test</scope>
104+
</dependency>
105+
<dependency>
106+
<groupId>org.mockito</groupId>
107+
<artifactId>mockito-all</artifactId>
108+
<scope>test</scope>
109+
</dependency>
110+
</dependencies>
111+
</project>

0 commit comments

Comments
 (0)