Skip to content

Commit 6941976

Browse files
authored
[7.17] Remove redundant jackson dependencies from discovery-azure (#87898) (#87970)
Backports #87898 to 7.17 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.
1 parent 0a75526 commit 6941976

12 files changed

+8
-250
lines changed

docs/changelog/87898.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 87898
2+
summary: Remove redundant jackson dependencies from discovery-azure
3+
area: Discovery-Plugins
4+
type: enhancement
5+
issues: []

plugins/discovery-azure-classic/build.gradle

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,7 @@ dependencies {
3535
api 'javax.inject:javax.inject:1'
3636
api "com.sun.jersey:jersey-client:${versions.jersey}"
3737
api "com.sun.jersey:jersey-core:${versions.jersey}"
38-
api "com.sun.jersey:jersey-json:${versions.jersey}"
39-
api 'org.codehaus.jettison:jettison:1.1'
4038
api 'com.sun.xml.bind:jaxb-impl:2.2.3-1'
41-
api 'org.codehaus.jackson:jackson-core-asl:1.9.2'
42-
api 'org.codehaus.jackson:jackson-mapper-asl:1.9.2'
43-
api 'org.codehaus.jackson:jackson-jaxrs:1.9.2'
44-
api 'org.codehaus.jackson:jackson-xc:1.9.2'
4539

4640
// HACK: javax.xml.bind was removed from default modules in java 9, so we pull the api in here,
4741
// and whitelist this hack in JarHell
@@ -108,22 +102,6 @@ tasks.named("thirdPartyAudit").configure {
108102
'org.apache.avalon.framework.logger.Logger',
109103
'org.apache.log.Hierarchy',
110104
'org.apache.log.Logger',
111-
'org.eclipse.persistence.descriptors.ClassDescriptor',
112-
'org.eclipse.persistence.internal.oxm.MappingNodeValue',
113-
'org.eclipse.persistence.internal.oxm.TreeObjectBuilder',
114-
'org.eclipse.persistence.internal.oxm.XPathFragment',
115-
'org.eclipse.persistence.internal.oxm.XPathNode',
116-
'org.eclipse.persistence.internal.queries.ContainerPolicy',
117-
'org.eclipse.persistence.jaxb.JAXBContext',
118-
'org.eclipse.persistence.jaxb.JAXBHelper',
119-
'org.eclipse.persistence.mappings.DatabaseMapping',
120-
'org.eclipse.persistence.mappings.converters.TypeConversionConverter',
121-
'org.eclipse.persistence.mappings.foundation.AbstractCompositeDirectCollectionMapping',
122-
'org.eclipse.persistence.oxm.XMLContext',
123-
'org.eclipse.persistence.oxm.XMLDescriptor',
124-
'org.eclipse.persistence.oxm.XMLField',
125-
'org.eclipse.persistence.oxm.mappings.XMLCompositeCollectionMapping',
126-
'org.eclipse.persistence.sessions.DatabaseSession',
127105
'org.jvnet.fastinfoset.VocabularyApplicationData',
128106
'org.jvnet.staxex.Base64Data',
129107
'org.jvnet.staxex.XMLStreamReaderEx',
@@ -134,7 +112,9 @@ tasks.named("thirdPartyAudit").configure {
134112
'org.osgi.framework.BundleEvent',
135113
'org.osgi.framework.SynchronousBundleListener',
136114
'com.sun.xml.fastinfoset.stax.StAXDocumentParser',
137-
'com.sun.xml.fastinfoset.stax.StAXDocumentSerializer'
115+
'com.sun.xml.fastinfoset.stax.StAXDocumentSerializer',
116+
'org.codehaus.jackson.JsonNode',
117+
'org.codehaus.jackson.map.ObjectMapper',
138118
)
139119

140120
// jarhell with jdk (intentionally, because jaxb was removed from default modules in java 9)

plugins/discovery-azure-classic/licenses/jackson-LICENSE

Lines changed: 0 additions & 8 deletions
This file was deleted.

plugins/discovery-azure-classic/licenses/jackson-NOTICE

Lines changed: 0 additions & 20 deletions
This file was deleted.

plugins/discovery-azure-classic/licenses/jackson-core-asl-1.9.2.jar.sha1

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

plugins/discovery-azure-classic/licenses/jackson-jaxrs-1.9.2.jar.sha1

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

plugins/discovery-azure-classic/licenses/jackson-mapper-asl-1.9.2.jar.sha1

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

plugins/discovery-azure-classic/licenses/jackson-xc-1.9.2.jar.sha1

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

plugins/discovery-azure-classic/licenses/jersey-json-1.13.jar.sha1

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

plugins/discovery-azure-classic/licenses/jettison-1.1.jar.sha1

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

0 commit comments

Comments
 (0)