Skip to content

Commit

Permalink
Cleanup assembly process. (#565)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
chingor13 authored and sduskis committed Feb 10, 2019
1 parent 16a0ec5 commit 970e998
Show file tree
Hide file tree
Showing 37 changed files with 236 additions and 5,637 deletions.
93 changes: 86 additions & 7 deletions google-http-client-assembly/assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<filtered>true</filtered>
<outputDirectory>google-http-java-client</outputDirectory>
</file>
<!-- properties files -->
<file>
<source>properties/google-http-client.jar.properties</source>
<destName>google-http-client-${project.version}.jar.properties</destName>
Expand All @@ -37,6 +38,12 @@
<outputDirectory>google-http-java-client/libs</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>properties/google-http-client-apache.jar.properties</source>
<destName>google-http-client-apache-${project.http-client-apache.version}.jar.properties</destName>
<outputDirectory>google-http-java-client/libs</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>properties/google-http-client-gson.jar.properties</source>
<destName>google-http-client-gson-${project.version}.jar.properties</destName>
Expand Down Expand Up @@ -73,21 +80,93 @@
<outputDirectory>google-http-java-client/libs</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>properties/gson.jar.properties</source>
<destName>gson-${project.gson.version}.jar.properties</destName>
<outputDirectory>google-http-java-client/libs</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>properties/jackson-core.jar.properties</source>
<destName>jackson-core-${project.jackson-core2.version}.jar.properties</destName>
<outputDirectory>google-http-java-client/libs</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>properties/jackson-core-asl.jar.properties</source>
<destName>jackson-core-asl-${project.jackson-core-asl.version}.jar.properties</destName>
<outputDirectory>google-http-java-client/libs</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>properties/protobuf-java.jar.properties</source>
<destName>protobuf-java-${project.protobuf-java.version}.jar.properties</destName>
<outputDirectory>google-http-java-client/libs</outputDirectory>
<filtered>true</filtered>
</file>
<!-- dependencies.html -->
<file>
<source>../google-http-client/target/site/dependencies.html</source>
<destName>google-http-client-dependencies.html</destName>
<outputDirectory>google-http-java-client/dependencies</outputDirectory>
</file>
<file>
<source>../google-http-client-android/target/site/dependencies.html</source>
<destName>google-http-client-android-dependencies.html</destName>
<outputDirectory>google-http-java-client/dependencies</outputDirectory>
</file>
<file>
<source>../google-http-client-apache/target/site/dependencies.html</source>
<destName>google-http-client-apache-dependencies.html</destName>
<outputDirectory>google-http-java-client/dependencies</outputDirectory>
</file>
<file>
<source>../google-http-client-gson/target/site/dependencies.html</source>
<destName>google-http-client-gson-dependencies.html</destName>
<outputDirectory>google-http-java-client/dependencies</outputDirectory>
</file>
<file>
<source>../google-http-client-jackson/target/site/dependencies.html</source>
<destName>google-http-client-jackson-dependencies.html</destName>
<outputDirectory>google-http-java-client/dependencies</outputDirectory>
</file>
<file>
<source>../google-http-client-jackson2/target/site/dependencies.html</source>
<destName>google-http-client-jackson2-dependencies.html</destName>
<outputDirectory>google-http-java-client/dependencies</outputDirectory>
</file>
<file>
<source>../google-http-client-jdo/target/site/dependencies.html</source>
<destName>google-http-client-jdo-dependencies.html</destName>
<outputDirectory>google-http-java-client/dependencies</outputDirectory>
</file>
<file>
<source>../google-http-client-protobuf/target/site/dependencies.html</source>
<destName>google-http-client-protobuf-dependencies.html</destName>
<outputDirectory>google-http-java-client/dependencies</outputDirectory>
</file>
<file>
<source>../google-http-client-xml/target/site/dependencies.html</source>
<destName>google-http-client-xml-dependencies.html</destName>
<outputDirectory>google-http-java-client/dependencies</outputDirectory>
</file>
</files>
<fileSets>
<fileSet>
<directory>dependencies</directory>
<outputDirectory>google-http-java-client/dependencies</outputDirectory>
<filtered>true</filtered>
<directory>target/site/css</directory>
<outputDirectory>google-http-java-client/dependencies/css</outputDirectory>
</fileSet>
<fileSet>
<directory>target/libs</directory>
<outputDirectory>google-http-java-client/libs</outputDirectory>
<directory>target/site/images</directory>
<outputDirectory>google-http-java-client/dependencies/images</outputDirectory>
</fileSet>
<fileSet>
<directory>licenses</directory>
<outputDirectory>google-oauth-java-client/dependencies</outputDirectory>
</fileSet>
<fileSet>
<directory>android-properties</directory>
<directory>target/libs</directory>
<outputDirectory>google-http-java-client/libs</outputDirectory>
<filtered>true</filtered>
</fileSet>
<fileSet>
<directory>target/libs-sources</directory>
Expand Down
151 changes: 0 additions & 151 deletions google-http-client-assembly/dependencies/css/maven-base.css

This file was deleted.

Loading

0 comments on commit 970e998

Please sign in to comment.