[ant] branch master updated (4706f77 -> 23ea16f)

[bo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bodewig pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git.


    from 4706f77  exclude Graal.js Nashorn compat tests from POM builds
     add 9bc1f8f  snapcraft push has been deprecated
     new 23ea16f  Merge branch '1.9.x'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ReleaseInstructions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[ant] 01/01: Merge branch '1.9.x'

[bo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git

commit 23ea16fc9b1396773514598b01ea1eceb230d3cb
Merge: 4706f77 9bc1f8f
Author: Stefan Bodewig <bo...@apache.org>
AuthorDate: Sun Sep 27 12:33:43 2020 +0200

    Merge branch '1.9.x'

 ReleaseInstructions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc ReleaseInstructions
index bb9c0aa,5229e13..03080d2
--- a/ReleaseInstructions
+++ b/ReleaseInstructions
@@@ -215,9 -201,9 +215,9 @@@ Note: This document was adapted from th
  
        $ snapcraft clean
        $ snapcraft snap
-       $ snapcraft push --release candidate ant_*.snap
 -      $ snapcraft upload --release=1.9/candidate ant_*.snap
++      $ snapcraft upload --release=candidate ant_*.snap
  
 -    This will publish the new release snap to the 1.9 track on the
 +    This will publish the new release snap to the latest track on the
      candidate risk level. It will be moved to stable, once the vote
      has passed.