From e9d6e40ed99ee8b999eb21d0bed521b7eb82aadb Mon Sep 17 00:00:00 2001 From: Martijn Verburg Date: Tue, 25 Sep 2018 18:34:31 +0100 Subject: [PATCH] HTTPS everywhere (#557) --- CONTRIBUTING.md | 4 ++-- LICENSE | 4 ++-- README.md | 2 +- build-farm/make-adopt-build-farm.sh | 2 +- build-farm/platform-specific-configurations/aix.sh | 2 +- .../platform-specific-configurations/linux.sh | 2 +- build-farm/platform-specific-configurations/mac.sh | 2 +- .../platform-specific-configurations/windows.sh | 2 +- build-farm/set-platform-specific-configurations.sh | 2 +- build-farm/sign-releases.sh | 2 +- configureBuild.sh | 2 +- docker-build.sh | 2 +- docker/README.md | 2 +- docker/jdk10/x86_64/ubuntu/Dockerfile | 2 +- docker/jdk10/x86_64/ubuntu/Dockerfile-openj9 | 2 +- docker/jdk8/x86_64/ubuntu/Dockerfile | 2 +- docker/jdk8/x86_64/ubuntu/Dockerfile-openj9 | 2 +- docker/jdk9/x86_64/ubuntu/Dockerfile | 2 +- docker/jdk9/x86_64/ubuntu/Dockerfile-openj9 | 2 +- docs/images/sequence.dia | 2 +- git-hg/add-branch-without-modules.sh | 4 ++-- git-hg/add-branch.sh | 6 +++--- git-hg/diff-without-getsource.sh | 4 ++-- git-hg/diff.sh | 4 ++-- git-hg/import-common.sh | 2 +- git-hg/mirrorMercurialIntoGit.sh | 8 ++++---- git-hg/setup.sh | 2 +- git-hg/setup8.sh | 2 +- git-hg/setup9.sh | 2 +- git-hg/setupAmber.sh | 2 +- git-hg/update-without-modules.sh | 6 +++--- git-hg/update.sh | 10 +++++----- git-hg/updateforesttags.sh | 8 ++++---- makejdk-any-platform.sh | 2 +- native-build.sh | 2 +- pipelines/build/build_base_file.groovy | 2 +- pipelines/build/create_job_from_template.groovy | 14 ++++++++++++++ pipelines/build/openjdk10_pipeline.groovy | 2 +- pipelines/build/openjdk11_pipeline.groovy | 2 +- pipelines/build/openjdk8_pipeline.groovy | 2 +- pipelines/build/openjdk9_pipeline.groovy | 2 +- pipelines/build/openjdk_build_pipeline.groovy | 2 +- pipelines/build/openjdk_pipeline.groovy | 2 +- sbin/build.sh | 2 +- sbin/build.template | 2 +- sbin/common/common.sh | 2 +- sbin/common/config_init.sh | 2 +- sbin/common/constants.sh | 2 +- sbin/prepareWorkspace.sh | 4 ++-- security/GenerateCertsFile.sh | 2 +- sign.sh | 2 +- signalhandler.sh | 2 +- 52 files changed, 85 insertions(+), 71 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 82382345..7e6e2434 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,7 +28,7 @@ We ask that you include a line similar to the following as part of your pull req ``` DCO 1.1 Signed-off-by: Random J Developer ``` -“DCO” stands for “Developer Certificate of Origin,” and refers to [the same text used in the Linux Kernel community](http://elinux.org/Developer_Certificate_Of_Origin). Of course, you should replace "Random J Developer" by your own real name. +“DCO” stands for “Developer Certificate of Origin,” and refers to [the same text used in the Linux Kernel community](https://elinux.org/Developer_Certificate_Of_Origin). Of course, you should replace "Random J Developer" by your own real name. By adding this simple comment, you are telling the community that you wrote the code you are contributing, or you have the right to pass on the code that you are contributing. @@ -39,7 +39,7 @@ All the project's source files must start with a comment, as near to the top of We don't place explicit copyright statements in the project source files. The project comprises many distinct pieces of code, spread across numerous source files, and authored by a variety of individuals. Managing copyright statements is unproductive and [can lead to confusion and contention around the edge cases](https://opensource.com/law/14/n2/copyright-statements-source-files). Rather we utilize [the NOTICE file](https://github.com/AdoptOpenJDK/openjdk-build/blob/master/NOTICE) mechanism as a way to acknowledge copyright broadly where there is a valid reason to do so. -Finally, for similar reasons to avoiding individual copyright statements, we don't maintain `@author` tags in source files. There are good arguments to suggest that [author tags discourage open contribution](http://producingoss.com/en/managing-volunteers.html#territoriality), and we depend upon Git to maintain that information for the project. +Finally, for similar reasons to avoiding individual copyright statements, we don't maintain `@author` tags in source files. There are good arguments to suggest that [author tags discourage open contribution](https://producingoss.com/en/managing-volunteers.html#territoriality), and we depend upon Git to maintain that information for the project. ### Ensuring high quality After we receive your pull request the [Travis pull request builder](https://travis-ci.org/AdoptOpenJDK/openjdk-build) will test your changes and ensure they meet the coding style guidelines. Watch for the results posted as a comment to the PR, and investigate and fix any failures. diff --git a/LICENSE b/LICENSE index 8f71f43f..d5dd862b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ Apache License Version 2.0, January 2004 - http://www.apache.org/licenses/ + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION @@ -192,7 +192,7 @@ 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 + https://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, diff --git a/README.md b/README.md index 1286d7af..d5a66a32 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Build Status](https://travis-ci.org/AdoptOpenJDK/openjdk-build.svg?branch=master)](https://travis-ci.org/AdoptOpenJDK/openjdk-build) [![Slack](https://slackin-jmnmplfpdu.now.sh/badge.svg)](https://slackin-jmnmplfpdu.now.sh/) AdoptOpenJDK makes use of these scripts to build binaries on the build farm at -http://ci.adoptopenjdk.net, which produces OpenJDK binaries for consumption via +https://ci.adoptopenjdk.net, which produces OpenJDK binaries for consumption via https://www.adoptopenjdk.net and https://api.adoptopenjdk.net. ## TLDR I want to build a JDK NOW! diff --git a/build-farm/make-adopt-build-farm.sh b/build-farm/make-adopt-build-farm.sh index 87618be9..c485ec0d 100755 --- a/build-farm/make-adopt-build-farm.sh +++ b/build-farm/make-adopt-build-farm.sh @@ -5,7 +5,7 @@ # 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 +# https://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, diff --git a/build-farm/platform-specific-configurations/aix.sh b/build-farm/platform-specific-configurations/aix.sh index b42664f7..61a88a01 100755 --- a/build-farm/platform-specific-configurations/aix.sh +++ b/build-farm/platform-specific-configurations/aix.sh @@ -5,7 +5,7 @@ # 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 +# https://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, diff --git a/build-farm/platform-specific-configurations/linux.sh b/build-farm/platform-specific-configurations/linux.sh index 61400fea..f310d233 100755 --- a/build-farm/platform-specific-configurations/linux.sh +++ b/build-farm/platform-specific-configurations/linux.sh @@ -5,7 +5,7 @@ # 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 +# https://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, diff --git a/build-farm/platform-specific-configurations/mac.sh b/build-farm/platform-specific-configurations/mac.sh index 376a3f06..808e951e 100755 --- a/build-farm/platform-specific-configurations/mac.sh +++ b/build-farm/platform-specific-configurations/mac.sh @@ -5,7 +5,7 @@ # 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 +# https://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, diff --git a/build-farm/platform-specific-configurations/windows.sh b/build-farm/platform-specific-configurations/windows.sh index 107aef6d..4f74bacb 100755 --- a/build-farm/platform-specific-configurations/windows.sh +++ b/build-farm/platform-specific-configurations/windows.sh @@ -5,7 +5,7 @@ # 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 +# https://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, diff --git a/build-farm/set-platform-specific-configurations.sh b/build-farm/set-platform-specific-configurations.sh index bed468b4..beb62164 100755 --- a/build-farm/set-platform-specific-configurations.sh +++ b/build-farm/set-platform-specific-configurations.sh @@ -5,7 +5,7 @@ # 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 +# https://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, diff --git a/build-farm/sign-releases.sh b/build-farm/sign-releases.sh index 17be2fa8..8ea2ab5e 100755 --- a/build-farm/sign-releases.sh +++ b/build-farm/sign-releases.sh @@ -5,7 +5,7 @@ # 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 +# https://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, diff --git a/configureBuild.sh b/configureBuild.sh index 7bc49d08..84f492c0 100755 --- a/configureBuild.sh +++ b/configureBuild.sh @@ -5,7 +5,7 @@ # 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 +# https://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, diff --git a/docker-build.sh b/docker-build.sh index 9ed5a987..6612c323 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -5,7 +5,7 @@ # 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 +# https://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, diff --git a/docker/README.md b/docker/README.md index 15ec7e29..dba7a077 100644 --- a/docker/README.md +++ b/docker/README.md @@ -5,7 +5,7 @@ Dockerfiles and build scripts for generating various Docker Images building Open # License The Dockerfiles and associated scripts found in this project are licensed under -the [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). +the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0.html). # Steps to build diff --git a/docker/jdk10/x86_64/ubuntu/Dockerfile b/docker/jdk10/x86_64/ubuntu/Dockerfile index 29241a23..d9c7f72e 100644 --- a/docker/jdk10/x86_64/ubuntu/Dockerfile +++ b/docker/jdk10/x86_64/ubuntu/Dockerfile @@ -3,7 +3,7 @@ # 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 +# https://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, diff --git a/docker/jdk10/x86_64/ubuntu/Dockerfile-openj9 b/docker/jdk10/x86_64/ubuntu/Dockerfile-openj9 index 28f42da5..1e4b7997 100644 --- a/docker/jdk10/x86_64/ubuntu/Dockerfile-openj9 +++ b/docker/jdk10/x86_64/ubuntu/Dockerfile-openj9 @@ -3,7 +3,7 @@ # 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 +# https://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, diff --git a/docker/jdk8/x86_64/ubuntu/Dockerfile b/docker/jdk8/x86_64/ubuntu/Dockerfile index 3d0c1400..48472143 100644 --- a/docker/jdk8/x86_64/ubuntu/Dockerfile +++ b/docker/jdk8/x86_64/ubuntu/Dockerfile @@ -4,7 +4,7 @@ # 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 +# https://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, diff --git a/docker/jdk8/x86_64/ubuntu/Dockerfile-openj9 b/docker/jdk8/x86_64/ubuntu/Dockerfile-openj9 index 831ea736..01356282 100644 --- a/docker/jdk8/x86_64/ubuntu/Dockerfile-openj9 +++ b/docker/jdk8/x86_64/ubuntu/Dockerfile-openj9 @@ -3,7 +3,7 @@ # 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 +# https://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, diff --git a/docker/jdk9/x86_64/ubuntu/Dockerfile b/docker/jdk9/x86_64/ubuntu/Dockerfile index 7e88f78d..5789a1de 100644 --- a/docker/jdk9/x86_64/ubuntu/Dockerfile +++ b/docker/jdk9/x86_64/ubuntu/Dockerfile @@ -3,7 +3,7 @@ # 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 +# https://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, diff --git a/docker/jdk9/x86_64/ubuntu/Dockerfile-openj9 b/docker/jdk9/x86_64/ubuntu/Dockerfile-openj9 index 831ea736..01356282 100644 --- a/docker/jdk9/x86_64/ubuntu/Dockerfile-openj9 +++ b/docker/jdk9/x86_64/ubuntu/Dockerfile-openj9 @@ -3,7 +3,7 @@ # 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 +# https://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, diff --git a/docs/images/sequence.dia b/docs/images/sequence.dia index a3386f3a..d3be5bd5 100644 --- a/docs/images/sequence.dia +++ b/docs/images/sequence.dia @@ -1,5 +1,5 @@ - + diff --git a/git-hg/add-branch-without-modules.sh b/git-hg/add-branch-without-modules.sh index 2841b4e5..b8fe3340 100755 --- a/git-hg/add-branch-without-modules.sh +++ b/git-hg/add-branch-without-modules.sh @@ -4,7 +4,7 @@ # 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 +# https://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, @@ -39,7 +39,7 @@ echo "Create $bpath" mkdir -p "$bpath" || exit 1 echo "git hg clone $bpath (root)" -git hg clone "http://hg.openjdk.java.net/$bpath" "$bpath/root" || exit 1 +git hg clone "https://hg.openjdk.java.net/$bpath" "$bpath/root" || exit 1 echo "checkout the $branch" if [ "$branch" != "" ]; then diff --git a/git-hg/add-branch.sh b/git-hg/add-branch.sh index 053efd82..1e3a39cf 100755 --- a/git-hg/add-branch.sh +++ b/git-hg/add-branch.sh @@ -4,7 +4,7 @@ # 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 +# https://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, @@ -31,13 +31,13 @@ echo "Create $bpath" mkdir -p "$bpath" || exit 1 echo "Clone $bpath (root)" -git hg clone "http://hg.openjdk.java.net/$bpath" "$bpath/root" || exit 1 +git hg clone "https://hg.openjdk.java.net/$bpath" "$bpath/root" || exit 1 # shellcheck disable=SC2154 for module in "${modules[@]}" do echo "Clone $bpath -> $module" - git hg clone "http://hg.openjdk.java.net/$bpath/$module" "$bpath/$module" || exit 1 + git hg clone "https://hg.openjdk.java.net/$bpath/$module" "$bpath/$module" || exit 1 done echo "Exit hg" diff --git a/git-hg/diff-without-getsource.sh b/git-hg/diff-without-getsource.sh index 882b1fdd..bdbb03ed 100755 --- a/git-hg/diff-without-getsource.sh +++ b/git-hg/diff-without-getsource.sh @@ -4,7 +4,7 @@ # 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 +# https://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, @@ -26,7 +26,7 @@ echo "git repo version: ${git_repo_version}" echo "hg repo version: ${hg_root_forest}/${hg_repo_version}" git clone -b master "https://github.com/AdoptOpenJDK/openjdk-${git_repo_version}.git" openjdk-git || exit 1 -hg clone "http://hg.openjdk.java.net/${hg_root_forest}/${hg_repo_version}" openjdk-hg || exit 1 +hg clone "https://hg.openjdk.java.net/${hg_root_forest}/${hg_repo_version}" openjdk-hg || exit 1 diffNum=$(diff -rq openjdk-git openjdk-hg -x '.git' -x '.hg' -x '.hgtags' | wc -l) diff --git a/git-hg/diff.sh b/git-hg/diff.sh index af198691..85be9c2b 100755 --- a/git-hg/diff.sh +++ b/git-hg/diff.sh @@ -4,7 +4,7 @@ # 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 +# https://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, @@ -26,7 +26,7 @@ echo "git repo version: ${git_repo_version}" echo "hg repo version: ${hg_root_forest}/${hg_repo_version}" git clone -b master "https://github.com/AdoptOpenJDK/openjdk-${git_repo_version}.git" openjdk-git || exit 1 -hg clone "http://hg.openjdk.java.net/${hg_root_forest}/${hg_repo_version}" openjdk-hg || exit 1 +hg clone "https://hg.openjdk.java.net/${hg_root_forest}/${hg_repo_version}" openjdk-hg || exit 1 cd openjdk-hg || exit 1 bash get_source.sh diff --git a/git-hg/import-common.sh b/git-hg/import-common.sh index bb05f061..0cf3c26d 100755 --- a/git-hg/import-common.sh +++ b/git-hg/import-common.sh @@ -4,7 +4,7 @@ # 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 +# https://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, diff --git a/git-hg/mirrorMercurialIntoGit.sh b/git-hg/mirrorMercurialIntoGit.sh index 91220990..cafa03bb 100755 --- a/git-hg/mirrorMercurialIntoGit.sh +++ b/git-hg/mirrorMercurialIntoGit.sh @@ -4,7 +4,7 @@ # 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 +# https://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, @@ -38,7 +38,7 @@ echo "You are in $WORKSPACE" function checkArgs() { if [ "$1" -lt 1 ]; then echo Usage: "$0" '[jdk-updates/jdk10u|jdk/jdk] (branch)' - echo "Hg Repo supplied should match a repository in http://hg.openjdk.java.net/" + echo "Hg Repo supplied should match a repository in https://hg.openjdk.java.net/" echo "For example, to get the latest jdk development repo:" echo "$0 jdk/jdk" echo "For example, to get the raw-string-literals branch from the amber repo:" @@ -72,8 +72,8 @@ function addMercurialUpstream() { # shellcheck disable=SC2143 if [ -z "$(git remote -v | grep 'hg')" ] ; then - echo "Initial setup of hg::http://hg.openjdk.java.net/$HG_REPO" - git remote add hg hg::http://hg.openjdk.java.net/"$HG_REPO" + echo "Initial setup of hg::https://hg.openjdk.java.net/$HG_REPO" + git remote add hg hg::https://hg.openjdk.java.net/"$HG_REPO" fi } diff --git a/git-hg/setup.sh b/git-hg/setup.sh index c133aa72..9fa57811 100755 --- a/git-hg/setup.sh +++ b/git-hg/setup.sh @@ -4,7 +4,7 @@ # 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 +# https://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, diff --git a/git-hg/setup8.sh b/git-hg/setup8.sh index 7d5f08e8..c024cb5e 100755 --- a/git-hg/setup8.sh +++ b/git-hg/setup8.sh @@ -4,7 +4,7 @@ # 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 +# https://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, diff --git a/git-hg/setup9.sh b/git-hg/setup9.sh index 068a7e96..25ea0c40 100755 --- a/git-hg/setup9.sh +++ b/git-hg/setup9.sh @@ -4,7 +4,7 @@ # 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 +# https://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, diff --git a/git-hg/setupAmber.sh b/git-hg/setupAmber.sh index 50207133..88270e20 100644 --- a/git-hg/setupAmber.sh +++ b/git-hg/setupAmber.sh @@ -4,7 +4,7 @@ # 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 +# https://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, diff --git a/git-hg/update-without-modules.sh b/git-hg/update-without-modules.sh index d335540e..805e90da 100755 --- a/git-hg/update-without-modules.sh +++ b/git-hg/update-without-modules.sh @@ -4,7 +4,7 @@ # 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 +# https://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, @@ -32,8 +32,8 @@ do pushd "$hg_root_forest/$hg_repo/root" echo "Update $hg_root_forest/$hg_repo -> (root)" - git hg fetch "http://hg.openjdk.java.net/$hg_root_forest/$hg_repo" - git hg pull "http://hg.openjdk.java.net/$hg_root_forest/$hg_repo" + git hg fetch "https://hg.openjdk.java.net/$hg_root_forest/$hg_repo" + git hg pull "https://hg.openjdk.java.net/$hg_root_forest/$hg_repo" popd echo "Exit hg" diff --git a/git-hg/update.sh b/git-hg/update.sh index a3c24b28..8e0000bb 100755 --- a/git-hg/update.sh +++ b/git-hg/update.sh @@ -4,7 +4,7 @@ # 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 +# https://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, @@ -33,8 +33,8 @@ do pushd "$hg_root_forest/$hg_repo/root" echo "Update $hg_root_forest/$hg_repo -> (root)" - git hg fetch "http://hg.openjdk.java.net/$hg_root_forest/$hg_repo" - git hg pull "http://hg.openjdk.java.net/$hg_root_forest/$hg_repo" + git hg fetch "https://hg.openjdk.java.net/$hg_root_forest/$hg_repo" + git hg pull "https://hg.openjdk.java.net/$hg_root_forest/$hg_repo" popd # shellcheck disable=SC2154 @@ -42,8 +42,8 @@ do do pushd "$hg_root_forest/$hg_repo/$module" echo "Update $hg_root_forest/$hg_repo -> $module" - git hg fetch "http://hg.openjdk.java.net/$hg_root_forest/$hg_repo/$module" - git hg pull "http://hg.openjdk.java.net/$hg_root_forest/$hg_repo/$module" + git hg fetch "https://hg.openjdk.java.net/$hg_root_forest/$hg_repo/$module" + git hg pull "https://hg.openjdk.java.net/$hg_root_forest/$hg_repo/$module" popd done diff --git a/git-hg/updateforesttags.sh b/git-hg/updateforesttags.sh index 1e4daded..1523144c 100755 --- a/git-hg/updateforesttags.sh +++ b/git-hg/updateforesttags.sh @@ -15,7 +15,7 @@ # accompanied this code). # # You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, see . +# 2 along with this work; if not, see . # # =========================================================================== @@ -36,9 +36,9 @@ GITHUB_PROJECT=git@github.com:AdoptOpenJDK GITHUB_REPO="openjdk-$OPENJDK_VERSION" case "$OPENJDK_VERSION" in - jdk8*) HG_REPO=http://hg.openjdk.java.net/jdk8u/jdk8u + jdk8*) HG_REPO=https://hg.openjdk.java.net/jdk8u/jdk8u [ -z "$TAGS" ] && TAGS="jdk8u144-b34 jdk8u151-b12 jdk8u152-b16 jdk8u161-b12 jdk8u162-b12 jdk8u172-b03 jdk8u172-b11";; - jdk9*) HG_REPO=http://hg.openjdk.java.net/jdk-updates/jdk9u + jdk9*) HG_REPO=https://hg.openjdk.java.net/jdk-updates/jdk9u [ -z "$TAGS" ] && TAGS="jdk-9+181 jdk-9.0.1+11 jdk-9.0.3+9 jdk-9.0.4+11";; *) Unknown JDK version - only jdk8u and jdk9 are supported; exit 1;; esac @@ -56,7 +56,7 @@ GIT_MINOR_VERSION=$(echo "$GIT_VERSION" | cut -d. -f2) if ! which git-remote-hg 2>/dev/null; then echo "I need git-remote-hg and could not find it" - echo "Get it from http://raw.githubusercontent.com/felipec/git-remote-hg/master/git-remote-hg" + echo "Get it from https://raw.githubusercontent.com/felipec/git-remote-hg/master/git-remote-hg" exit 1 fi diff --git a/makejdk-any-platform.sh b/makejdk-any-platform.sh index 5c1f3a82..6361c323 100755 --- a/makejdk-any-platform.sh +++ b/makejdk-any-platform.sh @@ -6,7 +6,7 @@ # 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 +# https://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, diff --git a/native-build.sh b/native-build.sh index fafc5bcf..cac32550 100755 --- a/native-build.sh +++ b/native-build.sh @@ -5,7 +5,7 @@ # 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 +# https://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, diff --git a/pipelines/build/build_base_file.groovy b/pipelines/build/build_base_file.groovy index 102acc47..9664f326 100644 --- a/pipelines/build/build_base_file.groovy +++ b/pipelines/build/build_base_file.groovy @@ -6,7 +6,7 @@ Licensed 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 + https://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, diff --git a/pipelines/build/create_job_from_template.groovy b/pipelines/build/create_job_from_template.groovy index 240615b5..d4a7deda 100644 --- a/pipelines/build/create_job_from_template.groovy +++ b/pipelines/build/create_job_from_template.groovy @@ -1,3 +1,17 @@ +/* +Licensed 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 + + https://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. +*/ + /** * A template that defines a build job. * diff --git a/pipelines/build/openjdk10_pipeline.groovy b/pipelines/build/openjdk10_pipeline.groovy index 757a3c9c..d0e99a6c 100644 --- a/pipelines/build/openjdk10_pipeline.groovy +++ b/pipelines/build/openjdk10_pipeline.groovy @@ -3,7 +3,7 @@ Licensed 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 + https://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, diff --git a/pipelines/build/openjdk11_pipeline.groovy b/pipelines/build/openjdk11_pipeline.groovy index 2ff51ee2..23b176c0 100644 --- a/pipelines/build/openjdk11_pipeline.groovy +++ b/pipelines/build/openjdk11_pipeline.groovy @@ -3,7 +3,7 @@ Licensed 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 + https://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, diff --git a/pipelines/build/openjdk8_pipeline.groovy b/pipelines/build/openjdk8_pipeline.groovy index ca1f1289..6db7fe70 100644 --- a/pipelines/build/openjdk8_pipeline.groovy +++ b/pipelines/build/openjdk8_pipeline.groovy @@ -3,7 +3,7 @@ Licensed 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 + https://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, diff --git a/pipelines/build/openjdk9_pipeline.groovy b/pipelines/build/openjdk9_pipeline.groovy index c11e0c38..7eec6b8b 100644 --- a/pipelines/build/openjdk9_pipeline.groovy +++ b/pipelines/build/openjdk9_pipeline.groovy @@ -3,7 +3,7 @@ Licensed 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 + https://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, diff --git a/pipelines/build/openjdk_build_pipeline.groovy b/pipelines/build/openjdk_build_pipeline.groovy index dc59f54c..62cfb414 100644 --- a/pipelines/build/openjdk_build_pipeline.groovy +++ b/pipelines/build/openjdk_build_pipeline.groovy @@ -3,7 +3,7 @@ Licensed 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 + https://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, diff --git a/pipelines/build/openjdk_pipeline.groovy b/pipelines/build/openjdk_pipeline.groovy index 987f0344..babd65d1 100644 --- a/pipelines/build/openjdk_pipeline.groovy +++ b/pipelines/build/openjdk_pipeline.groovy @@ -3,7 +3,7 @@ Licensed 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 + https://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, diff --git a/sbin/build.sh b/sbin/build.sh index 18c81f00..88f64216 100755 --- a/sbin/build.sh +++ b/sbin/build.sh @@ -5,7 +5,7 @@ # 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 +# https://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, diff --git a/sbin/build.template b/sbin/build.template index 16514cc6..7afdb62b 100644 --- a/sbin/build.template +++ b/sbin/build.template @@ -5,7 +5,7 @@ # 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 +# https://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, diff --git a/sbin/common/common.sh b/sbin/common/common.sh index a630b2c3..eee4abab 100755 --- a/sbin/common/common.sh +++ b/sbin/common/common.sh @@ -5,7 +5,7 @@ # 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 +# https://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, diff --git a/sbin/common/config_init.sh b/sbin/common/config_init.sh index 4b2e88af..48687352 100755 --- a/sbin/common/config_init.sh +++ b/sbin/common/config_init.sh @@ -6,7 +6,7 @@ # 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 +# https://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, diff --git a/sbin/common/constants.sh b/sbin/common/constants.sh index b3238d7a..95e11485 100755 --- a/sbin/common/constants.sh +++ b/sbin/common/constants.sh @@ -5,7 +5,7 @@ # 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 +# https://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, diff --git a/sbin/prepareWorkspace.sh b/sbin/prepareWorkspace.sh index addbe8e8..323fcebf 100755 --- a/sbin/prepareWorkspace.sh +++ b/sbin/prepareWorkspace.sh @@ -5,7 +5,7 @@ # 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 +# https://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, @@ -170,7 +170,7 @@ checkingAndDownloadingFreemarker() echo "Skipping FREEMARKER download" else - wget -nc --no-check-certificate "http://www.mirrorservice.org/sites/ftp.apache.org/freemarker/engine/${FREEMARKER_LIB_VERSION}/binaries/apache-freemarker-${FREEMARKER_LIB_VERSION}-bin.tar.gz" + wget -nc --no-check-certificate "https://www.mirrorservice.org/sites/ftp.apache.org/freemarker/engine/${FREEMARKER_LIB_VERSION}/binaries/apache-freemarker-${FREEMARKER_LIB_VERSION}-bin.tar.gz" mkdir -p "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}/freemarker-${FREEMARKER_LIB_VERSION}/" || exit tar -xzf "apache-freemarker-${FREEMARKER_LIB_VERSION}-bin.tar.gz" --strip-components=1 -C "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}/freemarker-${FREEMARKER_LIB_VERSION}/" rm "apache-freemarker-${FREEMARKER_LIB_VERSION}-bin.tar.gz" diff --git a/security/GenerateCertsFile.sh b/security/GenerateCertsFile.sh index 40611070..97f77c93 100644 --- a/security/GenerateCertsFile.sh +++ b/security/GenerateCertsFile.sh @@ -4,7 +4,7 @@ # 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 +# https://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, diff --git a/sign.sh b/sign.sh index be1d190e..90dfa19e 100755 --- a/sign.sh +++ b/sign.sh @@ -5,7 +5,7 @@ # 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 +# https://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, diff --git a/signalhandler.sh b/signalhandler.sh index 58aa144e..bcb04f2e 100755 --- a/signalhandler.sh +++ b/signalhandler.sh @@ -6,7 +6,7 @@ # 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 +# https://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,