Skip to content

Commit 970e998

Browse files
chingor13sduskis
authored andcommitted
Cleanup assembly process. (#565)
* Build the dependencies report at package time. * Pull dependencies.html files from the built modules * Add google-http-client-apache properties * Fix apache version * Parameterize all the properties files * Since we are repackaging jars here, we need to include the license files as we originally were.
1 parent 16a0ec5 commit 970e998

37 files changed

+236
-5637
lines changed

google-http-client-assembly/assembly.xml

Lines changed: 86 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<filtered>true</filtered>
2626
<outputDirectory>google-http-java-client</outputDirectory>
2727
</file>
28+
<!-- properties files -->
2829
<file>
2930
<source>properties/google-http-client.jar.properties</source>
3031
<destName>google-http-client-${project.version}.jar.properties</destName>
@@ -37,6 +38,12 @@
3738
<outputDirectory>google-http-java-client/libs</outputDirectory>
3839
<filtered>true</filtered>
3940
</file>
41+
<file>
42+
<source>properties/google-http-client-apache.jar.properties</source>
43+
<destName>google-http-client-apache-${project.http-client-apache.version}.jar.properties</destName>
44+
<outputDirectory>google-http-java-client/libs</outputDirectory>
45+
<filtered>true</filtered>
46+
</file>
4047
<file>
4148
<source>properties/google-http-client-gson.jar.properties</source>
4249
<destName>google-http-client-gson-${project.version}.jar.properties</destName>
@@ -73,21 +80,93 @@
7380
<outputDirectory>google-http-java-client/libs</outputDirectory>
7481
<filtered>true</filtered>
7582
</file>
83+
<file>
84+
<source>properties/gson.jar.properties</source>
85+
<destName>gson-${project.gson.version}.jar.properties</destName>
86+
<outputDirectory>google-http-java-client/libs</outputDirectory>
87+
<filtered>true</filtered>
88+
</file>
89+
<file>
90+
<source>properties/jackson-core.jar.properties</source>
91+
<destName>jackson-core-${project.jackson-core2.version}.jar.properties</destName>
92+
<outputDirectory>google-http-java-client/libs</outputDirectory>
93+
<filtered>true</filtered>
94+
</file>
95+
<file>
96+
<source>properties/jackson-core-asl.jar.properties</source>
97+
<destName>jackson-core-asl-${project.jackson-core-asl.version}.jar.properties</destName>
98+
<outputDirectory>google-http-java-client/libs</outputDirectory>
99+
<filtered>true</filtered>
100+
</file>
101+
<file>
102+
<source>properties/protobuf-java.jar.properties</source>
103+
<destName>protobuf-java-${project.protobuf-java.version}.jar.properties</destName>
104+
<outputDirectory>google-http-java-client/libs</outputDirectory>
105+
<filtered>true</filtered>
106+
</file>
107+
<!-- dependencies.html -->
108+
<file>
109+
<source>../google-http-client/target/site/dependencies.html</source>
110+
<destName>google-http-client-dependencies.html</destName>
111+
<outputDirectory>google-http-java-client/dependencies</outputDirectory>
112+
</file>
113+
<file>
114+
<source>../google-http-client-android/target/site/dependencies.html</source>
115+
<destName>google-http-client-android-dependencies.html</destName>
116+
<outputDirectory>google-http-java-client/dependencies</outputDirectory>
117+
</file>
118+
<file>
119+
<source>../google-http-client-apache/target/site/dependencies.html</source>
120+
<destName>google-http-client-apache-dependencies.html</destName>
121+
<outputDirectory>google-http-java-client/dependencies</outputDirectory>
122+
</file>
123+
<file>
124+
<source>../google-http-client-gson/target/site/dependencies.html</source>
125+
<destName>google-http-client-gson-dependencies.html</destName>
126+
<outputDirectory>google-http-java-client/dependencies</outputDirectory>
127+
</file>
128+
<file>
129+
<source>../google-http-client-jackson/target/site/dependencies.html</source>
130+
<destName>google-http-client-jackson-dependencies.html</destName>
131+
<outputDirectory>google-http-java-client/dependencies</outputDirectory>
132+
</file>
133+
<file>
134+
<source>../google-http-client-jackson2/target/site/dependencies.html</source>
135+
<destName>google-http-client-jackson2-dependencies.html</destName>
136+
<outputDirectory>google-http-java-client/dependencies</outputDirectory>
137+
</file>
138+
<file>
139+
<source>../google-http-client-jdo/target/site/dependencies.html</source>
140+
<destName>google-http-client-jdo-dependencies.html</destName>
141+
<outputDirectory>google-http-java-client/dependencies</outputDirectory>
142+
</file>
143+
<file>
144+
<source>../google-http-client-protobuf/target/site/dependencies.html</source>
145+
<destName>google-http-client-protobuf-dependencies.html</destName>
146+
<outputDirectory>google-http-java-client/dependencies</outputDirectory>
147+
</file>
148+
<file>
149+
<source>../google-http-client-xml/target/site/dependencies.html</source>
150+
<destName>google-http-client-xml-dependencies.html</destName>
151+
<outputDirectory>google-http-java-client/dependencies</outputDirectory>
152+
</file>
76153
</files>
77154
<fileSets>
78155
<fileSet>
79-
<directory>dependencies</directory>
80-
<outputDirectory>google-http-java-client/dependencies</outputDirectory>
81-
<filtered>true</filtered>
156+
<directory>target/site/css</directory>
157+
<outputDirectory>google-http-java-client/dependencies/css</outputDirectory>
82158
</fileSet>
83159
<fileSet>
84-
<directory>target/libs</directory>
85-
<outputDirectory>google-http-java-client/libs</outputDirectory>
160+
<directory>target/site/images</directory>
161+
<outputDirectory>google-http-java-client/dependencies/images</outputDirectory>
162+
</fileSet>
163+
<fileSet>
164+
<directory>licenses</directory>
165+
<outputDirectory>google-oauth-java-client/dependencies</outputDirectory>
86166
</fileSet>
87167
<fileSet>
88-
<directory>android-properties</directory>
168+
<directory>target/libs</directory>
89169
<outputDirectory>google-http-java-client/libs</outputDirectory>
90-
<filtered>true</filtered>
91170
</fileSet>
92171
<fileSet>
93172
<directory>target/libs-sources</directory>

google-http-client-assembly/dependencies/css/maven-base.css

Lines changed: 0 additions & 151 deletions
This file was deleted.

0 commit comments

Comments
 (0)