Skip to content

Commit 1c4cdf6

Browse files
committed
Fix third-party audit tasks on JDK 8
This one is interesting. The third party audit task runs inside the Gradle JVM. This means that if Gradle is started on JDK 8, the third party audit tasks will fail as a result of the changes to support building Elasticsearch with the JDK 9 compiler. This commit reverts the third party audit changes to support running this task when Gradle is started with JDK 8. Relates #28256
1 parent ee1dbba commit 1c4cdf6

File tree

3 files changed

+27
-14
lines changed

3 files changed

+27
-14
lines changed

plugins/discovery-ec2/build.gradle

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,16 @@ thirdPartyAudit.excludes = [
7575
'software.amazon.ion.system.IonSystemBuilder',
7676
'software.amazon.ion.system.IonTextWriterBuilder',
7777
'software.amazon.ion.system.IonWriterBuilder',
78-
'javax.xml.bind.DatatypeConverter',
79-
'javax.xml.bind.JAXBContext',
8078
'javax.servlet.ServletContextEvent',
8179
'javax.servlet.ServletContextListener',
8280
'org.apache.avalon.framework.logger.Logger',
8381
'org.apache.log.Hierarchy',
8482
'org.apache.log.Logger',
8583
]
84+
85+
if (JavaVersion.current() > JavaVersion.VERSION_1_8) {
86+
thirdPartyAudit.excludes += [
87+
'javax.xml.bind.DatatypeConverter',
88+
'javax.xml.bind.JAXBContext'
89+
]
90+
}

plugins/ingest-attachment/build.gradle

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -495,17 +495,6 @@ thirdPartyAudit.excludes = [
495495
'de.l3s.boilerpipe.document.TextDocument',
496496
'de.l3s.boilerpipe.extractors.DefaultExtractor',
497497
'de.l3s.boilerpipe.sax.BoilerpipeHTMLContentHandler',
498-
'javax.activation.ActivationDataFlavor',
499-
'javax.activation.CommandMap',
500-
'javax.activation.DataContentHandler',
501-
'javax.activation.DataHandler',
502-
'javax.activation.DataSource',
503-
'javax.activation.FileDataSource',
504-
'javax.activation.MailcapCommandMap',
505-
'javax.xml.bind.DatatypeConverter',
506-
'javax.xml.bind.JAXBContext',
507-
'javax.xml.bind.JAXBElement',
508-
'javax.xml.bind.Unmarshaller',
509498
'javax.mail.BodyPart',
510499
'javax.mail.Header',
511500
'javax.mail.Message$RecipientType',
@@ -2102,3 +2091,19 @@ thirdPartyAudit.excludes = [
21022091
'ucar.nc2.Variable',
21032092
'ucar.nc2.dataset.NetcdfDataset'
21042093
]
2094+
2095+
if (JavaVersion.current() > JavaVersion.VERSION_1_8) {
2096+
thirdPartyAudit.excludes += [
2097+
'javax.activation.ActivationDataFlavor',
2098+
'javax.activation.CommandMap',
2099+
'javax.activation.DataContentHandler',
2100+
'javax.activation.DataHandler',
2101+
'javax.activation.DataSource',
2102+
'javax.activation.FileDataSource',
2103+
'javax.activation.MailcapCommandMap',
2104+
'javax.xml.bind.DatatypeConverter',
2105+
'javax.xml.bind.JAXBContext',
2106+
'javax.xml.bind.JAXBElement',
2107+
'javax.xml.bind.Unmarshaller'
2108+
]
2109+
}

plugins/repository-hdfs/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,6 @@ thirdPartyAudit.excludes = [
353353
'io.netty.handler.stream.ChunkedWriteHandler',
354354
'io.netty.util.concurrent.GlobalEventExecutor',
355355
'io.netty.util.ReferenceCountUtil',
356-
'javax.xml.bind.annotation.adapters.HexBinaryAdapter',
357356
'javax.ws.rs.core.Context',
358357
'javax.ws.rs.core.MediaType',
359358
'javax.ws.rs.core.MultivaluedMap',
@@ -568,3 +567,7 @@ thirdPartyAudit.excludes = [
568567
'com.squareup.okhttp.Response',
569568
'com.squareup.okhttp.ResponseBody'
570569
]
570+
571+
if (JavaVersion.current() > JavaVersion.VERSION_1_8) {
572+
thirdPartyAudit.excludes += ['javax.xml.bind.annotation.adapters.HexBinaryAdapter']
573+
}

0 commit comments

Comments
 (0)