From 120758526c62d099ed8babe4ddae3c12811582f3 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 29 Oct 2018 10:53:57 -0700 Subject: [PATCH] Release improvements (#1195) * Can run mvn assembly:single outside of build * Filter dependency html files * Use assembly to rename versioned properties files --- google-api-client-assembly/assembly.xml | 91 +++++++++++++++++++ ...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 +++--- google-api-client-assembly/pom.xml | 19 ++-- .../google-api-client-android.jar.properties} | 0 .../google-api-client-gson.jar.properties} | 0 ...google-api-client-jackson2.jar.properties} | 0 ...google-api-client-protobuf.jar.properties} | 0 .../google-api-client-xml.jar.properties} | 0 .../google-api-client.jar.properties} | 0 ...google-http-client-android.jar.properties} | 0 .../google-http-client-gson.jar.properties} | 0 ...google-http-client-jackson.jar.properties} | 0 ...oogle-http-client-jackson2.jar.properties} | 0 .../google-http-client-jdo.jar.properties} | 0 ...oogle-http-client-protobuf.jar.properties} | 0 .../google-http-client-xml.jar.properties} | 0 .../google-http-client.jar.properties} | 0 .../google-oauth-client.jar.properties} | 0 40 files changed, 462 insertions(+), 364 deletions(-) rename google-api-client-assembly/{android-properties/google-api-client-android-1.26.0.jar.properties => properties/google-api-client-android.jar.properties} (100%) rename google-api-client-assembly/{android-properties/google-api-client-gson-1.26.0.jar.properties => properties/google-api-client-gson.jar.properties} (100%) rename google-api-client-assembly/{android-properties/google-api-client-jackson2-1.26.0.jar.properties => properties/google-api-client-jackson2.jar.properties} (100%) rename google-api-client-assembly/{android-properties/google-api-client-protobuf-1.26.0.jar.properties => properties/google-api-client-protobuf.jar.properties} (100%) rename google-api-client-assembly/{android-properties/google-api-client-xml-1.26.0.jar.properties => properties/google-api-client-xml.jar.properties} (100%) rename google-api-client-assembly/{android-properties/google-api-client-1.26.0.jar.properties => properties/google-api-client.jar.properties} (100%) rename google-api-client-assembly/{android-properties/google-http-client-android-1.26.0.jar.properties => properties/google-http-client-android.jar.properties} (100%) rename google-api-client-assembly/{android-properties/google-http-client-gson-1.26.0.jar.properties => properties/google-http-client-gson.jar.properties} (100%) rename google-api-client-assembly/{android-properties/google-http-client-jackson-1.26.0.jar.properties => properties/google-http-client-jackson.jar.properties} (100%) rename google-api-client-assembly/{android-properties/google-http-client-jackson2-1.26.0.jar.properties => properties/google-http-client-jackson2.jar.properties} (100%) rename google-api-client-assembly/{android-properties/google-http-client-jdo-1.26.0.jar.properties => properties/google-http-client-jdo.jar.properties} (100%) rename google-api-client-assembly/{android-properties/google-http-client-protobuf-1.26.0.jar.properties => properties/google-http-client-protobuf.jar.properties} (100%) rename google-api-client-assembly/{android-properties/google-http-client-xml-1.26.0.jar.properties => properties/google-http-client-xml.jar.properties} (100%) rename google-api-client-assembly/{android-properties/google-http-client-1.26.0.jar.properties => properties/google-http-client.jar.properties} (100%) rename google-api-client-assembly/{android-properties/google-oauth-client-1.26.0.jar.properties => properties/google-oauth-client.jar.properties} (100%) diff --git a/google-api-client-assembly/assembly.xml b/google-api-client-assembly/assembly.xml index 6578dd862..a239f8f8f 100644 --- a/google-api-client-assembly/assembly.xml +++ b/google-api-client-assembly/assembly.xml @@ -25,11 +25,102 @@ true google-api-java-client + + properties/google-api-client.jar.properties + google-api-client-${project.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-api-client-android.jar.properties + google-api-client-android-${project.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-api-client-gson.jar.properties + google-api-client-gson-${project.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-api-client-jackson2.jar.properties + google-api-client-jackson2-${project.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-api-client-protobuf.jar.properties + google-api-client-protobuf-${project.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-api-client-xml.jar.properties + google-api-client-xml-${project.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-http-client.jar.properties + google-http-client-${project.http.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-http-client-android.jar.properties + google-http-client-android-${project.http.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-http-client-gson.jar.properties + google-http-client-gson-${project.http.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-http-client-jackson.jar.properties + google-http-client-jackson-${project.http.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-http-client-jackson2.jar.properties + google-http-client-jackson2-${project.http.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-http-client-jdo.jar.properties + google-http-client-jdo-${project.http.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-http-client-protobuf.jar.properties + google-http-client-protobuf-${project.http.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-http-client-xml.jar.properties + google-http-client-xml-${project.http.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-oauth-client.jar.properties + google-oauth-client-${project.oauth.version}.jar.properties + google-api-java-client/libs + true + 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