Skip to content

Commit 1207585

Browse files
authored
Release improvements (#1195)
* Can run mvn assembly:single outside of build * Filter dependency html files * Use assembly to rename versioned properties files
1 parent 020a042 commit 1207585

40 files changed

Lines changed: 462 additions & 364 deletions

File tree

google-api-client-assembly/assembly.xml

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,102 @@
2525
<filtered>true</filtered>
2626
<outputDirectory>google-api-java-client</outputDirectory>
2727
</file>
28+
<file>
29+
<source>properties/google-api-client.jar.properties</source>
30+
<destName>google-api-client-${project.version}.jar.properties</destName>
31+
<outputDirectory>google-api-java-client/libs</outputDirectory>
32+
<filtered>true</filtered>
33+
</file>
34+
<file>
35+
<source>properties/google-api-client-android.jar.properties</source>
36+
<destName>google-api-client-android-${project.version}.jar.properties</destName>
37+
<outputDirectory>google-api-java-client/libs</outputDirectory>
38+
<filtered>true</filtered>
39+
</file>
40+
<file>
41+
<source>properties/google-api-client-gson.jar.properties</source>
42+
<destName>google-api-client-gson-${project.version}.jar.properties</destName>
43+
<outputDirectory>google-api-java-client/libs</outputDirectory>
44+
<filtered>true</filtered>
45+
</file>
46+
<file>
47+
<source>properties/google-api-client-jackson2.jar.properties</source>
48+
<destName>google-api-client-jackson2-${project.version}.jar.properties</destName>
49+
<outputDirectory>google-api-java-client/libs</outputDirectory>
50+
<filtered>true</filtered>
51+
</file>
52+
<file>
53+
<source>properties/google-api-client-protobuf.jar.properties</source>
54+
<destName>google-api-client-protobuf-${project.version}.jar.properties</destName>
55+
<outputDirectory>google-api-java-client/libs</outputDirectory>
56+
<filtered>true</filtered>
57+
</file>
58+
<file>
59+
<source>properties/google-api-client-xml.jar.properties</source>
60+
<destName>google-api-client-xml-${project.version}.jar.properties</destName>
61+
<outputDirectory>google-api-java-client/libs</outputDirectory>
62+
<filtered>true</filtered>
63+
</file>
64+
<file>
65+
<source>properties/google-http-client.jar.properties</source>
66+
<destName>google-http-client-${project.http.version}.jar.properties</destName>
67+
<outputDirectory>google-api-java-client/libs</outputDirectory>
68+
<filtered>true</filtered>
69+
</file>
70+
<file>
71+
<source>properties/google-http-client-android.jar.properties</source>
72+
<destName>google-http-client-android-${project.http.version}.jar.properties</destName>
73+
<outputDirectory>google-api-java-client/libs</outputDirectory>
74+
<filtered>true</filtered>
75+
</file>
76+
<file>
77+
<source>properties/google-http-client-gson.jar.properties</source>
78+
<destName>google-http-client-gson-${project.http.version}.jar.properties</destName>
79+
<outputDirectory>google-api-java-client/libs</outputDirectory>
80+
<filtered>true</filtered>
81+
</file>
82+
<file>
83+
<source>properties/google-http-client-jackson.jar.properties</source>
84+
<destName>google-http-client-jackson-${project.http.version}.jar.properties</destName>
85+
<outputDirectory>google-api-java-client/libs</outputDirectory>
86+
<filtered>true</filtered>
87+
</file>
88+
<file>
89+
<source>properties/google-http-client-jackson2.jar.properties</source>
90+
<destName>google-http-client-jackson2-${project.http.version}.jar.properties</destName>
91+
<outputDirectory>google-api-java-client/libs</outputDirectory>
92+
<filtered>true</filtered>
93+
</file>
94+
<file>
95+
<source>properties/google-http-client-jdo.jar.properties</source>
96+
<destName>google-http-client-jdo-${project.http.version}.jar.properties</destName>
97+
<outputDirectory>google-api-java-client/libs</outputDirectory>
98+
<filtered>true</filtered>
99+
</file>
100+
<file>
101+
<source>properties/google-http-client-protobuf.jar.properties</source>
102+
<destName>google-http-client-protobuf-${project.http.version}.jar.properties</destName>
103+
<outputDirectory>google-api-java-client/libs</outputDirectory>
104+
<filtered>true</filtered>
105+
</file>
106+
<file>
107+
<source>properties/google-http-client-xml.jar.properties</source>
108+
<destName>google-http-client-xml-${project.http.version}.jar.properties</destName>
109+
<outputDirectory>google-api-java-client/libs</outputDirectory>
110+
<filtered>true</filtered>
111+
</file>
112+
<file>
113+
<source>properties/google-oauth-client.jar.properties</source>
114+
<destName>google-oauth-client-${project.oauth.version}.jar.properties</destName>
115+
<outputDirectory>google-api-java-client/libs</outputDirectory>
116+
<filtered>true</filtered>
117+
</file>
28118
</files>
29119
<fileSets>
30120
<fileSet>
31121
<directory>dependencies</directory>
32122
<outputDirectory>google-api-java-client/dependencies</outputDirectory>
123+
<filtered>true</filtered>
33124
</fileSet>
34125
<fileSet>
35126
<directory>target/libs</directory>

google-api-client-assembly/dependencies/google-api-client-android-dependencies.html

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<div class="xleft">
2727
<span id="publishDate">Last Published: 2018-08-20</span>
28-
&nbsp;| <span id="projectVersion">Version: 1.26.0</span>
28+
&nbsp;| <span id="projectVersion">Version: ${project.version}</span>
2929
</div>
3030
<div class="xright">
3131

@@ -63,13 +63,13 @@ <h3>compile<a name="compile"></a></h3>
6363
<tr class="b">
6464
<td>com.google.api-client</td>
6565
<td><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client">google-api-client</a></td>
66-
<td>1.26.0</td>
66+
<td>${project.version}</td>
6767
<td>jar</td>
6868
<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
6969
<tr class="a">
7070
<td>com.google.http-client</td>
7171
<td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-android">google-http-client-android</a></td>
72-
<td>1.26.0</td>
72+
<td>${project.http.version}</td>
7373
<td>jar</td>
7474
<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div><a name="Project_Dependencies_provided"></a>
7575
<div class="section">
@@ -128,13 +128,13 @@ <h3>compile<a name="compile"></a></h3>
128128
<tr class="a">
129129
<td>com.google.http-client</td>
130130
<td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
131-
<td>1.26.0</td>
131+
<td>${project.http.version}</td>
132132
<td>jar</td>
133133
<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
134134
<tr class="b">
135135
<td>com.google.http-client</td>
136136
<td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson2">google-http-client-jackson2</a></td>
137-
<td>1.26.0</td>
137+
<td>${project.http.version}</td>
138138
<td>jar</td>
139139
<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
140140
<tr class="a">
@@ -146,7 +146,7 @@ <h3>compile<a name="compile"></a></h3>
146146
<tr class="b">
147147
<td>com.google.oauth-client</td>
148148
<td><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">google-oauth-client</a></td>
149-
<td>1.26.0</td>
149+
<td>${project.oauth.version}</td>
150150
<td>jar</td>
151151
<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
152152
<tr class="a">
@@ -229,7 +229,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
229229
<div class="section">
230230
<h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
231231
<ul>
232-
<li>com.google.api-client:google-api-client-android:jar:1.26.0 <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
232+
<li>com.google.api-client:google-api-client-android:jar:${project.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
233233
<table border="0" class="bodyTable">
234234
<tr class="a">
235235
<th>Android Platform Extensions to the Google APIs Client Library for Java.</th></tr>
@@ -331,7 +331,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
331331
These properties make JSON an ideal data-interchange language.</p>
332332
<p><b>URL: </b><a class="externalLink" href="http://www.json.org/java/index.html">http://www.json.org/java/index.html</a></p>
333333
<p><b>Project License: </b><a class="externalLink" href="http://www.json.org/license.html">provided without support or warranty</a></p></td></tr></table></div></li></ul></li>
334-
<li>com.google.api-client:google-api-client:jar:1.26.0 (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
334+
<li>com.google.api-client:google-api-client:jar:${project.version} (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
335335
<table border="0" class="bodyTable">
336336
<tr class="a">
337337
<th>Google APIs Client Library for Java</th></tr>
@@ -341,7 +341,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
341341
<p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client">https://github.com/google/google-api-java-client/google-api-client</a></p>
342342
<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
343343
<ul>
344-
<li>com.google.oauth-client:google-oauth-client:jar:1.26.0 (compile) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
344+
<li>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version} (compile) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
345345
<table border="0" class="bodyTable">
346346
<tr class="a">
347347
<th>Google OAuth Client Library for Java</th></tr>
@@ -361,7 +361,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
361361
<p><b>Description: </b>JSR305 Annotations for Findbugs</p>
362362
<p><b>URL: </b><a class="externalLink" href="http://findbugs.sourceforge.net/">http://findbugs.sourceforge.net/</a></p>
363363
<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
364-
<li>com.google.http-client:google-http-client-jackson2:jar:1.26.0 (compile) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
364+
<li>com.google.http-client:google-http-client-jackson2:jar:${project.http.version} (compile) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
365365
<table border="0" class="bodyTable">
366366
<tr class="a">
367367
<th>Jackson 2 extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -394,7 +394,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
394394
per the JSR-305 spec.</p>
395395
<p><b>URL: </b><a class="externalLink" href="https://github.com/google/guava/guava">https://github.com/google/guava/guava</a></p>
396396
<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
397-
<li>com.google.http-client:google-http-client-android:jar:1.26.0 (compile) <img id="_img33" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep32', '_img33' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep32" style="display:none">
397+
<li>com.google.http-client:google-http-client-android:jar:${project.http.version} (compile) <img id="_img33" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep32', '_img33' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep32" style="display:none">
398398
<table border="0" class="bodyTable">
399399
<tr class="a">
400400
<th>Android Platform Extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -404,7 +404,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
404404
<p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-android">https://github.com/google/google-http-java-client/google-http-client-android</a></p>
405405
<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
406406
<ul>
407-
<li>com.google.http-client:google-http-client:jar:1.26.0 (compile) <img id="_img35" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep34', '_img35' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep34" style="display:none">
407+
<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img35" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep34', '_img35' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep34" style="display:none">
408408
<table border="0" class="bodyTable">
409409
<tr class="a">
410410
<th>Google HTTP Client Library for Java</th></tr>
@@ -479,7 +479,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
479479
<td>1.6</td>
480480
<td>release</td></tr>
481481
<tr class="a">
482-
<td>google-api-client-1.26.0.jar</td>
482+
<td>google-api-client-${project.version}.jar</td>
483483
<td>199.67 kB</td>
484484
<td>141</td>
485485
<td>110</td>
@@ -503,23 +503,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
503503
<td>1.6</td>
504504
<td>debug</td></tr>
505505
<tr class="b">
506-
<td>google-http-client-1.26.0.jar</td>
506+
<td>google-http-client-${project.http.version}.jar</td>
507507
<td>261.81 kB</td>
508508
<td>223</td>
509509
<td>200</td>
510510
<td>16</td>
511511
<td>1.6</td>
512512
<td>debug</td></tr>
513513
<tr class="a">
514-
<td>google-http-client-android-1.26.0.jar</td>
514+
<td>google-http-client-android-${project.http.version}.jar</td>
515515
<td>11.86 kB</td>
516516
<td>21</td>
517517
<td>11</td>
518518
<td>3</td>
519519
<td>1.6</td>
520520
<td>debug</td></tr>
521521
<tr class="b">
522-
<td>google-http-client-jackson2-1.26.0.jar</td>
522+
<td>google-http-client-jackson2-${project.http.version}.jar</td>
523523
<td>6.58 kB</td>
524524
<td>13</td>
525525
<td>5</td>
@@ -535,7 +535,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
535535
<td>1.5</td>
536536
<td>debug</td></tr>
537537
<tr class="b">
538-
<td>google-oauth-client-1.26.0.jar</td>
538+
<td>google-oauth-client-${project.oauth.version}.jar</td>
539539
<td>61.64 kB</td>
540540
<td>57</td>
541541
<td>47</td>
@@ -684,7 +684,7 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
684684
<td>-</td>
685685
<td>-</td></tr>
686686
<tr class="a">
687-
<td>com.google.api-client:google-api-client:jar:1.26.0</td>
687+
<td>com.google.api-client:google-api-client:jar:${project.version}</td>
688688
<td>-</td>
689689
<td>-</td>
690690
<td>-</td></tr>
@@ -699,17 +699,17 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
699699
<td>-</td>
700700
<td>-</td></tr>
701701
<tr class="b">
702-
<td>com.google.http-client:google-http-client:jar:1.26.0</td>
702+
<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
703703
<td>-</td>
704704
<td>-</td>
705705
<td>-</td></tr>
706706
<tr class="a">
707-
<td>com.google.http-client:google-http-client-android:jar:1.26.0</td>
707+
<td>com.google.http-client:google-http-client-android:jar:${project.http.version}</td>
708708
<td>-</td>
709709
<td>-</td>
710710
<td>-</td></tr>
711711
<tr class="b">
712-
<td>com.google.http-client:google-http-client-jackson2:jar:1.26.0</td>
712+
<td>com.google.http-client:google-http-client-jackson2:jar:${project.http.version}</td>
713713
<td>-</td>
714714
<td>-</td>
715715
<td>-</td></tr>
@@ -719,7 +719,7 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
719719
<td>-</td>
720720
<td>-</td></tr>
721721
<tr class="b">
722-
<td>com.google.oauth-client:google-oauth-client:jar:1.26.0</td>
722+
<td>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version}</td>
723723
<td>-</td>
724724
<td>-</td>
725725
<td>-</td></tr>

0 commit comments

Comments
 (0)