You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2018/02/09 18:57:15 UTC
[1/2] lucene-solr:master: LUCENE-8155: Add support for Java 9 in
smoke tester
Repository: lucene-solr
Updated Branches:
refs/heads/master 1a6d0f585 -> 7d3fccefe
LUCENE-8155: Add support for Java 9 in smoke tester
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/19386313
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/19386313
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/19386313
Branch: refs/heads/master
Commit: 193863130754d78baf36366f7a36125d76dd75b5
Parents: b6f683d
Author: Uwe Schindler <us...@apache.org>
Authored: Fri Feb 9 18:45:10 2018 +0100
Committer: Uwe Schindler <us...@apache.org>
Committed: Fri Feb 9 19:53:49 2018 +0100
----------------------------------------------------------------------
build.xml | 14 ++++++--
dev-tools/scripts/smokeTestRelease.py | 51 ++++++++++++++++++++++++++----
lucene/CHANGES.txt | 3 ++
3 files changed, 59 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/19386313/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 2d300b5..2346d54 100755
--- a/build.xml
+++ b/build.xml
@@ -603,13 +603,22 @@ File | Project Structure | Platform Settings | SDKs):
</subant>
</target>
- <target name="nightly-smoke" description="Builds an unsigned release and smoke tests it"
- depends="clean,resolve-groovy,resolve-markdown,install-maven-tasks">
+ <target name="-nightly-smoke-java9params" if="smokeTestRelease.java9">
+ <!-- convert path to UNIX style, so windows backslashes don't hurt escaping: -->
+ <pathconvert targetos="unix" property="-smokeTestRelease.java9params">
+ <regexpmapper from="^(.*)$" to="--test-java9 '\1'"/>
+ <path location="${smokeTestRelease.java9}"/>
+ </pathconvert>
+ </target>
+
+ <target name="nightly-smoke" description="Builds an unsigned release and smoke tests it (pass '-DsmokeTestRelease.java9=/path/to/jdk-9' to additionally test with Java 9 or later)"
+ depends="clean,resolve-groovy,resolve-markdown,install-maven-tasks,-nightly-smoke-java9params">
<fail message="To run nightly smoke, the JDK must be exactly Java 1.8, was: ${java.specification.version}">
<condition>
<not><equals arg1="${java.specification.version}" arg2="1.8"/></not>
</condition>
</fail>
+ <property name="-smokeTestRelease.java9params" value=""/><!-- (if not yet defined) -->
<exec executable="${python32.exe}" failonerror="true" taskname="python32">
<arg value="-V"/>
</exec>
@@ -634,6 +643,7 @@ File | Project Structure | Platform Settings | SDKs):
<!-- Tell Python not to write any bytecode cache into the filesystem: -->
<arg value="-B"/>
<arg file="dev-tools/scripts/smokeTestRelease.py"/>
+ <arg line="${-smokeTestRelease.java9params}"/>
<arg value="--revision"/>
<arg value="skip"/>
<!-- pass ${version.base} here to emulate a real release, without appendix like "-SNAPSHOT": -->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/19386313/dev-tools/scripts/smokeTestRelease.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.py
index b7ca972..df0fcfd 100644
--- a/dev-tools/scripts/smokeTestRelease.py
+++ b/dev-tools/scripts/smokeTestRelease.py
@@ -726,6 +726,16 @@ def verifyUnpacked(java, project, artifact, unpackPath, gitRevision, version, te
java.run_java8('ant javadocs', '%s/javadocs.log' % unpackPath)
checkJavadocpathFull('%s/build/docs' % unpackPath)
+ if java.run_java9:
+ print(" run tests w/ Java 9 and testArgs='%s'..." % testArgs)
+ java.run_java9('ant clean test %s' % testArgs, '%s/test.log' % unpackPath)
+ java.run_java9('ant jar', '%s/compile.log' % unpackPath)
+ testDemo(java.run_java9, isSrc, version, '9')
+
+ print(' generate javadocs w/ Java 9...')
+ java.run_java9('ant javadocs', '%s/javadocs.log' % unpackPath)
+ checkJavadocpathFull('%s/build/docs' % unpackPath)
+
else:
os.chdir('solr')
@@ -741,6 +751,18 @@ def verifyUnpacked(java, project, artifact, unpackPath, gitRevision, version, te
java.run_java8('ant clean server', '%s/antexample.log' % unpackPath)
testSolrExample(unpackPath, java.java8_home, True)
+ if java.run_java9:
+ print(" run tests w/ Java 9 and testArgs='%s'..." % testArgs)
+ java.run_java9('ant clean test -Dtests.slow=false %s' % testArgs, '%s/test.log' % unpackPath)
+
+ print(' generate javadocs w/ Java 9...')
+ java.run_java9('ant clean javadocs', '%s/javadocs.log' % unpackPath)
+ checkJavadocpathFull('%s/solr/build/docs' % unpackPath, False)
+
+ print(' test solr example w/ Java 9...')
+ java.run_java9('ant clean example', '%s/antexample.log' % unpackPath)
+ testSolrExample(unpackPath, java.java9_home, True)
+
os.chdir('..')
print(' check NOTICE')
testNotice(unpackPath)
@@ -751,6 +773,8 @@ def verifyUnpacked(java, project, artifact, unpackPath, gitRevision, version, te
if project == 'lucene':
testDemo(java.run_java8, isSrc, version, '1.8')
+ if java.run_java9:
+ testDemo(java.run_java9, isSrc, version, '9')
print(' check Lucene\'s javadoc JAR')
checkJavadocpath('%s/docs' % unpackPath)
@@ -765,6 +789,16 @@ def verifyUnpacked(java, project, artifact, unpackPath, gitRevision, version, te
print(' test solr example w/ Java 8...')
testSolrExample(java8UnpackPath, java.java8_home, False)
+ if java.run_java9:
+ print(' copying unpacked distribution for Java 9 ...')
+ java9UnpackPath = '%s-java9' % unpackPath
+ if os.path.exists(java9UnpackPath):
+ shutil.rmtree(java9UnpackPath)
+ shutil.copytree(unpackPath, java9UnpackPath)
+ os.chdir(java9UnpackPath)
+ print(' test solr example w/ Java 9...')
+ testSolrExample(java9UnpackPath, java.java9_home, False)
+
os.chdir(unpackPath)
testChangesText('.', version, project)
@@ -1218,7 +1252,7 @@ def crawl(downloadedFiles, urlString, targetDir, exclusions=set()):
downloadedFiles.append(path)
sys.stdout.write('.')
-def make_java_config(parser, java8_home):
+def make_java_config(parser, java9_home):
def _make_runner(java_home, version):
print('Java %s JAVA_HOME=%s' % (version, java_home))
if cygwin:
@@ -1227,7 +1261,7 @@ def make_java_config(parser, java8_home):
(java_home, java_home, java_home)
s = subprocess.check_output('%s; java -version' % cmd_prefix,
shell=True, stderr=subprocess.STDOUT).decode('utf-8')
- if s.find(' version "%s.' % version) == -1:
+ if s.find(' version "%s' % version) == -1:
parser.error('got wrong version for java %s:\n%s' % (version, s))
def run_java(cmd, logfile):
run('%s; %s' % (cmd_prefix, cmd), logfile)
@@ -1236,9 +1270,12 @@ def make_java_config(parser, java8_home):
if java8_home is None:
parser.error('JAVA_HOME must be set')
run_java8 = _make_runner(java8_home, '1.8')
+ run_java9 = None
+ if java9_home is not None:
+ run_java9 = _make_runner(java9_home, '9')
- jc = namedtuple('JavaConfig', 'run_java8 java8_home')
- return jc(run_java8, java8_home)
+ jc = namedtuple('JavaConfig', 'run_java8 java8_home run_java9 java9_home')
+ return jc(run_java8, java8_home, run_java9, java9_home)
version_re = re.compile(r'(\d+\.\d+\.\d+(-ALPHA|-BETA)?)')
revision_re = re.compile(r'rev([a-f\d]+)')
@@ -1258,8 +1295,8 @@ def parse_config():
help='GIT revision number that release was built with, defaults to that in URL')
parser.add_argument('--version', metavar='X.Y.Z(-ALPHA|-BETA)?',
help='Version of the release, defaults to that in URL')
- parser.add_argument('--test-java8', metavar='JAVA8_HOME',
- help='Path to Java8 home directory, to run tests with if specified')
+ parser.add_argument('--test-java9', metavar='JAVA9_HOME',
+ help='Path to Java9 home directory, to run tests with if specified')
parser.add_argument('url', help='Url pointing to release to test')
parser.add_argument('test_args', nargs=argparse.REMAINDER,
help='Arguments to pass to ant for testing, e.g. -Dwhat=ever.')
@@ -1281,7 +1318,7 @@ def parse_config():
c.revision = revision_match.group(1)
print('Revision: %s' % c.revision)
- c.java = make_java_config(parser, c.test_java8)
+ c.java = make_java_config(parser, c.test_java9)
if c.tmp_dir:
c.tmp_dir = os.path.abspath(c.tmp_dir)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/19386313/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 0978b54..c35d692 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -186,6 +186,9 @@ Other
Spatial4j 0.7 is compatible with JTS 1.15.0 and not any prior version. JTS 1.15.0 is
dual-licensed to include BSD; prior versions were LGPL. (David Smiley)
+* LUCENE-8155: Add back support in smoke tester to run against later Java versions.
+ (Uwe Schindler)
+
======================= Lucene 7.2.1 =======================
Bug Fixes
[2/2] lucene-solr:master: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/lucene-solr
Posted by us...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7d3fccef
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7d3fccef
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7d3fccef
Branch: refs/heads/master
Commit: 7d3fccefe613afe7cd94ffeebab1217f92eb9d5c
Parents: 1938631 1a6d0f5
Author: Uwe Schindler <us...@apache.org>
Authored: Fri Feb 9 19:56:59 2018 +0100
Committer: Uwe Schindler <us...@apache.org>
Committed: Fri Feb 9 19:56:59 2018 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 2 +
.../ltr/store/rest/ManagedFeatureStore.java | 2 +-
.../solr/ltr/store/rest/ManagedModelStore.java | 4 +-
.../org/apache/solr/ltr/TestLTROnSolrCloud.java | 8 +-
.../apache/solr/ltr/TestLTRQParserExplain.java | 2 +-
.../solr/ltr/TestLTRReRankingPipeline.java | 2 +-
.../apache/solr/ltr/TestLTRScoringQuery.java | 4 +-
.../org/apache/solr/ltr/TestLTRWithFacet.java | 4 +-
.../org/apache/solr/ltr/TestLTRWithSort.java | 4 +-
.../solr/ltr/TestSelectiveWeightCreation.java | 2 +-
.../ltr/feature/TestEdisMaxSolrFeature.java | 4 +-
.../solr/ltr/feature/TestFeatureLogging.java | 38 ++++-----
.../ltr/feature/TestFieldLengthFeature.java | 16 ++--
.../solr/ltr/feature/TestFieldValueFeature.java | 16 ++--
.../solr/ltr/feature/TestFilterSolrFeature.java | 8 +-
.../ltr/feature/TestNoMatchSolrFeature.java | 18 ++--
.../ltr/feature/TestOriginalScoreFeature.java | 10 +--
.../solr/ltr/feature/TestRankingFeature.java | 14 ++--
.../ltr/feature/TestUserTermScoreWithQ.java | 4 +-
.../ltr/feature/TestUserTermScorerQuery.java | 4 +-
.../ltr/feature/TestUserTermScorereQDF.java | 4 +-
.../solr/ltr/feature/TestValueFeature.java | 24 +++---
.../solr/ltr/model/TestDefaultWrapperModel.java | 8 +-
.../apache/solr/ltr/model/TestLinearModel.java | 4 +-
.../solr/ltr/norm/TestMinMaxNormalizer.java | 2 +-
.../solr/ltr/norm/TestStandardNormalizer.java | 4 +-
.../ltr/store/rest/TestManagedFeatureStore.java | 12 +--
.../solr/ltr/store/rest/TestModelManager.java | 6 +-
.../store/rest/TestModelManagerPersistence.java | 88 +++++++++++++++++---
29 files changed, 193 insertions(+), 125 deletions(-)
----------------------------------------------------------------------