This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 9578764 SOLR-15952: Stop releasing Solr binary ZIP artifact from v9.0
(#561)
9578764 is described below
commit 9578764c18c0d406ed2bddc19ca3f8aa67e5f0a2
Author: Jan Høydahl <[email protected]>
AuthorDate: Thu Jan 27 00:15:43 2022 +0100
SOLR-15952: Stop releasing Solr binary ZIP artifact from v9.0 (#561)
(cherry picked from commit a3d7074c974c751438b6d4b75231dbcf91d2617a)
---
dev-tools/scripts/smokeTestRelease.py | 18 ++----------------
help/workflow.txt | 2 +-
solr/bin/install_solr_service.sh | 20 ++++----------------
solr/packaging/build.gradle | 4 ++--
solr/solr-ref-guide/src/installing-solr.adoc | 11 ++++++-----
solr/solr-ref-guide/src/solr-tutorial.adoc | 6 +++---
6 files changed, 18 insertions(+), 43 deletions(-)
diff --git a/dev-tools/scripts/smokeTestRelease.py
b/dev-tools/scripts/smokeTestRelease.py
index 478cadd..99a0b84 100755
--- a/dev-tools/scripts/smokeTestRelease.py
+++ b/dev-tools/scripts/smokeTestRelease.py
@@ -38,7 +38,7 @@ from collections import namedtuple
import scriptutil
# This tool expects to find /solr off the base URL. You
-# must have a working gpg, tar, unzip in your path. This has been
+# must have a working gpg, tar in your path. This has been
# tested on Linux and on Cygwin under Windows 7.
cygwin = platform.system().lower().startswith('cygwin')
@@ -255,8 +255,7 @@ def checkSigs(urlString, version, tmpDir, isSigned,
keysFile):
raise RuntimeError('solr: artifact %s has wrong sigs: expected %s but
got %s' % (artifact, expectedSigs, sigs))
expected = ['solr-%s-src.tgz' % version,
- 'solr-%s.tgz' % version,
- 'solr-%s.zip' % version]
+ 'solr-%s.tgz' % version]
actual = [x[0] for x in artifacts]
if expected != actual:
@@ -516,8 +515,6 @@ def unpackAndVerify(java, tmpDir, artifact, gitRevision,
version, testArgs):
unpackLogFile = '%s/solr-unpack-%s.log' % (tmpDir, artifact)
if artifact.endswith('.tar.gz') or artifact.endswith('.tgz'):
run('tar xzf %s/%s' % (tmpDir, artifact), unpackLogFile)
- elif artifact.endswith('.zip'):
- run('unzip %s/%s' % (tmpDir, artifact), unpackLogFile)
# make sure it unpacks to proper subdir
l = os.listdir(destDir)
@@ -810,16 +807,6 @@ def checkJavadocAndSourceArtifacts(artifacts, version):
raise RuntimeError('missing: %s' % sourcesJar)
-def getZipFileEntries(fileName):
- entries = []
- with zipfile.ZipFile(fileName) as zf:
- for zi in zf.infolist():
- entries.append(zi.filename)
- # Sort by name:
- entries.sort()
- return entries
-
-
def checkIdenticalMavenArtifacts(distFiles, artifacts, version):
print(' verify that Maven artifacts are same as in the binary
distribution...')
reJarWar = re.compile(r'%s\.[wj]ar$' % version) # exclude *-javadoc.jar and
*-sources.jar
@@ -1129,7 +1116,6 @@ def smokeTest(java, baseURL, gitRevision, version,
tmpDir, isSigned, local_keys,
checkSigs(solrPath, version, tmpDir, isSigned, keysFile)
if not downloadOnly:
unpackAndVerify(java, tmpDir, 'solr-%s.tgz' % version, gitRevision,
version, testArgs)
- unpackAndVerify(java, tmpDir, 'solr-%s.zip' % version, gitRevision,
version, testArgs)
unpackAndVerify(java, tmpDir, 'solr-%s-src.tgz' % version, gitRevision,
version, testArgs)
print()
print('Test Maven artifacts...')
diff --git a/help/workflow.txt b/help/workflow.txt
index c59d77d..a500633 100644
--- a/help/workflow.txt
+++ b/help/workflow.txt
@@ -35,7 +35,7 @@ For quick local development
gradlew -p solr/packaging dev
ls solr/packaging/build/dev # expanded directory
-Generate the release tar and zip archives (see publishing.txt for details)
+Generate the release tar archive (see publishing.txt for details)
gradlew -p solr/distribution assembleRelease
ls solr/distribution/build/release # release archives
diff --git a/solr/bin/install_solr_service.sh b/solr/bin/install_solr_service.sh
index fddeebb..dc82c8d 100755
--- a/solr/bin/install_solr_service.sh
+++ b/solr/bin/install_solr_service.sh
@@ -30,7 +30,7 @@ print_usage() {
echo "Usage: install_solr_service.sh <path_to_solr_distribution_archive>
[OPTIONS]"
echo ""
echo " The first argument to the script must be a path to a Solr
distribution archive, such as solr-5.0.0.tgz"
- echo " (only .tgz or .zip are supported formats for the archive)"
+ echo " (only .tgz is supported format for the archive)"
echo ""
echo " Supported OPTIONS include:"
echo ""
@@ -102,14 +102,10 @@ fi
# strip off path info
SOLR_INSTALL_FILE=${SOLR_ARCHIVE##*/}
-is_tar=true
if [ ${SOLR_INSTALL_FILE: -4} == ".tgz" ]; then
SOLR_DIR=${SOLR_INSTALL_FILE%.tgz}
-elif [ ${SOLR_INSTALL_FILE: -4} == ".zip" ]; then
- SOLR_DIR=${SOLR_INSTALL_FILE%.zip}
- is_tar=false
else
- print_usage "Solr installation archive $SOLR_ARCHIVE is invalid, expected a
.tgz or .zip file!"
+ print_usage "Solr installation archive $SOLR_ARCHIVE is invalid, expected a
.tgz file!"
exit 1
fi
@@ -187,11 +183,7 @@ if [ $# -gt 1 ]; then
fi
# Test for availability of needed tools
-if [[ $is_tar ]] ; then
- tar --version &>/dev/null || print_error "Script requires the 'tar'
command"
-else
- unzip -hh &>/dev/null || print_error "Script requires the 'unzip'
command"
-fi
+tar --version &>/dev/null || print_error "Script requires the 'tar'
command"
if [[ $SOLR_START == "true" ]] ; then
service --version &>/dev/null || service --help &>/dev/null || print_error
"Script requires the 'service' command"
java -version &>/dev/null || print_error "Solr requires java, please
install or set JAVA_HOME properly"
@@ -265,11 +257,7 @@ if [ ! -d "$SOLR_INSTALL_DIR" ]; then
echo -e "\nExtracting $SOLR_ARCHIVE to $SOLR_EXTRACT_DIR\n"
- if $is_tar ; then
- tar zxf "$SOLR_ARCHIVE" -C "$SOLR_EXTRACT_DIR"
- else
- unzip -q "$SOLR_ARCHIVE" -d "$SOLR_EXTRACT_DIR"
- fi
+ tar zxf "$SOLR_ARCHIVE" -C "$SOLR_EXTRACT_DIR"
if [ ! -d "$SOLR_INSTALL_DIR" ]; then
echo -e "\nERROR: Expected directory $SOLR_INSTALL_DIR not found after
extracting $SOLR_ARCHIVE ... script fails.\n" 1>&2
diff --git a/solr/packaging/build.gradle b/solr/packaging/build.gradle
index 370dd45..e6cc910 100644
--- a/solr/packaging/build.gradle
+++ b/solr/packaging/build.gradle
@@ -39,12 +39,10 @@ configurations {
docker
solrTgz
solrTgzSignature
- solrZip
}
artifacts {
solrTgz(distTar)
- solrZip(distZip)
}
dependencies {
@@ -157,4 +155,6 @@ distTar {
compression = Compression.GZIP
}
+distZip.enabled = false
+
assemble.dependsOn installDist
diff --git a/solr/solr-ref-guide/src/installing-solr.adoc
b/solr/solr-ref-guide/src/installing-solr.adoc
index 6c9156b..7831929 100644
--- a/solr/solr-ref-guide/src/installing-solr.adoc
+++ b/solr/solr-ref-guide/src/installing-solr.adoc
@@ -26,11 +26,10 @@ Please be sure to review the
<<system-requirements.adoc#,System Requirements>> b
Solr is available from the Solr website.
Download the latest release https://solr.apache.org/downloads.html.
-There are three separate packages:
+There are two separate packages:
-* `solr-{solr-docs-version}.0.tgz` for Linux/Unix/OSX systems
-* `solr-{solr-docs-version}.0.zip` for Microsoft Windows systems
-* `solr-{solr-docs-version}.0-src.tgz` the package Solr source code.
+* `solr-{solr-full-version}.tgz` the binary package, for all operating systems.
+* `solr-{solr-full-version}-src.tgz` the package Solr source code.
This is useful if you want to develop on Solr without using the official Git
repository.
== Preparing for Installation
@@ -58,7 +57,7 @@ If you know you will exceed this number of documents in total
before you've even
== Package Installation
-To keep things simple for now, extract the Solr distribution archive to your
local home directory, for instance on Linux, do:
+To keep things simple for now, extract the Solr distribution archive to your
local home directory:
[source,bash,subs="attributes"]
----
@@ -68,6 +67,8 @@ tar zxf solr-{solr-docs-version}.0.tgz
Once extracted, you are now ready to run Solr using the instructions provided
in the <<Starting Solr>> section below.
+TIP: Windows includes the `tar` tool since Windows 10. Open a command line
window and execute the above comamnd. There are also several 3rd party
un-archiving tools that support `.tar` archives.
+
== Directory Layout
After installing Solr, you'll see the following directories and files within
them:
diff --git a/solr/solr-ref-guide/src/solr-tutorial.adoc
b/solr/solr-ref-guide/src/solr-tutorial.adoc
index 3f8c81e..6f57ac0 100644
--- a/solr/solr-ref-guide/src/solr-tutorial.adoc
+++ b/solr/solr-ref-guide/src/solr-tutorial.adoc
@@ -53,11 +53,11 @@ For example, with a shell in UNIX, Cygwin, or MacOS:
[source,bash,subs="verbatim,attributes+"]
----
~$ ls solr*
-solr-{solr-docs-version}.0.zip
+solr-{solr-full-version}.tgz
-~$ unzip -q solr-{solr-docs-version}.0.zip
+~$ tar -xzf solr-{solr-full-version}.tgz
-~$ cd solr-{solr-docs-version}.0/
+~$ cd solr-{solr-full-version}/
----
If you'd like to know more about Solr's directory layout before moving to the
first exercise, see the section
<<installing-solr.adoc#directory-layout,Directory Layout>> for details.
