Fixes #1725: Correct Maven credential variables in CI release script.

Update documentation that refered explicitly to the old version, to use refer to new version.
digital-asset · Jun 17, 2019 · 373ff59 · 373ff59
1 parent 5cca3fc
commit 373ff59
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/ci/build-unix.yml b/ci/build-unix.yml
@@ -55,7 +55,7 @@ steps:
       # For signing artifacts to be uploaded to Maven Central.
       GPG_KEY: $(gpg-code-signing)
       # Configuration the Sonatype Open Source Repository Hosting
-      MAVEN_USER: $(MAVEN_USER)
+      MAVEN_USERNAME: $(MAVEN_USERNAME)
       MAVEN_PASSWORD: $(MAVEN_PASSWORD)
       MAVEN_URL: "https://oss.sonatype.org"
     name: release

diff --git a/docs/source/app-dev/bindings-java/index.rst b/docs/source/app-dev/bindings-java/index.rst
@@ -158,7 +158,7 @@ Replace ``x.y.z`` for both dependencies with the version that you want to use. Y
 the `Maven Central Repository <https://search.maven.org/search?q=g:com.daml.ledger>`__.
 
 .. note::
-   As of DAML SDK release 0.13.1, the Java Bindings libraries are available via the public Maven Central repository. Earlier releases are available from the `DAML Bintray repository <https://digitalassetsdk.bintray.com>`__.
+   As of DAML SDK release 0.13.2, the Java Bindings libraries are available via the public Maven Central repository. Earlier releases are available from the `DAML Bintray repository <https://digitalassetsdk.bintray.com>`__.
 
 You can also take a look at the ``pom.xml`` file from the :ref:`quickstart project <quickstart>`.
 

diff --git a/docs/source/support/release-notes.rst b/docs/source/support/release-notes.rst
@@ -13,6 +13,21 @@ Visualizing DAML Contracts
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 - Added :doc:`Visualizing DAML Contracts </tools/visual>`
+.. _release-0-13-2:
+
+0.13.2 - 2019-06-17
+-------------------
+
+Release Procedure
+~~~~~~~~~~~~~~~~~
+
+- Fixes to the release procedure - NO changes to the SDK.
+  See `#1725 <https://github.com/digital-asset/daml/issues/1725>`__
+
+Java Bindings
+~~~~~~~~~~~~~
+
+- The changes for Java Bindings listed for SDK 0.13.1 now only apply to SDK 0.13.2 and later.
 
 .. _release-0-13-1:
 
@@ -29,7 +44,7 @@ Java Bindings
 
 - Release the Java Bindings to the public Maven Central repository. To move to using the Maven Central repository, remove
   the ``<repository>...</repository>`` and ``<pluginRepository>...</pluginRepository>`` blocks from Maven POM files
-  that use version 0.12.26 (or later) of the Java Bindings.
+  that use version 0.13.1 (or later) of the Java Bindings.
   See `#1205 <https://github.com/digital-asset/daml/issues/1205>`__.
 
 .. _release-0-13-0:

diff --git a/release/src/Upload.hs b/release/src/Upload.hs
@@ -312,7 +312,7 @@ chksumFileContents file = do
 mavenConfigFromEnv :: (MonadIO m, E.MonadThrow m) => m MavenUploadConfig
 mavenConfigFromEnv = do
     url <- liftIO $ getEnv "MAVEN_URL"
-    user <- liftIO $ getEnv "MAVEN_USER"
+    user <- liftIO $ getEnv "MAVEN_USERNAME"
     password <- liftIO $ getEnv "MAVEN_PASSWORD"
     mbAllowUnsecureTls <- liftIO $ lookupEnv "MAVEN_UNSECURE_TLS"
     signingKey <- liftIO $ getEnv "GPG_KEY"