From b4fddbd52a66964a282a89a0a549d2b2daf8d76c Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 17 Oct 2018 16:37:27 -0700 Subject: [PATCH 1/3] Actually enable the nexus-staging-maven-plugin --- pom.xml | 4 ++++ samples/dailymotion-simple-cmdline-sample/pom.xml | 8 ++++++++ samples/googleplus-simple-cmdline-sample/pom.xml | 8 ++++++++ 3 files changed, 20 insertions(+) diff --git a/pom.xml b/pom.xml index 37c68fc5a..c73fb8acf 100644 --- a/pom.xml +++ b/pom.xml @@ -508,6 +508,10 @@ + + org.sonatype.plugins + nexus-staging-maven-plugin + diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml index bdd1c07a3..ca0ffb08e 100644 --- a/samples/dailymotion-simple-cmdline-sample/pom.xml +++ b/samples/dailymotion-simple-cmdline-sample/pom.xml @@ -73,6 +73,14 @@ true + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.6 + + true + + ${project.artifactId}-${project.version} diff --git a/samples/googleplus-simple-cmdline-sample/pom.xml b/samples/googleplus-simple-cmdline-sample/pom.xml index f125a5ed0..16d6b3a80 100644 --- a/samples/googleplus-simple-cmdline-sample/pom.xml +++ b/samples/googleplus-simple-cmdline-sample/pom.xml @@ -72,6 +72,14 @@ true + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.6 + + true + + ${project.artifactId}-${project.version} From 01b9ba8619011f470dd93e6dc9b1ef107b05c658 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 18 Oct 2018 09:44:48 -0700 Subject: [PATCH 2/3] Make the assembly plugin use properties to output the right filename --- google-http-client-assembly/assembly.xml | 49 +++++++++++++++++++ google-http-client-assembly/pom.xml | 19 ++++--- ...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 10 files changed, 62 insertions(+), 6 deletions(-) rename google-http-client-assembly/{android-properties/google-http-client-android-1.26.0.jar.properties => properties/google-http-client-android.jar.properties} (100%) rename google-http-client-assembly/{android-properties/google-http-client-gson-1.26.0.jar.properties => properties/google-http-client-gson.jar.properties} (100%) rename google-http-client-assembly/{android-properties/google-http-client-jackson-1.26.0.jar.properties => properties/google-http-client-jackson.jar.properties} (100%) rename google-http-client-assembly/{android-properties/google-http-client-jackson2-1.26.0.jar.properties => properties/google-http-client-jackson2.jar.properties} (100%) rename google-http-client-assembly/{android-properties/google-http-client-jdo-1.26.0.jar.properties => properties/google-http-client-jdo.jar.properties} (100%) rename google-http-client-assembly/{android-properties/google-http-client-protobuf-1.26.0.jar.properties => properties/google-http-client-protobuf.jar.properties} (100%) rename google-http-client-assembly/{android-properties/google-http-client-xml-1.26.0.jar.properties => properties/google-http-client-xml.jar.properties} (100%) rename google-http-client-assembly/{android-properties/google-http-client-1.26.0.jar.properties => properties/google-http-client.jar.properties} (100%) diff --git a/google-http-client-assembly/assembly.xml b/google-http-client-assembly/assembly.xml index 24d84951e..e20b89d80 100644 --- a/google-http-client-assembly/assembly.xml +++ b/google-http-client-assembly/assembly.xml @@ -25,11 +25,60 @@ true google-http-java-client + + properties/google-http-client.jar.properties + google-http-client-${project.version}.jar.properties + google-http-java-client/libs + true + + + properties/google-http-client-android.jar.properties + google-http-client-android-${project.version}.jar.properties + google-http-java-client/libs + true + + + properties/google-http-client-gson.jar.properties + google-http-client-gson-${project.version}.jar.properties + google-http-java-client/libs + true + + + properties/google-http-client-jackson.jar.properties + google-http-client-jackson-${project.version}.jar.properties + google-http-java-client/libs + true + + + properties/google-http-client-jackson2.jar.properties + google-http-client-jackson2-${project.version}.jar.properties + google-http-java-client/libs + true + + + properties/google-http-client-jdo.jar.properties + google-http-client-jdo-${project.version}.jar.properties + google-http-java-client/libs + true + + + properties/google-http-client-protobuf.jar.properties + google-http-client-protobuf-${project.version}.jar.properties + google-http-java-client/libs + true + + + properties/google-http-client-xml.jar.properties + google-http-client-xml-${project.version}.jar.properties + google-http-java-client/libs + true + dependencies google-http-java-client/dependencies + true target/libs diff --git a/google-http-client-assembly/pom.xml b/google-http-client-assembly/pom.xml index d66d2bf22..e89325431 100644 --- a/google-http-client-assembly/pom.xml +++ b/google-http-client-assembly/pom.xml @@ -53,6 +53,19 @@ + + + + maven-assembly-plugin + + + assembly.xml + + google-http-java-client + + + + maven-dependency-plugin @@ -93,12 +106,6 @@ single - - - assembly.xml - - google-http-java-client - diff --git a/google-http-client-assembly/android-properties/google-http-client-android-1.26.0.jar.properties b/google-http-client-assembly/properties/google-http-client-android.jar.properties similarity index 100% rename from google-http-client-assembly/android-properties/google-http-client-android-1.26.0.jar.properties rename to google-http-client-assembly/properties/google-http-client-android.jar.properties diff --git a/google-http-client-assembly/android-properties/google-http-client-gson-1.26.0.jar.properties b/google-http-client-assembly/properties/google-http-client-gson.jar.properties similarity index 100% rename from google-http-client-assembly/android-properties/google-http-client-gson-1.26.0.jar.properties rename to google-http-client-assembly/properties/google-http-client-gson.jar.properties diff --git a/google-http-client-assembly/android-properties/google-http-client-jackson-1.26.0.jar.properties b/google-http-client-assembly/properties/google-http-client-jackson.jar.properties similarity index 100% rename from google-http-client-assembly/android-properties/google-http-client-jackson-1.26.0.jar.properties rename to google-http-client-assembly/properties/google-http-client-jackson.jar.properties diff --git a/google-http-client-assembly/android-properties/google-http-client-jackson2-1.26.0.jar.properties b/google-http-client-assembly/properties/google-http-client-jackson2.jar.properties similarity index 100% rename from google-http-client-assembly/android-properties/google-http-client-jackson2-1.26.0.jar.properties rename to google-http-client-assembly/properties/google-http-client-jackson2.jar.properties diff --git a/google-http-client-assembly/android-properties/google-http-client-jdo-1.26.0.jar.properties b/google-http-client-assembly/properties/google-http-client-jdo.jar.properties similarity index 100% rename from google-http-client-assembly/android-properties/google-http-client-jdo-1.26.0.jar.properties rename to google-http-client-assembly/properties/google-http-client-jdo.jar.properties diff --git a/google-http-client-assembly/android-properties/google-http-client-protobuf-1.26.0.jar.properties b/google-http-client-assembly/properties/google-http-client-protobuf.jar.properties similarity index 100% rename from google-http-client-assembly/android-properties/google-http-client-protobuf-1.26.0.jar.properties rename to google-http-client-assembly/properties/google-http-client-protobuf.jar.properties diff --git a/google-http-client-assembly/android-properties/google-http-client-xml-1.26.0.jar.properties b/google-http-client-assembly/properties/google-http-client-xml.jar.properties similarity index 100% rename from google-http-client-assembly/android-properties/google-http-client-xml-1.26.0.jar.properties rename to google-http-client-assembly/properties/google-http-client-xml.jar.properties diff --git a/google-http-client-assembly/android-properties/google-http-client-1.26.0.jar.properties b/google-http-client-assembly/properties/google-http-client.jar.properties similarity index 100% rename from google-http-client-assembly/android-properties/google-http-client-1.26.0.jar.properties rename to google-http-client-assembly/properties/google-http-client.jar.properties From 91d7e740248e46932a0c2b534d0cfeba42871010 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 18 Oct 2018 10:11:28 -0700 Subject: [PATCH 3/3] Update maven-assembly-plugin so it can update the project version in the dependency html files --- ...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 +++++------ pom.xml | 2 +- 10 files changed, 71 insertions(+), 71 deletions(-) diff --git a/google-http-client-assembly/dependencies/google-http-client-android-dependencies.html b/google-http-client-assembly/dependencies/google-http-client-android-dependencies.html index 715d69d47..694fd327c 100644 --- a/google-http-client-assembly/dependencies/google-http-client-android-dependencies.html +++ b/google-http-client-assembly/dependencies/google-http-client-android-dependencies.html @@ -25,7 +25,7 @@
Last Published: 2018-08-20 -  | Version: 1.26.0 +  | Version: ${project.version}
@@ -63,7 +63,7 @@

compile

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

Project Dependency Graph