Merge branch '0.6.x'

wilkinsona · wilkinsona · commit 3fcfd6e80e6a · 2019-03-25T09:45:31.000Z
diff --git a/README.md b/README.md
@@ -27,4 +27,4 @@ license][7].
 [4]: CODE_OF_CONDUCT.md
 [5]: https://help.github.com/articles/using-pull-requests/
 [6]: CONTRIBUTING.md
-[7]: http://www.apache.org/licenses/LICENSE-2.0.html
+[7]: https://www.apache.org/licenses/LICENSE-2.0.html
diff --git a/src/main/java/io/spring/gradle/dependencymanagement/internal/ExclusionConfiguringAction.java b/src/main/java/io/spring/gradle/dependencymanagement/internal/ExclusionConfiguringAction.java
@@ -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/src/main/java/io/spring/gradle/dependencymanagement/internal/Exclusions.java b/src/main/java/io/spring/gradle/dependencymanagement/internal/Exclusions.java
@@ -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/src/main/java/io/spring/gradle/dependencymanagement/internal/Versions.java b/src/main/java/io/spring/gradle/dependencymanagement/internal/Versions.java
@@ -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/src/main/java/io/spring/gradle/dependencymanagement/package-info.java b/src/main/java/io/spring/gradle/dependencymanagement/package-info.java
@@ -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/src/test/groovy/io/spring/gradle/dependencymanagement/DependencyManagementPluginSpec.groovy b/src/test/groovy/io/spring/gradle/dependencymanagement/DependencyManagementPluginSpec.groovy
@@ -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/src/test/groovy/io/spring/gradle/dependencymanagement/internal/report/DependencyManagementReportRendererSpec.groovy b/src/test/groovy/io/spring/gradle/dependencymanagement/internal/report/DependencyManagementReportRendererSpec.groovy
@@ -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/src/test/groovy/io/spring/gradle/dependencymanagement/internal/report/DependencyManagementReportTaskSpec.groovy b/src/test/groovy/io/spring/gradle/dependencymanagement/internal/report/DependencyManagementReportTaskSpec.groovy
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`6`	`6`	`* You may obtain a copy of the License at`
`7`	`7`	`*`
`8`		`- * http://www.apache.org/licenses/LICENSE-2.0`
	`8`	`+ * https://www.apache.org/licenses/LICENSE-2.0`
`9`	`9`	`*`
`10`	`10`	`* Unless required by applicable law or agreed to in writing, software`
`11`	`11`	`* distributed under the License is distributed on an "AS IS" BASIS,`