Skip to content

Commit d7e9ad6

Browse files
author
Sumedh Wale
committed
switch to using gpg for signing in build.gradle
- avoids having to put password anywhere rather will use gpg-agent - needs "signing.gnupg.keyName" in gradle.properties or else the default gpg signing key, if any, will be used which may not be desirable - updated mkdocs.yml
1 parent 436612f commit d7e9ad6

5 files changed

Lines changed: 17 additions & 15 deletions

File tree

build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ allprojects {
119119
sparkAvroVersion = '4.0.0'
120120
sparkXmlVersion = '0.4.1'
121121
scalatestVersion = '2.2.6'
122+
py4jVersion = '0.10.7'
122123
jettyVersion = '9.2.26.v20180806'
123124
guavaVersion = '14.0.1'
124125
fastutilVersion = '8.5.4'
@@ -803,10 +804,9 @@ subprojects {
803804
from javadoc
804805
}
805806
if (rootProject.hasProperty('enablePublish')) {
806-
if (rootProject.hasProperty('sign')) {
807-
signing {
808-
sign configurations.archives
809-
}
807+
signing {
808+
useGpgCmd()
809+
sign configurations.archives
810810
}
811811

812812
uploadArchives {
@@ -1227,10 +1227,10 @@ ospackage {
12271227
into '/opt/' + packageName
12281228
}
12291229

1230-
if (rootProject.hasProperty('enablePublish') && rootProject.hasProperty('sign')) {
1231-
signingKeyId = rootProject.property('signing.keyId')
1232-
signingKeyPassphrase = rootProject.property('signing.password')
1233-
signingKeyRingFile = file(rootProject.property('signing.secretKeyRingFile'))
1230+
if (rootProject.hasProperty('enablePublish')) {
1231+
// signingKeyId = rootProject.property('signing.keyId')
1232+
// signingKeyPassphrase = rootProject.property('signing.password')
1233+
// signingKeyRingFile = file(rootProject.property('signing.secretKeyRingFile'))
12341234
}
12351235

12361236
link('/usr/sbin/snappy-start-all.sh', "/opt/${packageName}/sbin/snappy-start-all.sh")
@@ -1564,7 +1564,7 @@ task checkPython(type: Exec) {
15641564
from "${rootDir}/python/pyspark/test_supprt"
15651565
into wdir
15661566
}
1567-
environment 'PYTHONPATH': "${snappyProductDir}/python/lib/py4j-0.10.4-src.zip:${snappyProductDir}/python",
1567+
environment 'PYTHONPATH': "${snappyProductDir}/python/lib/py4j-${py4jVersion}-src.zip:${snappyProductDir}/python",
15681568
'SPARK_HOME': "${snappyProductDir}"
15691569
commandLine 'python', '-u', "${rootDir}/python/run-snappy-tests.py"
15701570
}

docs/install/building_from_source.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Building SparkR with the `-PR.enable` flag requires R 3.x or 4.x to be installed
4343
At least the following R packages along with their dependencies also need to be installed:
4444
`knitr`, `markdown`, `rmarkdown`, `testthat`
4545

46+
Official builds are published to maven using the `publishMaven` task.
4647

4748
## Repository Layout
4849

docs/release_notes/release_notes.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -292,10 +292,10 @@ The following table describes the download artifacts included in SnappyData 1.3.
292292

293293
| Artifact Name | Description |
294294
| ------------- | ----------- |
295-
|snappydata-1.3.0-bin.tar.gz | Full product binary (includes Hadoop 3.2.0) |
295+
|snappydata-1.3.0-bin.tar.gz | Full product binary (includes Hadoop 3.2.0) |
296296
|snappydata-jdbc\_2.11-1.3.0.jar | JDBC client driver and push down JDBC data source for Spark |
297297
|snappydata-core\_2.11-1.3.0.jar | The single jar needed in Smart Connector mode; an alternative to --packages option |
298-
|snappydata-odbc\_1.3.0_win.zip | 32-bit and 64-bit ODBC client drivers for Windows |
298+
|snappydata-odbc\_1.3.0\_win.zip | 32-bit and 64-bit ODBC client drivers for Windows |
299299
|snappydata-1.3.0.sha256 | The SHA256 checksums of the product artifacts. On Linux verify using `sha256sum --check snappydata-1.3.0.sha256`. |
300-
|snappydata-1.3.0.sha256.gpg | GnuPG signature for snappydata-1.3.0.sha256. Get the public key using `gpg --keyserver hkps://keys.gnupg.net --recv-keys 573D42FDD455480DC33B7105F76D50B69DB1586C`. Then verify using `gpg --verify snappydata-1.3.0.sha256.gpg`. |
300+
|snappydata-1.3.0.sha256.asc | PGP signature for snappydata-1.3.0.sha256 in ASCII format. Get the public key using `gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 573D42FDD455480DC33B7105F76D50B69DB1586C`. Then verify using `gpg --verify snappydata-1.3.0.sha256.asc` which should show the mentioned key in the verification with email as `swale@tibco.com`. |
301301
|[snappydata-zeppelin\_2.11-0.8.2.1.jar](https://github.com/TIBCOSoftware/snappy-zeppelin-interpreter/releases/download/v0.8.2.1/snappydata-zeppelin_2.11-0.8.2.1.jar) | The Zeppelin interpreter jar for SnappyData compatible with Apache Zeppelin 0.8.2. The standard jdbc interpreter is preferred over this. See [How to Use Apache Zeppelin with SnappyData](../howto/use_apache_zeppelin_with_snappydata.md). |

mkdocs.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ pages:
217217
- 'SET SCHEMA': 'reference/sql_reference/set-schema.md'
218218
- 'TRUNCATE TABLE': 'reference/sql_reference/truncate-table.md'
219219
- 'UPDATE': 'reference/sql_reference/update.md'
220+
- 'SQL Functions': 'reference/sql_functions/sql_functions.md'
220221
- 'SQL General Limitations': 'reference/sql_general_limitations.md'
221222
- 'Built-in System Procedures and Built-in Functions': 'reference/inbuilt_system_procedures/system-procedures.md'
222223
- 'Built-in System Procedures and Built-in Functions':
@@ -339,7 +340,7 @@ pages:
339340
#- Additional Information: additional_files/additional_docs.md
340341
#- About:
341342
# - Contributing: about/contributing.md
342-
- Community Edition/ Enterprise Edition Features: additional_files/open_source_components.md
343+
- Community Edition Features: additional_files/open_source_components.md
343344
- 'License Model': 'additional_files/license_model.md'
344345
- 'Release Notes': 'release_notes/release_notes.md'
345346
- 'Doc Archives': prev_doc_ver.md
@@ -365,5 +366,5 @@ extra_css:
365366
markdown_extensions:
366367
- admonition
367368

368-
copyright: Copyright © 2017-2020 TIBCO Software Inc. All rights reserved.
369+
copyright: Copyright © 2017-2021 TIBCO Software Inc. All rights reserved.
369370

0 commit comments

Comments
 (0)