[juneau] branch master updated: Minor fixes.

[ja...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 549cf8fa0 Minor fixes.
     new f7f0d3a16 Merge branch 'master' of https://gitbox.apache.org/repos/asf/juneau.git
549cf8fa0 is described below

commit 549cf8fa0b664cbf509f51dcb1c85d70e28c6bae
Author: JamesBognar <ja...@salesforce.com>
AuthorDate: Sun Sep 18 14:36:29 2022 -0400

    Minor fixes.
---
 .../06.juneau-assertions/01.ja.Overview.html       | 25 +++++++++++-----------
 juneau-release.sh                                  | 13 +++++------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/juneau-doc/docs/Topics/06.juneau-assertions/01.ja.Overview.html b/juneau-doc/docs/Topics/06.juneau-assertions/01.ja.Overview.html
index 2ce30a3c6..1ed80e183 100644
--- a/juneau-doc/docs/Topics/06.juneau-assertions/01.ja.Overview.html
+++ b/juneau-doc/docs/Topics/06.juneau-assertions/01.ja.Overview.html
@@ -81,6 +81,14 @@
 			</ul>
 		</li>
 	</ul>
+	<p>
+		Assertions have 3 categories of methods:
+	</p>
+	<ul>
+		<li>Testing methods (<c>isX</c> methods)
+		<li>Transform methods (<c>asX</c> methods)
+		<li>Configuration methods (<c>setX</c> methods)
+	</ul>
 	<h5 class='figure'>Examples:</h5>
 	<p class='bjava'>
 		|	<jk>import static</jk> org.apache.juneau.assertions.Assertions.*;
@@ -118,17 +126,8 @@
 		|		.asMessage().is(<js>"foo"</js>);
 	</p>
 	<p>
-		Assertions have 3 categories of methods:
-	</p>
-	<ul>
-		<li>Testing methods.
-		<li>Transform methods.
-		<li>Configuration methods.
-	</ul>
-	<p>
-		Testing methods perform an assertion on the specified value and throws a {@link java.lang.AssertionError} if
+		Testing methods (<c>isX</c> methods) perform an assertion on the specified value and throws a {@link java.lang.AssertionError} if
 		the test fails.  Otherwise, the method returns the original assertion object to allow you to chain the command.
-		Testing methods start with <c>is</c>.
 	</p>
 	<h5 class='figure'>Example:</h5>
 	<p class='bjava'>
@@ -138,8 +137,8 @@
 		|		.isNotEmpty();  <jc>// Perform test and returns original FluentStringAssertion.</jc>
 	</p>	
 	<p>
-		Transform methods allow you to convert assertions of one type to another type or to convert the tested value to
-		some other form wrapped in another assertion.  Transform methods start with <c>as</c>.
+		Transform methods (<c>asX</c> methods) allow you to convert assertions of one type to another type or to convert the tested value to
+		some other form wrapped in another assertion.
 	</p>
 	<h5 class='figure'>Example:</h5>
 	<p class='bjava'>
@@ -151,7 +150,7 @@
 		|			.isContains(<js>"FOO"</js>);  <jc>// Runs test and returns original FluentStringAssertion.</jc>
 	</p>	
 	<p>
-		Configuration methods allow you to tailor the behavior of assertions when they fail.  They always return the same assertion object.
+		Configuration methods (<c>setX</c> methods) allow you to tailor the behavior of assertions when they fail.  They always return the same assertion object.
 		Transformed assertions inherit the configurations of the created-by assertions.  Configuration methods start with <c>set</c>.
 	</p>
 	<h5 class='figure'>Example:</h5>
diff --git a/juneau-release.sh b/juneau-release.sh
index f740d89e7..706a57a1d 100755
--- a/juneau-release.sh
+++ b/juneau-release.sh
@@ -73,6 +73,7 @@ command -v wget || fail_with_message "wget not found"
 command -v gpg || fail_with_message "gpg not found"
 command -v /usr/local/bin/gpg || fail_with_message "gpg not found in /usr/local/bin"
 command -v svn || fail_with_message "svn not found"
+export GPG_TTY=$(tty)
 
 message "Checking Java version"
 java -version
@@ -84,7 +85,7 @@ yprompt "Are you using at least Maven 3?"
 
 cd ~/.m2
 
-message "Cleaning existing Git repository"
+message "Cleaning Maven repository"
 st
 if [ "$X_CLEANM2" != "N" ] && [ "$X_CLEANM2" != "n" ] 
 then
@@ -106,10 +107,10 @@ st
 git clone https://gitbox.apache.org/repos/asf/juneau.git
 et
 
-message "Cloning juneau-website.git"
-st
-git clone https://gitbox.apache.org/repos/asf/juneau-website.git
-et
+#message "Cloning juneau-website.git"
+#st
+#git clone https://gitbox.apache.org/repos/asf/juneau-website.git
+#et
 
 cd juneau
 git config user.name $X_USERNAME
@@ -185,7 +186,7 @@ echo "IMPORTANT - When all artifacts to be deployed are in the staging repositor
 echo "DO NOT CLICK RELEASE YET - the release candidate must pass [VOTE] emails on dev@juneau before we release."
 echo "Once closing has finished (check with Refresh), browse to the URL of the staging repository which should be something like https://repository.apache.org/content/repositories/orgapachejuneau-1000."
 echo " "
-echo "Enter the staging repository name: orgapachejuneau-"
+echo "Enter the staging repository name AFTER CLOSING IT!!!: orgapachejuneau-"
 
 read prompt
 export X_REPO="orgapachejuneau-$prompt";