Skip to content

Commit 62ff2c6

Browse files
Merge branch '1.9.x' into 1.10.x
2 parents 353324b + 3e4235d commit 62ff2c6

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ insert_final_newline = true
66
[*.java]
77
indent_style = space
88
indent_size = 4
9-
continuation_indent_size = 8
9+
continuation_indent_size = 4
1010
ij_java_imports_layout = *,|,javax.**,java.**,|,$*
1111
ij_java_class_count_to_use_import_on_demand = 5
1212
ij_java_names_count_to_use_import_on_demand = 3

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ buildscript {
1313
dependencies {
1414
classpath 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1'
1515
classpath 'com.netflix.nebula:nebula-release-plugin:17.1.0'
16-
classpath 'com.netflix.nebula:nebula-publishing-plugin:20.0.0'
16+
classpath 'com.netflix.nebula:nebula-publishing-plugin:20.1.0'
1717
classpath 'com.netflix.nebula:nebula-project-plugin:10.1.2'
1818
classpath 'io.spring.nohttp:nohttp-gradle:0.0.11'
19-
classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
19+
classpath 'io.github.gradle-nexus:publish-plugin:1.3.0'
2020
classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.4.1'
2121
classpath 'de.undercouch:gradle-download-task:5.2.1'
2222
classpath 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.38'

buildscript-gradle.lockfile

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)