You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2019/04/02 16:47:39 UTC
[lucene-solr] branch jira/LUCENE-8738 updated: LUCENE-8738: Make
nightly-smoke pass.
This is an automated email from the ASF dual-hosted git repository.
jpountz pushed a commit to branch jira/LUCENE-8738
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/jira/LUCENE-8738 by this push:
new d108edc LUCENE-8738: Make nightly-smoke pass.
d108edc is described below
commit d108edce57e6bdea4286721dd6ef1b8eef68ffd6
Author: Adrien Grand <jp...@gmail.com>
AuthorDate: Tue Apr 2 18:44:41 2019 +0200
LUCENE-8738: Make nightly-smoke pass.
---
dev-tools/scripts/checkJavaDocs.py | 2 +-
dev-tools/scripts/checkJavadocLinks.py | 11 +++++------
dev-tools/scripts/smokeTestRelease.py | 4 ++--
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/dev-tools/scripts/checkJavaDocs.py b/dev-tools/scripts/checkJavaDocs.py
index 355bbdd..39b1b77 100644
--- a/dev-tools/scripts/checkJavaDocs.py
+++ b/dev-tools/scripts/checkJavaDocs.py
@@ -276,7 +276,7 @@ def checkSummary(fullPath):
if lineLower.startswith('package ') or lineLower.startswith('<h1 title="package" '):
sawPackage = True
elif sawPackage:
- if lineLower.startswith('<table ') or lineLower.startswith('<b>see: ') or lineLower.startswith('<p>see:'):
+ if lineLower.startswith('<table ') or lineLower.startswith('<b>see: ') or lineLower.startswith('<p>see:') or lineLower.startswith('</main>'):
desc = ' '.join(desc)
desc = reMarkup.sub(' ', desc)
desc = desc.strip()
diff --git a/dev-tools/scripts/checkJavadocLinks.py b/dev-tools/scripts/checkJavadocLinks.py
index 8ae0f4c..5d07e27 100644
--- a/dev-tools/scripts/checkJavadocLinks.py
+++ b/dev-tools/scripts/checkJavadocLinks.py
@@ -44,6 +44,7 @@ class FindHyperlinks(HTMLParser):
if tag not in ('link', 'meta', 'frame', 'br', 'hr', 'p', 'li', 'img', 'col', 'a'):
self.stack.append(tag)
if tag == 'a':
+ id = None
name = None
href = None
for attName, attValue in attrs:
@@ -51,6 +52,8 @@ class FindHyperlinks(HTMLParser):
name = attValue
elif attName == 'href':
href = attValue
+ elif attName == 'id':
+ id = attValue
if name is not None:
assert href is None
@@ -72,12 +75,8 @@ class FindHyperlinks(HTMLParser):
assert name is None
href = href.strip()
self.links.append(urlparse.urljoin(self.baseURL, href))
- else:
- if self.baseURL.endswith('/AttributeSource.html'):
- # LUCENE-4010: AttributeSource's javadocs has an unescaped <A> generics!! Seems to be a javadocs bug... (fixed in Java 7)
- pass
- else:
- raise RuntimeError('couldn\'t find an href nor name in link in %s: only got these attrs: %s' % (self.baseURL, attrs))
+ elif id is None:
+ raise RuntimeError('couldn\'t find an href nor name in link in %s: only got these attrs: %s' % (self.baseURL, attrs))
def handle_endtag(self, tag):
if tag in ('link', 'meta', 'frame', 'br', 'hr', 'p', 'li', 'img', 'col', 'a'):
diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.py
index b08f92a..4e8b9bb 100644
--- a/dev-tools/scripts/smokeTestRelease.py
+++ b/dev-tools/scripts/smokeTestRelease.py
@@ -699,12 +699,12 @@ def verifyUnpacked(java, project, artifact, unpackPath, gitRevision, version, te
java.run_java11(validateCmd, '%s/validate.log' % unpackPath)
if project == 'lucene':
- print(" run tests w/ Java 8 and testArgs='%s'..." % testArgs)
+ print(" run tests w/ Java 11 and testArgs='%s'..." % testArgs)
java.run_java11('ant clean test %s' % testArgs, '%s/test.log' % unpackPath)
java.run_java11('ant jar', '%s/compile.log' % unpackPath)
testDemo(java.run_java11, isSrc, version, '11')
- print(' generate javadocs w/ Java 8...')
+ print(' generate javadocs w/ Java 11...')
java.run_java11('ant javadocs', '%s/javadocs.log' % unpackPath)
checkJavadocpathFull('%s/build/docs' % unpackPath)