Skip to content

Commit 6b35c7c

Browse files
dependabot[bot]sandeshkr419
dependabot[bot]
and
sandeshkr419
authored
Bump com.sun.xml.bind:jaxb-impl from 2.2.3-1 to 4.0.6 in /plugins/discovery-azure-classic (#19472)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sandesh Kumar <[email protected]>
1 parent 72e9768 commit 6b35c7c

File tree

4 files changed

+211
-66
lines changed

4 files changed

+211
-66
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
6969
- Bump `gradle/actions` from 4 to 5 ([#19781](https://github.com/opensearch-project/OpenSearch/pull/19781))
7070
- Bump org.bouncycastle:bc-fips from 2.1.1 to 2.1.2 ([#19818](https://github.com/opensearch-project/OpenSearch/pull/19818))
7171
- Bump `com.google.http-client:google-http-client-gson` from 1.47.1 to 2.0.0 ([#19253](https://github.com/opensearch-project/OpenSearch/pull/19253))
72+
- Bump `com.sun.xml.bind:jaxb-impl` from 2.2.3-1 to 4.0.6 ([#19472](https://github.com/opensearch-project/OpenSearch/pull/19472))
7273

7374
### Deprecated
7475
- Deprecated existing constructors in ThreadPoolStats.Stats in favor of the new Builder ([#19317](https://github.com/opensearch-project/OpenSearch/pull/19317))

‎plugins/discovery-azure-classic/build.gradle‎

Lines changed: 209 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ dependencies {
6060
api "com.sun.jersey:jersey-core:${versions.jersey}"
6161
api "com.sun.jersey:jersey-json:${versions.jersey}"
6262
api "org.codehaus.jettison:jettison:${versions.jettison}"
63-
api 'com.sun.xml.bind:jaxb-impl:2.2.3-1'
63+
api 'com.sun.xml.bind:jaxb-impl:4.0.6'
6464

6565
// HACK: javax.xml.bind was removed from default modules in java 9, so we pull the api in here,
6666
// and allowlist this hack in JarHell
@@ -122,62 +122,208 @@ tasks.named("dependencyLicenses").configure {
122122
tasks.named("thirdPartyAudit").configure {
123123

124124
ignoreMissingClasses(
125-
'javax.jms.Message',
126-
'javax.servlet.ServletContextEvent',
127-
'javax.servlet.ServletContextListener',
128-
'org.apache.avalon.framework.logger.Logger',
129-
'org.apache.commons.lang.StringUtils',
130-
'org.apache.log.Hierarchy',
131-
'org.apache.log.Logger',
132-
'org.eclipse.persistence.descriptors.ClassDescriptor',
133-
'org.eclipse.persistence.internal.oxm.MappingNodeValue',
134-
'org.eclipse.persistence.internal.oxm.TreeObjectBuilder',
135-
'org.eclipse.persistence.internal.oxm.XPathFragment',
136-
'org.eclipse.persistence.internal.oxm.XPathNode',
137-
'org.eclipse.persistence.internal.queries.ContainerPolicy',
138-
'org.eclipse.persistence.jaxb.JAXBContext',
139-
'org.eclipse.persistence.jaxb.JAXBHelper',
140-
'org.eclipse.persistence.mappings.DatabaseMapping',
141-
'org.eclipse.persistence.mappings.converters.TypeConversionConverter',
142-
'org.eclipse.persistence.mappings.foundation.AbstractCompositeDirectCollectionMapping',
143-
'org.eclipse.persistence.oxm.XMLContext',
144-
'org.eclipse.persistence.oxm.XMLDescriptor',
145-
'org.eclipse.persistence.oxm.XMLField',
146-
'org.eclipse.persistence.oxm.mappings.XMLCompositeCollectionMapping',
147-
'org.eclipse.persistence.sessions.DatabaseSession',
148-
'org.jvnet.fastinfoset.VocabularyApplicationData',
149-
'org.jvnet.staxex.Base64Data',
150-
'org.jvnet.staxex.XMLStreamReaderEx',
151-
'org.jvnet.staxex.XMLStreamWriterEx',
152-
'org.osgi.framework.Bundle',
153-
'org.osgi.framework.BundleActivator',
154-
'org.osgi.framework.BundleContext',
155-
'org.osgi.framework.BundleEvent',
156-
'org.osgi.framework.SynchronousBundleListener',
157-
'com.sun.xml.fastinfoset.stax.StAXDocumentParser',
158-
'com.sun.xml.fastinfoset.stax.StAXDocumentSerializer',
159-
'org.codehaus.jackson.Base64Variant',
160-
'org.codehaus.jackson.JsonEncoding',
161-
'org.codehaus.jackson.JsonFactory',
162-
'org.codehaus.jackson.JsonGenerator',
163-
'org.codehaus.jackson.JsonGenerator$Feature',
164-
'org.codehaus.jackson.JsonLocation',
165-
'org.codehaus.jackson.JsonNode',
166-
'org.codehaus.jackson.JsonParser',
167-
'org.codehaus.jackson.JsonParser$Feature',
168-
'org.codehaus.jackson.JsonParser$NumberType',
169-
'org.codehaus.jackson.JsonStreamContext',
170-
'org.codehaus.jackson.JsonToken',
171-
'org.codehaus.jackson.ObjectCodec',
172-
'org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider',
173-
'org.codehaus.jackson.jaxrs.JacksonJsonProvider',
174-
'org.codehaus.jackson.map.JsonSerializableWithType',
175-
'org.codehaus.jackson.map.JsonSerializer',
176-
'org.codehaus.jackson.map.ObjectMapper',
177-
'org.codehaus.jackson.map.SerializerProvider',
178-
'org.codehaus.jackson.map.TypeSerializer',
179-
'org.codehaus.jackson.type.TypeReference'
180-
)
125+
'com.sun.istack.FinalArrayList',
126+
'com.sun.istack.Pool',
127+
'com.sun.istack.Pool$Impl',
128+
'com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo',
129+
'com.sun.xml.bind.v2.model.runtime.RuntimeReferencePropertyInfo',
130+
'com.sun.xml.bind.v2.runtime.XMLSerializer',
131+
'com.sun.xml.bind.v2.runtime.property.Property',
132+
'com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext',
133+
'com.sun.xml.fastinfoset.stax.StAXDocumentParser',
134+
'com.sun.xml.fastinfoset.stax.StAXDocumentSerializer',
135+
'com.sun.xml.txw2.TXW',
136+
'com.sun.xml.txw2.TxwException',
137+
'com.sun.xml.txw2.TypedXmlWriter',
138+
'com.sun.xml.txw2.output.ResultFactory',
139+
'com.sun.xml.txw2.output.XmlSerializer',
140+
'jakarta.activation.DataHandler',
141+
'jakarta.activation.DataSource',
142+
'jakarta.activation.MimeType',
143+
'jakarta.activation.MimeTypeParseException',
144+
'jakarta.xml.bind.Binder',
145+
'jakarta.xml.bind.DatatypeConverter',
146+
'jakarta.xml.bind.DatatypeConverterInterface',
147+
'jakarta.xml.bind.JAXBContext',
148+
'jakarta.xml.bind.JAXBContextFactory',
149+
'jakarta.xml.bind.JAXBElement',
150+
'jakarta.xml.bind.JAXBElement$GlobalScope',
151+
'jakarta.xml.bind.JAXBException',
152+
'jakarta.xml.bind.JAXBIntrospector',
153+
'jakarta.xml.bind.MarshalException',
154+
'jakarta.xml.bind.Marshaller',
155+
'jakarta.xml.bind.Marshaller$Listener',
156+
'jakarta.xml.bind.PropertyException',
157+
'jakarta.xml.bind.SchemaOutputResolver',
158+
'jakarta.xml.bind.UnmarshalException',
159+
'jakarta.xml.bind.Unmarshaller',
160+
'jakarta.xml.bind.Unmarshaller$Listener',
161+
'jakarta.xml.bind.UnmarshallerHandler',
162+
'jakarta.xml.bind.ValidationEvent',
163+
'jakarta.xml.bind.ValidationEventHandler',
164+
'jakarta.xml.bind.ValidationEventLocator',
165+
'jakarta.xml.bind.annotation.DomHandler',
166+
'jakarta.xml.bind.annotation.W3CDomHandler',
167+
'jakarta.xml.bind.annotation.XmlAccessOrder',
168+
'jakarta.xml.bind.annotation.XmlAccessType',
169+
'jakarta.xml.bind.annotation.XmlAccessorOrder',
170+
'jakarta.xml.bind.annotation.XmlAccessorType',
171+
'jakarta.xml.bind.annotation.XmlAnyAttribute',
172+
'jakarta.xml.bind.annotation.XmlAnyElement',
173+
'jakarta.xml.bind.annotation.XmlAttachmentRef',
174+
'jakarta.xml.bind.annotation.XmlAttribute',
175+
'jakarta.xml.bind.annotation.XmlElement',
176+
'jakarta.xml.bind.annotation.XmlElement$DEFAULT',
177+
'jakarta.xml.bind.annotation.XmlElementDecl',
178+
'jakarta.xml.bind.annotation.XmlElementDecl$GLOBAL',
179+
'jakarta.xml.bind.annotation.XmlElementRef',
180+
'jakarta.xml.bind.annotation.XmlElementRef$DEFAULT',
181+
'jakarta.xml.bind.annotation.XmlElementRefs',
182+
'jakarta.xml.bind.annotation.XmlElementWrapper',
183+
'jakarta.xml.bind.annotation.XmlElements',
184+
'jakarta.xml.bind.annotation.XmlEnum',
185+
'jakarta.xml.bind.annotation.XmlEnumValue',
186+
'jakarta.xml.bind.annotation.XmlID',
187+
'jakarta.xml.bind.annotation.XmlIDREF',
188+
'jakarta.xml.bind.annotation.XmlInlineBinaryData',
189+
'jakarta.xml.bind.annotation.XmlList',
190+
'jakarta.xml.bind.annotation.XmlMimeType',
191+
'jakarta.xml.bind.annotation.XmlMixed',
192+
'jakarta.xml.bind.annotation.XmlNs',
193+
'jakarta.xml.bind.annotation.XmlNsForm',
194+
'jakarta.xml.bind.annotation.XmlRegistry',
195+
'jakarta.xml.bind.annotation.XmlRootElement',
196+
'jakarta.xml.bind.annotation.XmlSchema',
197+
'jakarta.xml.bind.annotation.XmlSchemaType',
198+
'jakarta.xml.bind.annotation.XmlSchemaTypes',
199+
'jakarta.xml.bind.annotation.XmlSeeAlso',
200+
'jakarta.xml.bind.annotation.XmlTransient',
201+
'jakarta.xml.bind.annotation.XmlType',
202+
'jakarta.xml.bind.annotation.XmlType$DEFAULT',
203+
'jakarta.xml.bind.annotation.XmlValue',
204+
'jakarta.xml.bind.annotation.adapters.XmlAdapter',
205+
'jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter',
206+
'jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters',
207+
'jakarta.xml.bind.attachment.AttachmentMarshaller',
208+
'jakarta.xml.bind.attachment.AttachmentUnmarshaller',
209+
'jakarta.xml.bind.helpers.AbstractMarshallerImpl',
210+
'jakarta.xml.bind.helpers.AbstractUnmarshallerImpl',
211+
'jakarta.xml.bind.helpers.ValidationEventImpl',
212+
'jakarta.xml.bind.helpers.ValidationEventLocatorImpl',
213+
'javax.jms.Message',
214+
'javax.servlet.ServletContextEvent',
215+
'javax.servlet.ServletContextListener',
216+
'org.apache.avalon.framework.logger.Logger',
217+
'org.apache.commons.lang.StringUtils',
218+
'org.apache.log.Hierarchy',
219+
'org.apache.log.Logger',
220+
'org.codehaus.jackson.Base64Variant',
221+
'org.codehaus.jackson.JsonEncoding',
222+
'org.codehaus.jackson.JsonFactory',
223+
'org.codehaus.jackson.JsonGenerator',
224+
'org.codehaus.jackson.JsonGenerator$Feature',
225+
'org.codehaus.jackson.JsonLocation',
226+
'org.codehaus.jackson.JsonNode',
227+
'org.codehaus.jackson.JsonParser',
228+
'org.codehaus.jackson.JsonParser$Feature',
229+
'org.codehaus.jackson.JsonParser$NumberType',
230+
'org.codehaus.jackson.JsonStreamContext',
231+
'org.codehaus.jackson.JsonToken',
232+
'org.codehaus.jackson.ObjectCodec',
233+
'org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider',
234+
'org.codehaus.jackson.jaxrs.JacksonJsonProvider',
235+
'org.codehaus.jackson.map.JsonSerializableWithType',
236+
'org.codehaus.jackson.map.JsonSerializer',
237+
'org.codehaus.jackson.map.ObjectMapper',
238+
'org.codehaus.jackson.map.SerializerProvider',
239+
'org.codehaus.jackson.map.TypeSerializer',
240+
'org.codehaus.jackson.type.TypeReference',
241+
'org.eclipse.persistence.descriptors.ClassDescriptor',
242+
'org.eclipse.persistence.internal.oxm.MappingNodeValue',
243+
'org.eclipse.persistence.internal.oxm.TreeObjectBuilder',
244+
'org.eclipse.persistence.internal.oxm.XPathFragment',
245+
'org.eclipse.persistence.internal.oxm.XPathNode',
246+
'org.eclipse.persistence.internal.queries.ContainerPolicy',
247+
'org.eclipse.persistence.jaxb.JAXBContext',
248+
'org.eclipse.persistence.jaxb.JAXBHelper',
249+
'org.eclipse.persistence.mappings.DatabaseMapping',
250+
'org.eclipse.persistence.mappings.converters.TypeConversionConverter',
251+
'org.eclipse.persistence.mappings.foundation.AbstractCompositeDirectCollectionMapping',
252+
'org.eclipse.persistence.oxm.XMLContext',
253+
'org.eclipse.persistence.oxm.XMLDescriptor',
254+
'org.eclipse.persistence.oxm.XMLField',
255+
'org.eclipse.persistence.oxm.mappings.XMLCompositeCollectionMapping',
256+
'org.eclipse.persistence.sessions.DatabaseSession',
257+
'org.glassfish.jaxb.core.Utils',
258+
'org.glassfish.jaxb.core.WhiteSpaceProcessor',
259+
'org.glassfish.jaxb.core.annotation.OverrideAnnotationOf',
260+
'org.glassfish.jaxb.core.annotation.XmlLocation',
261+
'org.glassfish.jaxb.core.api.ErrorListener',
262+
'org.glassfish.jaxb.core.api.impl.NameConverter',
263+
'org.glassfish.jaxb.core.marshaller.CharacterEscapeHandler',
264+
'org.glassfish.jaxb.core.marshaller.DataWriter',
265+
'org.glassfish.jaxb.core.marshaller.DumbEscapeHandler',
266+
'org.glassfish.jaxb.core.marshaller.MinimumEscapeHandler',
267+
'org.glassfish.jaxb.core.marshaller.NoEscapeHandler',
268+
'org.glassfish.jaxb.core.marshaller.SAX2DOMEx',
269+
'org.glassfish.jaxb.core.marshaller.XMLWriter',
270+
'org.glassfish.jaxb.core.unmarshaller.DOMScanner',
271+
'org.glassfish.jaxb.core.unmarshaller.InfosetScanner',
272+
'org.glassfish.jaxb.core.util.Which',
273+
'org.glassfish.jaxb.core.v2.ClassFactory',
274+
'org.glassfish.jaxb.core.v2.Messages',
275+
'org.glassfish.jaxb.core.v2.TODO',
276+
'org.glassfish.jaxb.core.v2.model.annotation.AnnotationReader',
277+
'org.glassfish.jaxb.core.v2.model.annotation.AnnotationSource',
278+
'org.glassfish.jaxb.core.v2.model.annotation.Locatable',
279+
'org.glassfish.jaxb.core.v2.model.core.Adapter',
280+
'org.glassfish.jaxb.core.v2.model.core.ArrayInfo',
281+
'org.glassfish.jaxb.core.v2.model.core.AttributePropertyInfo',
282+
'org.glassfish.jaxb.core.v2.model.core.BuiltinLeafInfo',
283+
'org.glassfish.jaxb.core.v2.model.core.ClassInfo',
284+
'org.glassfish.jaxb.core.v2.model.core.Element',
285+
'org.glassfish.jaxb.core.v2.model.core.ElementInfo',
286+
'org.glassfish.jaxb.core.v2.model.core.ElementPropertyInfo',
287+
'org.glassfish.jaxb.core.v2.model.core.EnumConstant',
288+
'org.glassfish.jaxb.core.v2.model.core.EnumLeafInfo',
289+
'org.glassfish.jaxb.core.v2.model.core.ErrorHandler',
290+
'org.glassfish.jaxb.core.v2.model.core.ID',
291+
'org.glassfish.jaxb.core.v2.model.core.LeafInfo',
292+
'org.glassfish.jaxb.core.v2.model.core.MapPropertyInfo',
293+
'org.glassfish.jaxb.core.v2.model.core.NonElement',
294+
'org.glassfish.jaxb.core.v2.model.core.NonElementRef',
295+
'org.glassfish.jaxb.core.v2.model.core.PropertyInfo',
296+
'org.glassfish.jaxb.core.v2.model.core.PropertyKind',
297+
'org.glassfish.jaxb.core.v2.model.core.Ref',
298+
'org.glassfish.jaxb.core.v2.model.core.ReferencePropertyInfo',
299+
'org.glassfish.jaxb.core.v2.model.core.RegistryInfo',
300+
'org.glassfish.jaxb.core.v2.model.core.TypeInfo',
301+
'org.glassfish.jaxb.core.v2.model.core.TypeInfoSet',
302+
'org.glassfish.jaxb.core.v2.model.core.TypeRef',
303+
'org.glassfish.jaxb.core.v2.model.core.ValuePropertyInfo',
304+
'org.glassfish.jaxb.core.v2.model.core.WildcardMode',
305+
'org.glassfish.jaxb.core.v2.model.impl.ModelBuilderI',
306+
'org.glassfish.jaxb.core.v2.model.nav.Navigator',
307+
'org.glassfish.jaxb.core.v2.model.util.ArrayInfoUtil',
308+
'org.glassfish.jaxb.core.v2.runtime.IllegalAnnotationException',
309+
'org.glassfish.jaxb.core.v2.runtime.Location',
310+
'org.glassfish.jaxb.core.v2.runtime.RuntimeUtil',
311+
'org.glassfish.jaxb.core.v2.runtime.unmarshaller.LocatorEx',
312+
'org.glassfish.jaxb.core.v2.schemagen.episode.Bindings',
313+
'org.glassfish.jaxb.core.v2.schemagen.episode.Klass',
314+
'org.glassfish.jaxb.core.v2.schemagen.episode.SchemaBindings',
315+
'org.glassfish.jaxb.core.v2.util.EditDistance',
316+
'org.glassfish.jaxb.core.v2.util.XmlFactory',
317+
'org.jvnet.fastinfoset.VocabularyApplicationData',
318+
'org.jvnet.staxex.Base64Data',
319+
'org.jvnet.staxex.XMLStreamReaderEx',
320+
'org.jvnet.staxex.XMLStreamWriterEx',
321+
'org.osgi.framework.Bundle',
322+
'org.osgi.framework.BundleActivator',
323+
'org.osgi.framework.BundleContext',
324+
'org.osgi.framework.BundleEvent',
325+
'org.osgi.framework.SynchronousBundleListener'
326+
)
181327

182328
// jarhell with jdk (intentionally, because jaxb was removed from default modules in java 9)
183329
if (BuildParams.runtimeJavaVersion <= JavaVersion.VERSION_1_8) {
@@ -286,14 +432,12 @@ if (BuildParams.runtimeJavaVersion <= JavaVersion.VERSION_1_8) {
286432
)
287433
} else {
288434
ignoreMissingClasses(
289-
'javax.activation.ActivationDataFlavor',
290-
'javax.activation.DataContentHandler',
291-
'javax.activation.DataHandler',
292-
'javax.activation.DataSource',
293-
'javax.activation.FileDataSource',
294-
'javax.activation.FileTypeMap',
295-
'javax.activation.MimeType',
296-
'javax.activation.MimeTypeParseException',
435+
'javax.activation.ActivationDataFlavor',
436+
'javax.activation.DataContentHandler',
437+
'javax.activation.DataHandler',
438+
'javax.activation.DataSource',
439+
'javax.activation.FileDataSource',
440+
'javax.activation.FileTypeMap'
297441
)
298442
}
299443
}

‎plugins/discovery-azure-classic/licenses/jaxb-impl-2.2.3-1.jar.sha1‎

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

‎plugins/discovery-azure-classic/licenses/jaxb-impl-4.0.6.jar.sha1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e81f27d58c769414bbc1ce88ddfb2cf822c8fa20

0 commit comments

Comments
 (0)