Skip to content

Commit

Permalink
Resolve/fix nohttp violations
Browse files Browse the repository at this point in the history
  • Loading branch information
kdvolder committed Jun 5, 2019
1 parent 7f316b5 commit 8efc5ca
Show file tree
Hide file tree
Showing 14 changed files with 12 additions and 24 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ bin/

third-party-open-source-licenses.txt
**/third-party-open-source-licenses/**
nohttp-cli-*.jar
2 changes: 1 addition & 1 deletion concourse/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions headless-services/bosh-language-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,6 @@
</executions>
<configuration>
<licenseUrlReplacements>
<licenseUrlReplacement>
<regexp>http://javolution.org/LICENSE.txt</regexp>
<replacement>https://raw.githubusercontent.com/javolution/javolution/master/LICENSE</replacement>
</licenseUrlReplacement>
<licenseUrlReplacement>
<regexp>http://(.*)</regexp>
<replacement>https://$1</replacement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ under the License.
<id>mirrorId</id>
<mirrorOf>repositoryId</mirrorOf>
<name>Human Readable Name for this Mirror.</name>
<url>http://my.repository.com/repo/path</url>
<url>https://my.repository.com/repo/path</url>
</mirror>
-->
</mirrors>
Expand Down
2 changes: 1 addition & 1 deletion headless-services/commons/org.json/pom.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.ide.eclipse</groupId>
<artifactId>org.json</artifactId>
Expand Down
4 changes: 0 additions & 4 deletions headless-services/concourse-language-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,6 @@
</executions>
<configuration>
<licenseUrlReplacements>
<licenseUrlReplacement>
<regexp>http://javolution.org/LICENSE.txt</regexp>
<replacement>https://raw.githubusercontent.com/javolution/javolution/master/LICENSE</replacement>
</licenseUrlReplacement>
<licenseUrlReplacement>
<regexp>http://(.*)</regexp>
<replacement>https://$1</replacement>
Expand Down
Original file line number Diff line number Diff line change
@@ -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).
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 0 additions & 4 deletions headless-services/manifest-yaml-language-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,6 @@
</executions>
<configuration>
<licenseUrlReplacements>
<licenseUrlReplacement>
<regexp>http://javolution.org/LICENSE.txt</regexp>
<replacement>https://raw.githubusercontent.com/javolution/javolution/master/LICENSE</replacement>
</licenseUrlReplacement>
<licenseUrlReplacement>
<regexp>http://(.*)</regexp>
<replacement>https://$1</replacement>
Expand Down
4 changes: 0 additions & 4 deletions headless-services/spring-boot-language-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,6 @@
</executions>
<configuration>
<licenseUrlReplacements>
<licenseUrlReplacement>
<regexp>http://javolution.org/LICENSE.txt</regexp>
<replacement>https://raw.githubusercontent.com/javolution/javolution/master/LICENSE</replacement>
</licenseUrlReplacement>
<licenseUrlReplacement>
<regexp>http://(.*)</regexp>
<replacement>https://$1</replacement>
Expand Down
2 changes: 2 additions & 0 deletions nohttp-whitelist.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
http://sha256timestamp\.ws\.symantec\.com/sha256/timestamp
http://org\.eclipse\.ui\.intro/.*
3 changes: 2 additions & 1 deletion nohttp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "https://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>fileTypes</key>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "https://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>fileTypes</key>
Expand Down

0 comments on commit 8efc5ca

Please sign in to comment.