Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

deps: remove vestigial, outdated protobuf dependencies #409

Merged
merged 2 commits into from Dec 30, 2019
Merged

deps: remove vestigial, outdated protobuf dependencies #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff5c5c3
remove vestigial, outdated protobuf dependencies
Dec 30, 2019
633e541
remove vestigial, outdated protobuf dependencies
Dec 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions google-oauth-client-assembly/README.md
View file
Open in desktop
Expand Up @@ -27,7 +27,6 @@ The dependency structure and licenses for the different libraries can be found h
* [google-http-client](dependencies/google-http-client-dependencies.html)
* [google-http-client-android](dependencies/google-http-client-android-dependencies.html)
* [google-http-client-appengine](dependencies/google-http-client-appengine-dependencies.html)
* [google-http-client-protobuf](dependencies/google-http-client-protobuf-dependencies.html)
* [google-http-client-gson](dependencies/google-http-client-gson-dependencies.html)
* [google-http-client-jackson](dependencies/google-http-client-jackson-dependencies.html)
* [google-http-client-jackson2](dependencies/google-http-client-jackson2-dependencies.html)
Expand Down Expand Up @@ -59,8 +58,6 @@ The following are the jars from the [libs](libs) folder needed for applications
* google-oauth-client-${project.version}.jar
* google-http-client-${project.http.version}.jar
* jsr305-${project.jsr305.version}.jar
* google-http-client-protobuf-${project.http.version}.jar (when using protobuf-java)
* protobuf-java-${project.protobuf-java.version}.jar
* google-http-client-gson-${project.http.version}.jar (when using GSON)
* gson-${project.gson.version}.jar
* google-http-client-jackson-${project.http.version}.jar (when using Jackson)
Expand Down
12 changes: 0 additions & 12 deletions google-oauth-client-assembly/assembly.xml
View file
Open in desktop
Expand Up @@ -56,12 +56,6 @@
<outputDirectory>google-oauth-java-client/libs</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>properties/google-http-client-protobuf.jar.properties</source>
<destName>google-http-client-protobuf-${project.http.version}.jar.properties</destName>
<outputDirectory>google-oauth-java-client/libs</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>properties/google-http-client-xml.jar.properties</source>
<destName>google-http-client-xml-${project.http.version}.jar.properties</destName>
Expand All @@ -80,12 +74,6 @@
<outputDirectory>google-oauth-java-client/libs</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>properties/protobuf-java.jar.properties</source>
<destName>protobuf-java-${project.protobuf-java.version}.jar.properties</destName>
<outputDirectory>google-oauth-java-client/libs</outputDirectory>
<filtered>true</filtered>
</file>
<!-- dependencies.html files -->
<file>
<source>../google-oauth-client/target/site/dependencies.html</source>
Expand Down
1 change: 0 additions & 1 deletion google-oauth-client-assembly/classpath-include
View file
Open in desktop
Expand Up @@ -20,6 +20,5 @@
<classpathentry kind="lib" path="libs/jackson-core-${project.jackson-core2.version}.jar" sourcepath="libs-sources/jackson-core-${project.jackson-core2.version}-sources.jar"/>
<classpathentry kind="lib" path="libs/jdo2-api-${project.jdo2-api.version}.jar" sourcepath="libs-sources/jdo2-api-${project.jdo2-api.version}-sources.jar"/>
<classpathentry kind="lib" path="libs/jsr305-${project.jsr305.version}.jar"/>
<classpathentry kind="lib" path="libs/protobuf-java-${project.protobuf-java.version}.jar" sourcepath="libs-sources/protobuf-java-${project.protobuf-java.version}-sources.jar"/>
<classpathentry kind="lib" path="libs/transaction-api-${project.transaction-api.version}.jar" sourcepath="libs-sources/transaction-api-${project.transaction-api.version}-sources.jar"/>
<classpathentry kind="lib" path="libs/xpp3-${project.xpp3.version}.jar" sourcepath="libs-sources/xpp3-${project.xpp3.version}-sources.jar"/>
1 change: 0 additions & 1 deletion google-oauth-client-assembly/properties/google-http-client-protobuf.jar.properties
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion google-oauth-client-assembly/properties/protobuf-java.jar.properties
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion pom.xml
View file
Open in desktop
Expand Up @@ -450,7 +450,6 @@
<project.jackson-core-asl.version>1.9.13</project.jackson-core-asl.version>
<project.jackson-core2.version>2.9.6</project.jackson-core2.version>
<project.jetty.version>8.2.0.v20160908</project.jetty.version>
<project.protobuf-java.version>2.6.1</project.protobuf-java.version>
<project.guava.version>28.1-android</project.guava.version>
<project.xpp3.version>1.1.4c</project.xpp3.version>
<project.commons-logging.version>1.1.1</project.commons-logging.version>
Expand Down