This is an automated email from the ASF dual-hosted git repository.
olabusayo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-daffodil.git
The following commit(s) were added to refs/heads/master by this push:
new 3078bd0 Update Container
3078bd0 is described below
commit 3078bd0c9aa9b2538fb7f6186cb10f9388c605d5
Author: olabusayoT <[email protected]>
AuthorDate: Fri Apr 3 17:42:01 2020 -0400
Update Container
-- update sbt pgp version to 2.0.1
-- update pgp signing key format
DAFFODIL-2312
---
containers/release-candidate/daffodil-release-candidate | 2 +-
containers/release-candidate/setup-container.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/containers/release-candidate/daffodil-release-candidate
b/containers/release-candidate/daffodil-release-candidate
index 100cf45..0d0bb92 100755
--- a/containers/release-candidate/daffodil-release-candidate
+++ b/containers/release-candidate/daffodil-release-candidate
@@ -155,7 +155,7 @@ sbt \
"set updateOptions in ThisBuild := updateOptions.value.withGigahorse(false)"
\
"set credentials in ThisBuild += Credentials(\"Sonatype Nexus Repository
Manager\", \"repository.apache.org\", \"$APACHE_USERNAME\",
\"$APACHE_PASSWD\")" \
"set publishTo in ThisBuild := Some(\"Apache Staging Distribution
Repository\" at
\"https://repository.apache.org/service/local/staging/deploy/maven2\";)" \
- "set pgpSigningKey := Some(new java.math.BigInteger(\"$PGP_SIGNING_KEY_ID\",
16).longValue)" \
+ "set pgpSigningKey := Some(\"$PGP_SIGNING_KEY_ID\")" \
"+compile" \
"+$SBT_PUBLISH" \
"daffodil-cli/rpm:packageBin" \
diff --git a/containers/release-candidate/setup-container.sh
b/containers/release-candidate/setup-container.sh
index 958a16b..337e7c1 100755
--- a/containers/release-candidate/setup-container.sh
+++ b/containers/release-candidate/setup-container.sh
@@ -34,7 +34,7 @@ rm wix311-binaries.zip
# enable sbt pgp
mkdir -p /root/.sbt/1.0/plugins/
-sh -c "echo 'addSbtPlugin(\"com.jsuereth\" % \"sbt-pgp\" % \"1.1.1\")' >>
/root/.sbt/1.0/plugins/pgp.sbt"
+sh -c "echo 'addSbtPlugin(\"com.jsuereth\" % \"sbt-pgp\" % \"2.0.1\")' >>
/root/.sbt/1.0/plugins/pgp.sbt"
# pre-download sbt version used by daffodil
TMP_SBT_PROJECT=/tmp/sbt-project/
