From 42138007db45fee85558a19ca8702e944ec706fd Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Wed, 16 Dec 2015 18:56:02 -0500 Subject: [PATCH] add some more comments about internal api usage --- .../gradle/precommit/ThirdPartyAuditTask.groovy | 4 ---- core/build.gradle | 2 +- modules/lang-groovy/build.gradle | 2 +- plugins/discovery-azure/build.gradle | 4 ++-- plugins/discovery-ec2/build.gradle | 6 +++--- plugins/lang-python/build.gradle | 8 ++++---- plugins/mapper-attachments/build.gradle | 2 +- plugins/repository-s3/build.gradle | 6 +++--- qa/evil-tests/build.gradle | 2 +- 9 files changed, 16 insertions(+), 20 deletions(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/ThirdPartyAuditTask.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/ThirdPartyAuditTask.groovy index 010b19675d171..86ac767d06c67 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/ThirdPartyAuditTask.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/ThirdPartyAuditTask.groovy @@ -26,9 +26,6 @@ import org.gradle.api.tasks.TaskAction import org.apache.tools.ant.BuildLogger import org.apache.tools.ant.Project -import org.slf4j.Logger -import org.slf4j.LoggerFactory - /** * Basic static checking to keep tabs on third party JARs */ @@ -119,7 +116,6 @@ public class ThirdPartyAuditTask extends DefaultTask { for (File jar : jars) { names.add(jar.getName()) } - Logger logger = LoggerFactory.getLogger(getClass()); logger.error("[thirdPartyAudit] Scanning: " + names) // warn that you won't see any forbidden apis warnings diff --git a/core/build.gradle b/core/build.gradle index e00164af972e1..302757ccc8b4e 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -115,7 +115,7 @@ forbiddenPatterns { thirdPartyAudit.lenient = true // uses internal sun ssl classes! thirdPartyAudit.excludes = [ - // sun.security.x509 (X509CertInfo, X509CertImpl, X500Name) + // uses internal java api: sun.security.x509 (X509CertInfo, X509CertImpl, X500Name) 'org.jboss.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator', ] diff --git a/modules/lang-groovy/build.gradle b/modules/lang-groovy/build.gradle index 2bacd2dd56001..76686a760a220 100644 --- a/modules/lang-groovy/build.gradle +++ b/modules/lang-groovy/build.gradle @@ -39,7 +39,7 @@ integTest { // classes are missing, e.g. jline.console.completer.Completer thirdPartyAudit.lenient = true thirdPartyAudit.excludes = [ - // sun.misc.Unsafe + // uses internal java api: sun.misc.Unsafe 'groovy.json.internal.FastStringUtils', 'groovy.json.internal.FastStringUtils$StringImplementation$1', 'groovy.json.internal.FastStringUtils$StringImplementation$2', diff --git a/plugins/discovery-azure/build.gradle b/plugins/discovery-azure/build.gradle index e823351dc3662..6f21364ea6d57 100644 --- a/plugins/discovery-azure/build.gradle +++ b/plugins/discovery-azure/build.gradle @@ -71,9 +71,9 @@ thirdPartyAudit.lenient = true // WE ARE JAR HELLING WITH THE JDK AND THAT IS WHY THIS HAPPENS // TODO: fix this!!!!!!!!!!! thirdPartyAudit.excludes = [ - // com.sun.xml.fastinfoset.stax.StAXDocumentParser + // uses internal java api: com.sun.xml.fastinfoset.stax.StAXDocumentParser 'com.sun.xml.bind.v2.runtime.unmarshaller.FastInfosetConnector', 'com.sun.xml.bind.v2.runtime.unmarshaller.FastInfosetConnector$CharSequenceImpl', - // com.sun.xml.fastinfoset.stax.StAXDocumentSerializer + // uses internal java api: com.sun.xml.fastinfoset.stax.StAXDocumentSerializer 'com.sun.xml.bind.v2.runtime.output.FastInfosetStreamWriterOutput', ] diff --git a/plugins/discovery-ec2/build.gradle b/plugins/discovery-ec2/build.gradle index 04eafd07866ae..14767c6783bb7 100644 --- a/plugins/discovery-ec2/build.gradle +++ b/plugins/discovery-ec2/build.gradle @@ -52,8 +52,8 @@ test { // classes are missing, e.g. org.apache.avalon.framework.logger.Logger thirdPartyAudit.lenient = true thirdPartyAudit.excludes = [ - // com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl - // com.sun.org.apache.xml.internal.dtm.ref.DTMManagerDefault - // com.sun.org.apache.xpath.internal.XPathContext + // uses internal java api: com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl + // uses internal java api: com.sun.org.apache.xml.internal.dtm.ref.DTMManagerDefault + // uses internal java api: com.sun.org.apache.xpath.internal.XPathContext 'com.amazonaws.util.XpathUtils', ] diff --git a/plugins/lang-python/build.gradle b/plugins/lang-python/build.gradle index 0c5edc1352212..a7faedf6a78a4 100644 --- a/plugins/lang-python/build.gradle +++ b/plugins/lang-python/build.gradle @@ -39,17 +39,17 @@ integTest { // classes are missing, e.g. org.tukaani.xz.FilterOptions thirdPartyAudit.lenient = true thirdPartyAudit.excludes = [ - // sun.security.x509 (X509CertInfo, X509CertImpl, X500Name) + // uses internal java api: sun.security.x509 (X509CertInfo, X509CertImpl, X500Name) 'org.python.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator', - // sun.misc.Cleaner + // uses internal java api: sun.misc.Cleaner 'org.python.netty.util.internal.Cleaner0', - // sun.misc.Signal + // uses internal java api: sun.misc.Signal 'jnr.posix.JavaPOSIX', 'jnr.posix.JavaPOSIX$SunMiscSignalHandler', - // sun.misc.Unsafe + // uses internal java api: sun.misc.Unsafe 'com.kenai.jffi.MemoryIO$UnsafeImpl', 'com.kenai.jffi.MemoryIO$UnsafeImpl32', 'com.kenai.jffi.MemoryIO$UnsafeImpl64', diff --git a/plugins/mapper-attachments/build.gradle b/plugins/mapper-attachments/build.gradle index 867b316fbf579..f3c414a0718ce 100644 --- a/plugins/mapper-attachments/build.gradle +++ b/plugins/mapper-attachments/build.gradle @@ -73,6 +73,6 @@ forbiddenPatterns { // classes are missing, e.g. org.openxmlformats.schemas.drawingml.x2006.chart.CTExtensionList thirdPartyAudit.lenient = true thirdPartyAudit.excludes = [ - // com.sun.syndication (SyndFeedInput, SyndFeed, SyndEntry, SyndContent) + // uses internal java api: com.sun.syndication (SyndFeedInput, SyndFeed, SyndEntry, SyndContent) 'org.apache.tika.parser.feed.FeedParser', ] diff --git a/plugins/repository-s3/build.gradle b/plugins/repository-s3/build.gradle index bd38e92f4c808..82797788f8e8c 100644 --- a/plugins/repository-s3/build.gradle +++ b/plugins/repository-s3/build.gradle @@ -53,8 +53,8 @@ test { // classes are missing, e.g. org.apache.log.Logger thirdPartyAudit.lenient = true thirdPartyAudit.excludes = [ - // com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl - // com.sun.org.apache.xml.internal.dtm.ref.DTMManagerDefault - // com.sun.org.apache.xpath.internal.XPathContext + // uses internal java api: com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl + // uses internal java api: com.sun.org.apache.xml.internal.dtm.ref.DTMManagerDefault + // uses internal java api: com.sun.org.apache.xpath.internal.XPathContext 'com.amazonaws.util.XpathUtils', ] diff --git a/qa/evil-tests/build.gradle b/qa/evil-tests/build.gradle index bb5a521e53cba..02ed75fccbba1 100644 --- a/qa/evil-tests/build.gradle +++ b/qa/evil-tests/build.gradle @@ -38,7 +38,7 @@ test { // classes are missing, com.ibm.icu.lang.UCharacter thirdPartyAudit.lenient = true thirdPartyAudit.excludes = [ - // sun.misc.Unsafe + // uses internal java api: sun.misc.Unsafe 'com.google.common.cache.Striped64', 'com.google.common.cache.Striped64$1', 'com.google.common.cache.Striped64$Cell',