Skip to content

Commit 1a3e260

Browse files
nedtwiggnedtwigg
authored
Merge pull request #361 from diffplug/feature/fixHttp
Feature/fix http
2 parents 009a2ff + ecc7816 commit 1a3e260

File tree

21 files changed

+36
-26
lines changed

21 files changed

+36
-26
lines changed

‎CHANGES.md

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ You might be looking for:
99

1010
**WARNING: xml formatter in this version may be vulnerable to XXE attacks (see [#358](https://github.com/diffplug/spotless/issues/358)).**
1111

12+
* Security fix: Updated groovy, c/c++, and eclipse WTP formatters so that they download their source jars securely using `https` rather than `http` ([#360](https://github.com/diffplug/spotless/issues/360)).
13+
1214
### Version 1.18.0 - February 11th 2018 (javadoc [lib](https://diffplug.github.io/spotless/javadoc/spotless-lib/1.18.0/) [lib-extra](https://diffplug.github.io/spotless/javadoc/spotless-lib-extra/1.18.0/), artifact [lib]([jcenter](https://bintray.com/diffplug/opensource/spotless-lib), [lib-extra]([jcenter](https://bintray.com/diffplug/opensource/spotless-lib-extra)))
1315

1416
**WARNING: xml formatter in this version may be vulnerable to XXE attacks (see [#358](https://github.com/diffplug/spotless/issues/358)).**

‎CODE_OF_CONDUCT.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai
4040

4141
## Attribution
4242

43-
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
43+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://contributor-covenant.org/version/1/4][version]
4444

45-
[homepage]: http://contributor-covenant.org
46-
[version]: http://contributor-covenant.org/version/1/4/
45+
[homepage]: https://contributor-covenant.org
46+
[version]: https://contributor-covenant.org/version/1/4/

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,6 @@ extra('wtp.EclipseWtpFormatterStep') +'{{yes}} | {{yes}}
108108
- Thanks to Gábor Bernát for improvements to logging and multi-project support.
109109
- Thanks to Andrew Oberstar for improvements to formatting java source in non-java source sets. [PR #60](https://github.com/diffplug/spotless/pull/60).
110110
- Import ordering from [EclipseCodeFormatter](https://github.com/krasa/EclipseCodeFormatter).
111-
- Built by [gradle](http://gradle.org/).
112-
- Tested by [junit](http://junit.org/).
113-
- Maintained by [DiffPlug](http://www.diffplug.com/).
111+
- Built by [gradle](https://gradle.org/).
112+
- Tested by [junit](https://junit.org/).
113+
- Maintained by [DiffPlug](https://www.diffplug.com/).

‎_ext/eclipse-cdt/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ext {
33
fvgh: [ name: 'Frank Vennemeyer', email: '[email protected]' ],
44
]
55

6-
p2Repository = "http://download.eclipse.org/tools/cdt/releases/${VER_ECLIPSE_CDT}"
6+
p2Repository = "https://download.eclipse.org/tools/cdt/releases/${VER_ECLIPSE_CDT}"
77

88
p2Dependencies = [
99
'org.eclipse.cdt.core':'+', // CodeFormatter and related

‎_ext/eclipse-cdt/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Versions correspond to the Eclipse-CDT version used for the fat-JAR.
22
# See https://www.eclipse.org/cdt/ for further information about Eclipse-CDT versions.
33
# Patch version can be incremented independently for backward compatible patches of this library.
4-
ext_version=9.4.4
4+
ext_version=9.4.5
55
ext_artifactId=spotless-eclipse-cdt
66
ext_description=Eclipse's CDT C/C++ formatter bundled for Spotless
77
ext_org=diffplug

‎_ext/eclipse-groovy/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ext {
33
fvgh: [ name: 'Frank Vennemeyer', email: '[email protected]' ],
44
]
55

6-
p2Repository = "http://dist.springsource.org/release/GRECLIPSE/e${VER_ECLIPSE}"
6+
p2Repository = "https://dist.springsource.org/release/GRECLIPSE/e${VER_ECLIPSE}"
77

88
p2Dependencies = [
99
'org.codehaus.groovy.eclipse.refactoring':'+', // GroovyFormatter and related

‎_ext/eclipse-groovy/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Versions correspond to the Groovy-Eclipse version used for the fat-JAR.
22
# See https://github.com/groovy/groovy-eclipse/releases for further information about Groovy-Eclipse versions.
33
# Patch version can be incremented independently for backward compatible patches of this library.
4-
ext_version=3.0.0
4+
ext_version=3.0.1
55
ext_artifactId=spotless-eclipse-groovy
66
ext_description=Groovy Eclipse's formatter bundled for Spotless
77

‎_ext/eclipse-wtp/CHANGES.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
### Versioni 3.10.0 - TBD
44

5+
### Version 3.9.7 - February 25th 2018 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-wtp)))
6+
7+
* Replaced `http` update-site with `https` ([#360](https://github.com/diffplug/spotless/issues/360)).
8+
59
### Version 3.9.6 - February 10th 2018 ([artifact]([jcenter](https://bintray.com/diffplug/opensource/spotless-eclipse-wtp)))
610

711
* Fixed formatting of JSON arrays ([#344](https://github.com/diffplug/spotless/issues/344)).

‎_ext/eclipse-wtp/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ext {
33
fvgh: [ name: 'Frank Vennemeyer', email: '[email protected]' ],
44
]
55

6-
p2Repository = "http://download.eclipse.org/webtools/repository/${VER_ECLIPSE_WTP}"
6+
p2Repository = "https://download.eclipse.org/webtools/repository/${VER_ECLIPSE_WTP}"
77

88
p2Dependencies = [
99
// XML/HTML Formatter - Dependencies

‎_ext/eclipse-wtp/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Versions correspond to the Eclipse-WTP version used for the fat-JAR.
22
# See https://www.eclipse.org/webtools/ for further information about Eclipse-WTP versions.
33
# Patch version can be incremented independently for backward compatible patches of this library.
4-
ext_version=3.10.0
4+
ext_version=3.9.7
55
ext_artifactId=spotless-eclipse-wtp
66
ext_description=Eclipse's WTP formatters bundled for Spotless
77

‎_ext/gradle/p2-fat-jar-setup.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88
}
99
dependencies {
10-
classpath "com.diffplug.gradle:goomph:3.15.0"
10+
classpath "com.diffplug.gradle:goomph:3.17.4"
1111
}
1212
}
1313
apply plugin: com.diffplug.gradle.p2.AsMavenPlugin
@@ -73,7 +73,7 @@ p2AsMaven {
7373
p2ant {
7474
/*
7575
Define p2ant proxy settings as a closure. Refer to the API documents for instructions:
76-
https://diffplug.github.io/goomph/javadoc/3.3.0/com/diffplug/gradle/p2/AsMavenPlugin.html
76+
https://diffplug.github.io/goomph/javadoc/3.17.4/com/diffplug/gradle/p2/AsMavenPlugin.html
7777
*/
7878
if (project.hasProperty('setP2AntProxy')) {
7979
setP2AntProxy(it)

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ VER_SPOTBUGS=3.1.6
2525
VER_SPOTBUGS_PLUGIN=1.6.2
2626
VER_BINTRAY=1.7.3
2727
VER_PLUGIN_PUBLISH=0.9.7
28-
VER_GOOMPH=3.8.1
28+
VER_GOOMPH=3.17.4
2929
VER_GRADLE_GIT=1.6.0
3030
VER_PEGDOWN_DOCLET=1.3
3131

‎gradle/java-publish.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ javadoc {
2020
// use markdown in javadoc
2121
def makeLink = { url, text -> "<a href=\"${url}\" style=\"text-transform: none;\">${text}</a>" }
2222
def javadocInfo = '<h2>' + makeLink("https://github.com/${org}/${name}", "${group}:${project.ext.artifactId}:${ext.version}") +
23-
' by ' + makeLink('http://www.diffplug.com', 'DiffPlug') + '</h2>'
23+
' by ' + makeLink('https://www.diffplug.com', 'DiffPlug') + '</h2>'
2424

2525
String version_str = ext.version.endsWith('-SNAPSHOT') ? 'snapshot' : ext.version
2626
apply plugin: 'ch.raffael.pegdown-doclet'
@@ -95,7 +95,7 @@ model {
9595
licenses {
9696
license {
9797
name 'The Apache Software License, Version 2.0'
98-
url 'http://www.apache.org/license/LICENSE-2.0.txt'
98+
url 'https://www.apache.org/licenses/LICENSE-2.0.txt'
9999
distribution 'repo'
100100
}
101101
}

‎lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_cdt_formatter/v4.7.3a.lockfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Spotless formatter based on CDT version 9.4.3 (see https://www.eclipse.org/cdt/)
2-
com.diffplug.spotless:spotless-eclipse-cdt:9.4.4
2+
com.diffplug.spotless:spotless-eclipse-cdt:9.4.5
33
com.diffplug.spotless:spotless-eclipse-base:3.0.0
44
com.google.code.findbugs:annotations:3.0.0
55
com.google.code.findbugs:jsr305:3.0.0

‎lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_wtp_formatters/v4.7.3a.lockfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Spotless formatter based on Eclipse-WTP version 3.9.5 (see https://www.eclipse.org/webtools/)
2-
com.diffplug.spotless:spotless-eclipse-wtp:3.9.6
2+
com.diffplug.spotless:spotless-eclipse-wtp:3.9.7
33
com.diffplug.spotless:spotless-eclipse-base:3.0.0
44
com.google.code.findbugs:annotations:3.0.0
55
com.google.code.findbugs:jsr305:3.0.0

‎lib-extra/src/main/resources/com/diffplug/spotless/extra/groovy_eclipse_formatter/v4.8.1.lockfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Spotless formatter based on Groovy-Eclipse version 3.0.0 (see https://github.com/groovy/groovy-eclipse/releases)
2-
com.diffplug.spotless:spotless-eclipse-groovy:3.0.0
2+
com.diffplug.spotless:spotless-eclipse-groovy:3.0.1
33
com.diffplug.spotless:spotless-eclipse-base:3.0.0
44
com.google.code.findbugs:annotations:3.0.0
55
com.google.code.findbugs:jsr305:3.0.0

‎plugin-gradle/CHANGES.md

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
**WARNING: xml formatter in this version may be vulnerable to XXE attacks (see [#358](https://github.com/diffplug/spotless/issues/358)).**
66

7+
* Security fix: Updated groovy, c/c++, and eclipse WTP formatters so that they download their source jars securely using `https` rather than `http` ([#360](https://github.com/diffplug/spotless/issues/360)).
8+
79
### Version 3.18.0 - February 11th 2018 ([javadoc](https://diffplug.github.io/spotless/javadoc/spotless-plugin-gradle/3.18.0/), [jcenter](https://bintray.com/diffplug/opensource/spotless-plugin-gradle/3.18.0))
810

911
**WARNING: xml formatter in this version may be vulnerable to XXE attacks (see [#358](https://github.com/diffplug/spotless/issues/358)).**

‎plugin-gradle/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!---freshmark shields
44
output = [
55
link(shield('Gradle plugin', 'plugins.gradle.org', 'com.diffplug.gradle.spotless', 'blue'), 'https://plugins.gradle.org/plugin/com.diffplug.gradle.spotless'),
6-
link(shield('Maven central', 'mavencentral', 'com.diffplug.gradle.spotless:spotless', 'blue'), 'http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22'),
6+
link(shield('Maven central', 'mavencentral', 'com.diffplug.gradle.spotless:spotless', 'blue'), 'https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22'),
77
link(shield('Javadoc', 'javadoc', '{{stableGradle}}', 'blue'), 'https://{{org}}.github.io/{{name}}/javadoc/spotless-plugin-gradle/{{stableGradle}}/'),
88
'',
99
link(shield('Changelog', 'changelog', '{{versionGradle}}', 'brightgreen'), 'CHANGES.md'),
@@ -13,7 +13,7 @@ output = [
1313
].join('\n');
1414
-->
1515
[![Gradle plugin](https://img.shields.io/badge/plugins.gradle.org-com.diffplug.gradle.spotless-blue.svg)](https://plugins.gradle.org/plugin/com.diffplug.gradle.spotless)
16-
[![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.gradle.spotless%3Aspotless-blue.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
16+
[![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.gradle.spotless%3Aspotless-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-plugin-gradle%22)
1717
[![Javadoc](https://img.shields.io/badge/javadoc-3.18.0-blue.svg)](https://diffplug.github.io/spotless/javadoc/spotless-plugin-gradle/3.18.0/)
1818

1919
[![Changelog](https://img.shields.io/badge/changelog-3.19.0--SNAPSHOT-brightgreen.svg)](CHANGES.md)

‎plugin-maven/CHANGES.md

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
**WARNING: xml formatter in this version may be vulnerable to XXE attacks (see [#358](https://github.com/diffplug/spotless/issues/358)).**
66

7+
* Security fix: Updated groovy, c/c++, and eclipse WTP formatters so that they download their source jars securely using `https` rather than `http` ([#360](https://github.com/diffplug/spotless/issues/360)).
8+
79
### Version 1.18.0 - February 11th 2018 ([javadoc](https://diffplug.github.io/spotless/javadoc/spotless-maven-plugin/1.18.0/), [jcenter](https://bintray.com/diffplug/opensource/spotless-maven-plugin/1.18.0))
810

911
**WARNING: xml formatter in this version may be vulnerable to XXE attacks (see [#358](https://github.com/diffplug/spotless/issues/358)).**

‎plugin-maven/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<!---freshmark shields
44
output = [
5-
link(shield('Maven central', 'mavencentral', '{{group}}:{{artifactIdMaven}}', 'blue'), 'http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22{{group}}%22%20AND%20a%3A%22{{artifactIdMaven}}%22'),
5+
link(shield('Maven central', 'mavencentral', '{{group}}:{{artifactIdMaven}}', 'blue'), 'https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22{{group}}%22%20AND%20a%3A%22{{artifactIdMaven}}%22'),
66
link(shield('Javadoc', 'javadoc', '{{stableMaven}}', 'blue'), 'https://{{org}}.github.io/{{name}}/javadoc/{{artifactIdMaven}}/{{stableMaven}}/'),
77
'',
88
link(shield('Changelog', 'changelog', '{{stableMaven}}', 'brightgreen'), 'CHANGES.md'),
@@ -11,7 +11,7 @@ output = [
1111
link(shield('License Apache', 'license', 'apache', 'brightgreen'), 'https://tldrlegal.com/license/apache-license-2.0-(apache-2.0)')
1212
].join('\n');
1313
-->
14-
[![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
14+
[![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.spotless%3Aspotless--maven--plugin-blue.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22)
1515
[![Javadoc](https://img.shields.io/badge/javadoc-1.18.0-blue.svg)](https://diffplug.github.io/spotless/javadoc/spotless-maven-plugin/1.18.0/)
1616

1717
[![Changelog](https://img.shields.io/badge/changelog-1.18.0-brightgreen.svg)](CHANGES.md)
@@ -52,7 +52,7 @@ cmd> mvn spotless:check
5252
...
5353
```
5454

55-
To use it in your pom, just [add the Spotless dependency](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22), and configure it like so:
55+
To use it in your pom, just [add the Spotless dependency](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.diffplug.spotless%22%20AND%20a%3A%22spotless-maven-plugin%22), and configure it like so:
5656

5757
```xml
5858
<plugin>

‎plugin-maven/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ visteg {
1515
nodeShape = 'box'
1616
startNodeShape = 'box'
1717
endNodeShape = 'box'
18-
colorscheme = 'pastel24' // http://www.graphviz.org/doc/info/colors.html
18+
colorscheme = 'pastel24' // https://www.graphviz.org/doc/info/colors.html
1919
}
2020

2121
import com.github.mustachejava.DefaultMustacheFactory

0 commit comments

Comments
 (0)