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

fix: remove Jackson from assembly #605

Merged
merged 1 commit into from Mar 29, 2021
Merged

fix: remove Jackson from assembly #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 0 additions & 6 deletions google-oauth-client-assembly/README.md
View file
Open in desktop
Expand Up @@ -28,8 +28,6 @@ The dependency structure and licenses for the different libraries can be found h
* [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-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)

## Maven Usage

Expand Down Expand Up @@ -60,10 +58,6 @@ The following are the jars from the [libs](libs) folder needed for applications
* jsr305-${project.jsr305.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)
* jackson-core-asl-${project.jackson-core-asl.version}.jar
* google-http-client-jackson2-${project.http.version}.jar (when using Jackson 2)
* jackson-core-${project.jackson-core2.version}.jar
* google-http-client-xml-${project.version}.jar (when using XML)
* xpp3-${project.xpp3.version}.jar (when NOT on Android)

Expand Down
12 changes: 0 additions & 12 deletions google-oauth-client-assembly/assembly.xml
View file
Open in desktop
Expand Up @@ -50,12 +50,6 @@
<outputDirectory>google-oauth-java-client/libs</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>properties/google-http-client-jackson2.jar.properties</source>
<destName>google-http-client-jackson2-${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 @@ -68,12 +62,6 @@
<outputDirectory>google-oauth-java-client/libs</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>properties/jackson-core.jar.properties</source>
<destName>jackson-core-${project.jackson-core2.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
4 changes: 0 additions & 4 deletions google-oauth-client-assembly/classpath-include
View file
Open in desktop
Expand Up @@ -8,16 +8,12 @@
<classpathentry kind="lib" path="libs/google-http-client-appengine-${project.http.version}.jar" sourcepath="libs-sources/google-http-client-appengine-${project.http.version}-sources.jar"/>
<classpathentry kind="lib" path="libs/google-http-client-protobuf-${project.http.version}.jar" sourcepath="libs-sources/google-http-client-protobuf-${project.http.version}-sources.jar"/>
<classpathentry kind="lib" path="libs/google-http-client-gson-${project.http.version}.jar" sourcepath="libs-sources/google-http-client-gson-${project.http.version}-sources.jar"/>
<classpathentry kind="lib" path="libs/google-http-client-jackson-${project.http.version}.jar" sourcepath="libs-sources/google-http-client-jackson-${project.http.version}-sources.jar"/>
<classpathentry kind="lib" path="libs/google-http-client-jackson2-${project.http.version}.jar" sourcepath="libs-sources/google-http-client-jackson2-${project.http.version}-sources.jar"/>
<classpathentry kind="lib" path="libs/google-http-client-jdo-${project.version}.jar" sourcepath="libs-sources/google-http-client-jdo-${project.version}-sources.jar"/>
<classpathentry kind="lib" path="libs/google-http-client-xml-${project.version}.jar" sourcepath="libs-sources/google-http-client-xml-${project.version}-sources.jar"/>
<classpathentry kind="lib" path="libs/commons-logging-${project.commons-logging.version}.jar" sourcepath="libs-sources/commons-logging-${project.commons-logging.version}-sources.jar"/>
<classpathentry kind="lib" path="libs/gson-${project.gson.version}.jar" sourcepath="libs-sources/gson-${project.gson.version}-sources.jar"/>
<classpathentry kind="lib" path="libs/httpclient-${project.httpclient.version}.jar" sourcepath="libs-sources/httpclient-${project.httpclient.version}-sources.jar"/>
<classpathentry kind="lib" path="libs/httpcore-${project.httpcore.version}.jar" sourcepath="libs-sources/httpcore-${project.httpcore.version}-sources.jar"/>
<classpathentry kind="lib" path="libs/jackson-core-asl-${project.jackson-core-asl.version}.jar" sourcepath="libs-sources/jackson-core-asl-${project.jackson-core-asl.version}-sources.jar"/>
<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/transaction-api-${project.transaction-api.version}.jar" sourcepath="libs-sources/transaction-api-${project.transaction-api.version}-sources.jar"/>
Expand Down