From 2825b822fdfcc808bf13c4a9a735fee62164087c Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 18 Oct 2018 12:14:00 -0700 Subject: [PATCH 1/3] Can run mvn assembly:single outside of build --- google-api-client-assembly/pom.xml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml index 9a86ed48e..6b21f80d8 100644 --- a/google-api-client-assembly/pom.xml +++ b/google-api-client-assembly/pom.xml @@ -62,6 +62,19 @@ + + + + maven-assembly-plugin + + + assembly.xml + + google-api-java-client + + + + maven-dependency-plugin @@ -102,12 +115,6 @@ single - - - assembly.xml - - google-api-java-client - From 878db735ee0151833e6df7f808cf361a38aaf478 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 18 Oct 2018 12:17:05 -0700 Subject: [PATCH 2/3] Filter dependency html files --- google-api-client-assembly/assembly.xml | 1 + ...oogle-api-client-android-dependencies.html | 44 +++++------ ...gle-api-client-appengine-dependencies.html | 76 +++++++++---------- .../google-api-client-dependencies.html | 44 +++++------ .../google-api-client-gson-dependencies.html | 44 +++++------ ...ogle-api-client-jackson2-dependencies.html | 36 ++++----- .../google-api-client-java6-dependencies.html | 44 +++++------ ...ogle-api-client-protobuf-dependencies.html | 44 +++++------ ...oogle-api-client-servlet-dependencies.html | 52 ++++++------- .../google-api-client-xml-dependencies.html | 44 +++++------ ...ogle-http-client-android-dependencies.html | 12 +-- ...le-http-client-appengine-dependencies.html | 20 ++--- .../google-http-client-dependencies.html | 4 +- .../google-http-client-gson-dependencies.html | 20 ++--- ...ogle-http-client-jackson-dependencies.html | 20 ++--- ...gle-http-client-jackson2-dependencies.html | 20 ++--- .../google-http-client-jdo-dependencies.html | 20 ++--- ...gle-http-client-protobuf-dependencies.html | 12 +-- .../google-http-client-xml-dependencies.html | 12 +-- ...e-oauth-client-appengine-dependencies.html | 44 +++++------ .../google-oauth-client-dependencies.html | 20 ++--- ...oogle-oauth-client-java6-dependencies.html | 28 +++---- ...oogle-oauth-client-jetty-dependencies.html | 28 +++---- ...gle-oauth-client-servlet-dependencies.html | 28 +++---- 24 files changed, 359 insertions(+), 358 deletions(-) diff --git a/google-api-client-assembly/assembly.xml b/google-api-client-assembly/assembly.xml index 6578dd862..12b6b5485 100644 --- a/google-api-client-assembly/assembly.xml +++ b/google-api-client-assembly/assembly.xml @@ -30,6 +30,7 @@ dependencies google-api-java-client/dependencies + true target/libs diff --git a/google-api-client-assembly/dependencies/google-api-client-android-dependencies.html b/google-api-client-assembly/dependencies/google-api-client-android-dependencies.html index 4da37e376..e40e3aa77 100644 --- a/google-api-client-assembly/dependencies/google-api-client-android-dependencies.html +++ b/google-api-client-assembly/dependencies/google-api-client-android-dependencies.html @@ -25,7 +25,7 @@
Last Published: 2018-08-20 -  | Version: 1.26.0 +  | Version: ${project.version}
@@ -63,13 +63,13 @@

compile

com.google.api-client google-api-client -1.26.0 +${project.version} jar The Apache Software License, Version 2.0 com.google.http-client google-http-client-android -1.26.0 +${project.http.version} jar The Apache Software License, Version 2.0
@@ -128,13 +128,13 @@

compile

com.google.http-client google-http-client -1.26.0 +${project.http.version} jar The Apache Software License, Version 2.0 com.google.http-client google-http-client-jackson2 -1.26.0 +${project.http.version} jar The Apache Software License, Version 2.0 @@ -146,7 +146,7 @@

compile

com.google.oauth-client google-oauth-client -1.26.0 +${project.oauth.version} jar The Apache Software License, Version 2.0 @@ -229,7 +229,7 @@

Project Dependency Graph