Skip to content

Commit bc8a5aa

Browse files
elharochingor13
authored andcommitted
fix: remove vestigial, outdated protobuf dependencies from assembly docs (#409)
* remove vestigial, outdated protobuf dependencies * remove vestigial, outdated protobuf dependencies
1 parent 689f284 commit bc8a5aa

File tree

6 files changed

+0
-19
lines changed

6 files changed

+0
-19
lines changed

google-oauth-client-assembly/README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ The dependency structure and licenses for the different libraries can be found h
2727
* [google-http-client](dependencies/google-http-client-dependencies.html)
2828
* [google-http-client-android](dependencies/google-http-client-android-dependencies.html)
2929
* [google-http-client-appengine](dependencies/google-http-client-appengine-dependencies.html)
30-
* [google-http-client-protobuf](dependencies/google-http-client-protobuf-dependencies.html)
3130
* [google-http-client-gson](dependencies/google-http-client-gson-dependencies.html)
3231
* [google-http-client-jackson](dependencies/google-http-client-jackson-dependencies.html)
3332
* [google-http-client-jackson2](dependencies/google-http-client-jackson2-dependencies.html)
@@ -59,8 +58,6 @@ The following are the jars from the [libs](libs) folder needed for applications
5958
* google-oauth-client-${project.version}.jar
6059
* google-http-client-${project.http.version}.jar
6160
* jsr305-${project.jsr305.version}.jar
62-
* google-http-client-protobuf-${project.http.version}.jar (when using protobuf-java)
63-
* protobuf-java-${project.protobuf-java.version}.jar
6461
* google-http-client-gson-${project.http.version}.jar (when using GSON)
6562
* gson-${project.gson.version}.jar
6663
* google-http-client-jackson-${project.http.version}.jar (when using Jackson)

google-oauth-client-assembly/assembly.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,6 @@
5656
<outputDirectory>google-oauth-java-client/libs</outputDirectory>
5757
<filtered>true</filtered>
5858
</file>
59-
<file>
60-
<source>properties/google-http-client-protobuf.jar.properties</source>
61-
<destName>google-http-client-protobuf-${project.http.version}.jar.properties</destName>
62-
<outputDirectory>google-oauth-java-client/libs</outputDirectory>
63-
<filtered>true</filtered>
64-
</file>
6559
<file>
6660
<source>properties/google-http-client-xml.jar.properties</source>
6761
<destName>google-http-client-xml-${project.http.version}.jar.properties</destName>
@@ -80,12 +74,6 @@
8074
<outputDirectory>google-oauth-java-client/libs</outputDirectory>
8175
<filtered>true</filtered>
8276
</file>
83-
<file>
84-
<source>properties/protobuf-java.jar.properties</source>
85-
<destName>protobuf-java-${project.protobuf-java.version}.jar.properties</destName>
86-
<outputDirectory>google-oauth-java-client/libs</outputDirectory>
87-
<filtered>true</filtered>
88-
</file>
8977
<!-- dependencies.html files -->
9078
<file>
9179
<source>../google-oauth-client/target/site/dependencies.html</source>

google-oauth-client-assembly/classpath-include

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,5 @@
2020
<classpathentry kind="lib" path="libs/jackson-core-${project.jackson-core2.version}.jar" sourcepath="libs-sources/jackson-core-${project.jackson-core2.version}-sources.jar"/>
2121
<classpathentry kind="lib" path="libs/jdo2-api-${project.jdo2-api.version}.jar" sourcepath="libs-sources/jdo2-api-${project.jdo2-api.version}-sources.jar"/>
2222
<classpathentry kind="lib" path="libs/jsr305-${project.jsr305.version}.jar"/>
23-
<classpathentry kind="lib" path="libs/protobuf-java-${project.protobuf-java.version}.jar" sourcepath="libs-sources/protobuf-java-${project.protobuf-java.version}-sources.jar"/>
2423
<classpathentry kind="lib" path="libs/transaction-api-${project.transaction-api.version}.jar" sourcepath="libs-sources/transaction-api-${project.transaction-api.version}-sources.jar"/>
2524
<classpathentry kind="lib" path="libs/xpp3-${project.xpp3.version}.jar" sourcepath="libs-sources/xpp3-${project.xpp3.version}-sources.jar"/>

google-oauth-client-assembly/properties/google-http-client-protobuf.jar.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

google-oauth-client-assembly/properties/protobuf-java.jar.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,6 @@
450450
<project.jackson-core-asl.version>1.9.13</project.jackson-core-asl.version>
451451
<project.jackson-core2.version>2.9.6</project.jackson-core2.version>
452452
<project.jetty.version>8.2.0.v20160908</project.jetty.version>
453-
<project.protobuf-java.version>2.6.1</project.protobuf-java.version>
454453
<project.guava.version>28.1-android</project.guava.version>
455454
<project.xpp3.version>1.1.4c</project.xpp3.version>
456455
<project.commons-logging.version>1.1.1</project.commons-logging.version>

0 commit comments

Comments
 (0)