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 f00fb74 Release script fixes.
f00fb74 is described below
commit f00fb7450daffc5191d6f4020f67f5197ed13e8d
Author: JamesBognar <[email protected]>
AuthorDate: Sat Aug 10 17:57:54 2019 -0400
Release script fixes.
---
juneau-doc/docs/designs.html | 85 ++++++++++++++++++++++
.../src/main/javadoc/resources/juneau-doc.css | 31 ++++++--
juneau-release.sh | 18 ++++-
3 files changed, 124 insertions(+), 10 deletions(-)
diff --git a/juneau-doc/docs/designs.html b/juneau-doc/docs/designs.html
new file mode 100644
index 0000000..a6fa8cb
--- /dev/null
+++ b/juneau-doc/docs/designs.html
@@ -0,0 +1,85 @@
+
+<!DOCTYPE HTML>
+<!--
+/***************************************************************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information regarding copyright
ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+
***************************************************************************************************************************/
+ -->
+<html>
+<head>
+ <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
+ <style type='text/css'>
+ /* For viewing in file system and page designer */
+ @IMPORT url('../src/main/javadoc/javadoc.css');
+ @IMPORT url('../src/main/javadoc/resources/juneau-doc.css');
+ @IMPORT url('../src/main/javadoc/resources/juneau-code.css');
+ body {
+ margin: 20px;
+ }
+ </style>
+</head>
+<body>
+
+ <h2 class='topic'><h2 class='topic'></h2></h5>
+ <h3 class='topic'><h3 class='topic'></h3></h5>
+ <h4 class='topic'><h4 class='topic'></h4></h5>
+ <h5 class='topic'><h5 class='topic'></h5></h5>
+ <h5 class='figure'><h5 class='figure'></h5></h5>
+
+ <ul class='javatree'>
+ <li class='jp'><c>com.apache.foo</c>
+ <li class='jp'><c>com.apache.foo</c>
+ <ul>
+ <li class='jc'><c>Foo.class</c>
+ <li class='jc'><c>Foo.class</c>
+ <li class='jp'><c>com.apache.foo</c>
+ <ul>
+ <li class='jc'><c>Foo.class</c>
+ <li class='jc'><c>Foo.class</c>
+ <li class='jp'><c>com.apache.foo</c>
+ <ul>
+ <li class='jc'><c>Foo.class</c>
+ </ul>
+ <li class='jc'><c>Foo.class</c>
+ <li class='jc'><c>Foo.class</c>
+ </ul>
+ </ul>
+ <li class='jp'><c>com.apache.foo</c>
+ <li class='jp'><c>com.apache.foo</c>
+ </ul>
+
+ <p class='bcode console'>
+ <p class='bcode console'>
+ </p>
+ <p class='bcode'>
+ <p class='bcode'>
+ </p>
+ <div class='info'>
+ <div class='info'>
+ </div>
+ <div class='warn'>
+ <div class='warn'>
+ </div>
+ <div class='severe'>
+ <div class='severe'>
+ </div>
+
+ <p>
+ foo <span class='snippet'><span class='snippet'></span> foo
+ </p>
+ <p>
+ foo <c><c>code</c></c> foo
+ </p>
+ <p>
+ foo <l><l>literal</l></l> foo
+ </p>
+</body>
diff --git a/juneau-doc/src/main/javadoc/resources/juneau-doc.css
b/juneau-doc/src/main/javadoc/resources/juneau-doc.css
index 0b93cc4..60a300e 100755
--- a/juneau-doc/src/main/javadoc/resources/juneau-doc.css
+++ b/juneau-doc/src/main/javadoc/resources/juneau-doc.css
@@ -330,7 +330,7 @@ l {
/* Documentation Tree */
.doctree li {
max-width: 800px;
- margin-top: 0px;
+ margin-top: 0px;
}
.doctree>li {
margin-bottom: 10px;
@@ -338,6 +338,29 @@ l {
.doctree li {
margin-top: 5px;
}
+.doctree ul {
+ padding: 0px 0px 0px 15px;
+ margin-top: -2px;
+ margin-bottom: -2px;
+}
+
+/* Java Tree */
+.javatree li {
+ max-width: 800px;
+ margin-top: 0px;
+}
+.javatree>li {
+ margin-bottom: 1px;
+}
+.javatree li {
+ margin-top: 1px;
+}
+.javatree ul {
+ padding: 0px 0px 0px 20px;
+ margin-top: 0px;
+ margin-bottom: 0px;
+}
+
li.normal {
list-style-image:none;
}
@@ -372,12 +395,6 @@ li.jp {
list-style-image:
url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcgCglpZD0ic3ZnMjgxMCIgCgl4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIAoJeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIAoJaGVpZ2h0PSIxNiIgCgl3aWR0aD0iMjQiIAoJdmVyc2lvbj0iMS4wIiAKCXZpZXdCb3g9IjAgLTEyMCA0ODAgNjAwIj4KICA8c3R5bGU+CiAgICAuaGVhdnkgeyBmb250OiBib2xkIDM1MHB4IHNhbnMtc2VyaWY7IHRleHQtc2hhZG93OiAxcHggMXB4IDFweCBibGFjazt9CiAgPC9zdHlsZT4KCTxkZWZ
[...]
}
-.doctree ul {
- padding: 0px 0px 0px 15px;
- margin-top: -2px;
- margin-bottom: -2px;
-}
-
.topic a {
border-bottom: 1px dotted #4c6b87;
}
diff --git a/juneau-release.sh b/juneau-release.sh
index 5e18f48..6c1d7f1 100755
--- a/juneau-release.sh
+++ b/juneau-release.sh
@@ -29,7 +29,7 @@ function success {
echo '***** SUCCESS
*****************************************************************'
echo
'*******************************************************************************'
echo ' '
- exit 1;
+ exit 0;
}
function message {
@@ -40,11 +40,20 @@ function message {
echo
'-------------------------------------------------------------------------------'
}
+function fail_with_message {
+ X_DATE=$(date +'%H:%M:%S')
+ echo ' '
+ echo
"-------------------------------------------------------------------------------"
+ echo "[$X_DATE] $1"
+ echo
'-------------------------------------------------------------------------------'
+ fail;
+}
+
function yprompt {
echo ' '
echo -n "$1 (Y/n): "
read prompt
- if [ "$prompt" != "Y" ] && [ "$prompt" != "" ]
+ if [ "$prompt" != "Y" ] && [ "$prompt" != "y" ] && [ "$prompt" != "" ]
then
fail;
fi
@@ -58,6 +67,9 @@ function et {
echo "Execution time: ${SECONDS}s"
}
+command -v wget || fail_with_message "wget not found"
+command -v gpg || fail_with_message "gpg not found"
+
message "Checking Java version"
java -version
yprompt "Are you using at least Java 8?";
@@ -137,7 +149,7 @@ et
echo "On Apache's Nexus instance, locate the staging repository for the code
you just released. It should be called something like orgapachejuneau-1000."
echo "Check the Updated time stamp and click to verify its Content."
-echo "Important - When all artifacts to be deployed are in the staging
repository, tick the box next to it and click Close."
+echo "IMPORTANT - When all artifacts to be deployed are in the staging
repository, tick the box next to it and click Close."
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 " "
