Skip to content

Commit

Permalink
Merge branch 'master' into deleteGhEndpoints
Browse files Browse the repository at this point in the history
  • Loading branch information
carlossg authored May 5, 2021
2 parents b77ec86 + 635b1c6 commit aa12093
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
11 changes: 11 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
root = true

[*]
indent_style = space
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
trim_trailing_whitespace = false
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</licenses>

<properties>
<revision>2.10.3</revision>
<revision>2.10.4</revision>
<changelist>-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<hpi.compatibleSinceVersion>2.2.0</hpi.compatibleSinceVersion>
Expand Down Expand Up @@ -119,7 +119,7 @@
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.277.x</artifactId>
<version>28</version>
<version>29</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand All @@ -141,7 +141,7 @@
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.10.1</version>
<version>2.11.0</version>
<executions>
<execution>
<id>spotless-check</id>
Expand Down

0 comments on commit aa12093

Please sign in to comment.