diff --git a/.gitignore b/.gitignore index c6f84e1eda..c66c2b98d9 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ bin/ third-party-open-source-licenses.txt **/third-party-open-source-licenses/** +nohttp-cli-*.jar diff --git a/concourse/docker/Dockerfile b/concourse/docker/Dockerfile index fec19dced7..ab15788a41 100644 --- a/concourse/docker/Dockerfile +++ b/concourse/docker/Dockerfile @@ -22,7 +22,7 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ # Install Google Chrome RUN curl -sS https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \ - && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \ + && sh -c 'echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \ && apt-get update && apt-get install -y google-chrome-stable RUN npm install -g vsce diff --git a/headless-services/bosh-language-server/pom.xml b/headless-services/bosh-language-server/pom.xml index 9ec9ad25e0..941797a815 100644 --- a/headless-services/bosh-language-server/pom.xml +++ b/headless-services/bosh-language-server/pom.xml @@ -84,10 +84,6 @@ - - http://javolution.org/LICENSE.txt - https://raw.githubusercontent.com/javolution/javolution/master/LICENSE - http://(.*) https://$1 diff --git a/headless-services/commons/commons-maven/src/test/resources/maven-config/settings.xml b/headless-services/commons/commons-maven/src/test/resources/maven-config/settings.xml index 60d4c45de2..fb32f82b21 100644 --- a/headless-services/commons/commons-maven/src/test/resources/maven-config/settings.xml +++ b/headless-services/commons/commons-maven/src/test/resources/maven-config/settings.xml @@ -149,7 +149,7 @@ under the License. mirrorId repositoryId Human Readable Name for this Mirror. - http://my.repository.com/repo/path + https://my.repository.com/repo/path --> diff --git a/headless-services/commons/org.json/pom.xml b/headless-services/commons/org.json/pom.xml index da1585cf87..40b45ce817 100644 --- a/headless-services/commons/org.json/pom.xml +++ b/headless-services/commons/org.json/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 org.springframework.ide.eclipse org.json diff --git a/headless-services/concourse-language-server/pom.xml b/headless-services/concourse-language-server/pom.xml index ed43ca56ec..526dd6c665 100644 --- a/headless-services/concourse-language-server/pom.xml +++ b/headless-services/concourse-language-server/pom.xml @@ -98,10 +98,6 @@ - - http://javolution.org/LICENSE.txt - https://raw.githubusercontent.com/javolution/javolution/master/LICENSE - http://(.*) https://$1 diff --git a/headless-services/concourse-language-server/src/main/resources/desc/GitSource/tag_filter.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSource/tag_filter.md index bc17098c1c..2fb18e4455 100644 --- a/headless-services/concourse-language-server/src/main/resources/desc/GitSource/tag_filter.md +++ b/headless-services/concourse-language-server/src/main/resources/desc/GitSource/tag_filter.md @@ -1,4 +1,4 @@ `tag_filter`: *Optional.* If specified, the resource will only detect commits that have a tag matching the specified expression. Patterns are -[glob(7)](http://man7.org/linux/man-pages/man7/glob.7.html) compatible (as +[glob(7)](https://man7.org/linux/man-pages/man7/glob.7.html) compatible (as in, bash compatible). \ No newline at end of file diff --git a/headless-services/concourse-language-server/src/main/resources/desc/SwiftSemverSource/openstack.md b/headless-services/concourse-language-server/src/main/resources/desc/SwiftSemverSource/openstack.md index f4fd9255eb..12f300e944 100644 --- a/headless-services/concourse-language-server/src/main/resources/desc/SwiftSemverSource/openstack.md +++ b/headless-services/concourse-language-server/src/main/resources/desc/SwiftSemverSource/openstack.md @@ -8,7 +8,7 @@ the version. * `region_name`: *Required.* The region the container is in. * `identity_endpoint`, `username`, `user_id`, `password`, `api_key`, `domain_id`, `domain_name`, `tenant_id`, `tenant_name`, `allow_reauth`, `token_id`: See below -The swift driver uses [gophercloud](http://gophercloud.io/docs/) to handle interacting +The swift driver uses [gophercloud](https://gophercloud.io/docs/) to handle interacting with OpenStack. All OpenStack Identity versions are supported through this library. The Authentication properties will pass through to it. For detailed information about the individual parameters, see https://github.com/rackspace/gophercloud/blob/master/auth_options.go \ No newline at end of file diff --git a/headless-services/manifest-yaml-language-server/pom.xml b/headless-services/manifest-yaml-language-server/pom.xml index eeb1d76da9..4c7246b447 100644 --- a/headless-services/manifest-yaml-language-server/pom.xml +++ b/headless-services/manifest-yaml-language-server/pom.xml @@ -118,10 +118,6 @@ - - http://javolution.org/LICENSE.txt - https://raw.githubusercontent.com/javolution/javolution/master/LICENSE - http://(.*) https://$1 diff --git a/headless-services/spring-boot-language-server/pom.xml b/headless-services/spring-boot-language-server/pom.xml index ac2f9f57d6..4deef4c329 100644 --- a/headless-services/spring-boot-language-server/pom.xml +++ b/headless-services/spring-boot-language-server/pom.xml @@ -174,10 +174,6 @@ - - http://javolution.org/LICENSE.txt - https://raw.githubusercontent.com/javolution/javolution/master/LICENSE - http://(.*) https://$1 diff --git a/nohttp-whitelist.txt b/nohttp-whitelist.txt new file mode 100644 index 0000000000..9dcdc07d9e --- /dev/null +++ b/nohttp-whitelist.txt @@ -0,0 +1,2 @@ + http://sha256timestamp\.ws\.symantec\.com/sha256/timestamp + http://org\.eclipse\.ui\.intro/.* \ No newline at end of file diff --git a/nohttp.sh b/nohttp.sh index 3db94056d9..7d74a3f20d 100755 --- a/nohttp.sh +++ b/nohttp.sh @@ -9,4 +9,5 @@ fi if [ ! -f nohttp-cli-${VERSION}.jar ]; then curl -s -O https://repo.maven.apache.org/maven2/io/spring/nohttp/nohttp-cli/${VERSION}/nohttp-cli-${VERSION}.jar fi -java -jar nohttp-cli-${VERSION}.jar +java -jar nohttp-cli-${VERSION}.jar -w=nohttp-whitelist.txt -F nohttp-whitelist.txt \ + -F README-dev-env.md diff --git a/vscode-extensions/vscode-spring-boot/properties-support/java-properties.tmLanguage b/vscode-extensions/vscode-spring-boot/properties-support/java-properties.tmLanguage index c9a606563f..bc15aa8aa7 100644 --- a/vscode-extensions/vscode-spring-boot/properties-support/java-properties.tmLanguage +++ b/vscode-extensions/vscode-spring-boot/properties-support/java-properties.tmLanguage @@ -1,5 +1,5 @@ - + fileTypes diff --git a/vscode-extensions/vscode-spring-boot/yaml-support/yaml.tmLanguage b/vscode-extensions/vscode-spring-boot/yaml-support/yaml.tmLanguage index 906828381b..7bea5f6eb8 100644 --- a/vscode-extensions/vscode-spring-boot/yaml-support/yaml.tmLanguage +++ b/vscode-extensions/vscode-spring-boot/yaml-support/yaml.tmLanguage @@ -1,5 +1,5 @@ - + fileTypes