Skip to content

Cleanup assembly process. #565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 10, 2019
Merged

Cleanup assembly process. #565

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dd1510e
Build the dependencies report at package time.
chingor13 Jan 4, 2019
bf1d371
Pull dependencies.html files from the built modules
chingor13 Jan 4, 2019
c2ff6ee
Add google-http-client-apache properties
chingor13 Jan 4, 2019
fb4e319
Fix apache version
chingor13 Jan 4, 2019
663a0bf
Parameterize all the properties files
chingor13 Jan 5, 2019
527ca55
Since we are repackaging jars here, we need to include the license fi…
chingor13 Jan 7, 2019
593bf3b
Merge branch 'master' into cleanup-assembly
sduskis Feb 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Parameterize all the properties files
  • Loading branch information
@chingor13
chingor13 committed Jan 5, 2019
commit 663a0bfebbd62079e1ecc1741783b195968fc901
30 changes: 25 additions & 5 deletions google-http-client-assembly/assembly.xml
View file
Open in desktop
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 Down Expand Up @@ -79,6 +80,30 @@
<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>
Expand Down Expand Up @@ -139,11 +164,6 @@
<directory>target/libs</directory>
<outputDirectory>google-http-java-client/libs</outputDirectory>
</fileSet>
<fileSet>
<directory>android-properties</directory>
<outputDirectory>google-http-java-client/libs</outputDirectory>
<filtered>true</filtered>
</fileSet>
<fileSet>
<directory>target/libs-sources</directory>
<outputDirectory>google-http-java-client/libs-sources</outputDirectory>
Expand Down
10 changes: 7 additions & 3 deletions google-http-client-assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-appengine</artifactId>
<artifactId>google-http-client-android</artifactId>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-android</artifactId>
<artifactId>google-http-client-apache</artifactId>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-protobuf</artifactId>
<artifactId>google-http-client-appengine</artifactId>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
Expand All @@ -46,6 +46,10 @@
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-jdo</artifactId>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-protobuf</artifactId>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-xml</artifactId>
Expand Down
0 ...ndroid-properties/gson-2.1.jar.properties → ...t-assembly/properties/gson.jar.properties
View file
Open in desktop
File renamed without changes.
0 ...es/jackson-core-asl-1.9.13.jar.properties → ...roperties/jackson-core-asl.jar.properties
View file
Open in desktop
File renamed without changes.
0 ...perties/jackson-core-2.9.6.jar.properties → ...ly/properties/jackson-core.jar.properties
View file
Open in desktop
File renamed without changes.
0 ...erties/protobuf-java-2.6.1.jar.properties → ...y/properties/protobuf-java.jar.properties
View file
Open in desktop
File renamed without changes.