Skip to content

Commit

Permalink
Remove redundant jackson dependencies from discovery-azure (#87898) (#…
Browse files Browse the repository at this point in the history
…87965)

The APIs that we use in azure-svc-mgmt-compute use the Apache HTTP client and the built-in Java XML parser, so it doesn't require Jersey JAXB bindings for databinding JSON/XML data to Java objects via old Jackson dependencies.
  • Loading branch information
arteam committed Jun 23, 2022
1 parent d77729a commit 2e8ca38
Show file tree
Hide file tree
Showing 12 changed files with 8 additions and 250 deletions.
5 changes: 5 additions & 0 deletions docs/changelog/87898.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 87898
summary: Remove redundant jackson dependencies from discovery-azure
area: Discovery-Plugins
type: enhancement
issues: []
26 changes: 3 additions & 23 deletions plugins/discovery-azure-classic/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,7 @@ dependencies {
api 'javax.inject:javax.inject:1'
api "com.sun.jersey:jersey-client:${localVersions.jersey}"
api "com.sun.jersey:jersey-core:${localVersions.jersey}"
api "com.sun.jersey:jersey-json:${localVersions.jersey}"
api 'org.codehaus.jettison:jettison:1.1'
api 'com.sun.xml.bind:jaxb-impl:2.2.3-1'
api 'org.codehaus.jackson:jackson-core-asl:1.9.2'
api 'org.codehaus.jackson:jackson-mapper-asl:1.9.2'
api 'org.codehaus.jackson:jackson-jaxrs:1.9.2'
api 'org.codehaus.jackson:jackson-xc:1.9.2'

// HACK: javax.xml.bind was removed from default modules in java 9, so we pull the api in here,
// and whitelist this hack in JarHell
Expand Down Expand Up @@ -117,22 +111,6 @@ tasks.named("thirdPartyAudit").configure {
'org.apache.log.Hierarchy',
'org.apache.log.Logger',
'javax.jms.Message',
'org.eclipse.persistence.descriptors.ClassDescriptor',
'org.eclipse.persistence.internal.oxm.MappingNodeValue',
'org.eclipse.persistence.internal.oxm.TreeObjectBuilder',
'org.eclipse.persistence.internal.oxm.XPathFragment',
'org.eclipse.persistence.internal.oxm.XPathNode',
'org.eclipse.persistence.internal.queries.ContainerPolicy',
'org.eclipse.persistence.jaxb.JAXBContext',
'org.eclipse.persistence.jaxb.JAXBHelper',
'org.eclipse.persistence.mappings.DatabaseMapping',
'org.eclipse.persistence.mappings.converters.TypeConversionConverter',
'org.eclipse.persistence.mappings.foundation.AbstractCompositeDirectCollectionMapping',
'org.eclipse.persistence.oxm.XMLContext',
'org.eclipse.persistence.oxm.XMLDescriptor',
'org.eclipse.persistence.oxm.XMLField',
'org.eclipse.persistence.oxm.mappings.XMLCompositeCollectionMapping',
'org.eclipse.persistence.sessions.DatabaseSession',
'org.jvnet.fastinfoset.VocabularyApplicationData',
'org.jvnet.staxex.Base64Data',
'org.jvnet.staxex.XMLStreamReaderEx',
Expand All @@ -143,6 +121,8 @@ tasks.named("thirdPartyAudit").configure {
'org.osgi.framework.BundleEvent',
'org.osgi.framework.SynchronousBundleListener',
'com.sun.xml.fastinfoset.stax.StAXDocumentParser',
'com.sun.xml.fastinfoset.stax.StAXDocumentSerializer'
'com.sun.xml.fastinfoset.stax.StAXDocumentSerializer',
'org.codehaus.jackson.JsonNode',
'org.codehaus.jackson.map.ObjectMapper',
)
}
8 changes: 0 additions & 8 deletions plugins/discovery-azure-classic/licenses/jackson-LICENSE

This file was deleted.

20 changes: 0 additions & 20 deletions plugins/discovery-azure-classic/licenses/jackson-NOTICE

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

192 changes: 0 additions & 192 deletions plugins/discovery-azure-classic/licenses/jettison-LICENSE.txt

This file was deleted.

This file was deleted.

0 comments on commit 2e8ca38

Please sign in to comment.