From 6eca29600dc6a0db8b36629f4276d52402b2cb23 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Wed, 16 Dec 2020 13:38:10 +0000
Subject: [PATCH] 8258420: Move URL configuration from Docs.gmk to conf dir

Reviewed-by: alanb
---
 make/Docs.gmk          |  9 +++------
 make/conf/javadoc.conf | 30 ++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 make/conf/javadoc.conf

diff --git a/make/Docs.gmk b/make/Docs.gmk
index 1f7a0caf819..9b940c63821 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -57,14 +57,11 @@ $(eval $(call IncludeCustomExtension, Docs.gmk))
 ################################################################################
 # Javadoc settings
 
+# Include configuration for URLs in generated javadoc
+include $(TOPDIR)/make/conf/javadoc.conf
+
 MODULES_SOURCE_PATH := $(call PathList, $(call GetModuleSrcPath) )
 
-# URLs
-JAVADOC_BASE_URL := https://docs.oracle.com/pls/topic/lookup?ctx=javase$(VERSION_NUMBER)&amp;id=homepage
-BUG_SUBMIT_URL := https://bugreport.java.com/bugreport/
-COPYRIGHT_URL := legal/copyright.html
-LICENSE_URL := https://www.oracle.com/java/javase/terms/license/java$(VERSION_NUMBER)speclicense.html
-REDISTRIBUTION_URL := https://www.oracle.com/technetwork/java/redist-137594.html
 
 # In order to get a specific ordering it's necessary to specify the total
 # ordering of tags as the tags are otherwise ordered in order of definition.
diff --git a/make/conf/javadoc.conf b/make/conf/javadoc.conf
new file mode 100644
index 00000000000..df25452533a
--- /dev/null
+++ b/make/conf/javadoc.conf
@@ -0,0 +1,30 @@
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# URLs
+JAVADOC_BASE_URL=https://docs.oracle.com/pls/topic/lookup?ctx=javase$(VERSION_NUMBER)&amp;id=homepage
+BUG_SUBMIT_URL=https://bugreport.java.com/bugreport/
+COPYRIGHT_URL=legal/copyright.html
+LICENSE_URL=https://www.oracle.com/java/javase/terms/license/java$(VERSION_NUMBER)speclicense.html
+REDISTRIBUTION_URL=https://www.oracle.com/technetwork/java/redist-137594.html