diff --git a/tools/build/bazel/javadoc.bzl b/tools/build/bazel/javadoc.bzl
index c459f7d..6493160 100644
--- a/tools/build/bazel/javadoc.bzl
+++ b/tools/build/bazel/javadoc.bzl
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-JAVA_DOCS = "-link https://docs.oracle.com/javase/11/docs/api/"
+JAVA_DOCS = "-link https://docs.oracle.com/en/java/javase/11/docs/api/"
 
 def _impl(ctx):
     dir = ctx.label.name
diff --git a/tools/build/bazel/project_javadoc.bzl b/tools/build/bazel/project_javadoc.bzl
index 7c706d0..25f91fe 100644
--- a/tools/build/bazel/project_javadoc.bzl
+++ b/tools/build/bazel/project_javadoc.bzl
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-JAVA_DOCS = "-link https://docs.oracle.com/javase/11/docs/api/"
+JAVA_DOCS = "-link https://docs.oracle.com/en/java/javase/11/docs/api/"
 
 def dump(obj):
     print(dir(obj))
diff --git a/tools/build/onos-change-version b/tools/build/onos-change-version
index a0dad83..b07d107 100755
--- a/tools/build/onos-change-version
+++ b/tools/build/onos-change-version
@@ -3,7 +3,7 @@
 # Changes ONOS version in POM files, and other release artifacts.
 # -----------------------------------------------------------------------------
 
-set -e
+set -ex
 
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 . $ONOS_ROOT/tools/build/envDefaults