Skip to content

Commit 24c5897

Browse files
basilbasil
authored
Use upstream Spotless configuration (#218)
1 parent cec5388 commit 24c5897

File tree

2 files changed

+172
-216
lines changed

2 files changed

+172
-216
lines changed

‎.mvn_exec_spotless‎

Whitespace-only changes.

‎pom.xml‎

Lines changed: 172 additions & 216 deletions
Original file line numberDiff line numberDiff line change
@@ -23,222 +23,178 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2323
THE SOFTWARE.
2424
-->
2525
<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/maven-v4_0_0.xsd">
26-
<modelVersion>4.0.0</modelVersion>
27-
<parent>
28-
<groupId>org.jenkins-ci.plugins</groupId>
29-
<artifactId>plugin</artifactId>
30-
<version>4.58</version>
31-
<relativePath />
32-
</parent>
33-
34-
<artifactId>throttle-concurrents</artifactId>
35-
<version>${revision}${changelist}</version>
36-
<packaging>hpi</packaging>
37-
<name>Jenkins Throttle Concurrent Builds Plug-in</name>
38-
<description>Plugin to throttle the number of concurrent builds of a single job per node.</description>
39-
<url>https://github.com/jenkinsci/throttle-concurrent-builds-plugin</url>
40-
41-
<licenses>
42-
<license>
43-
<name>MIT License</name>
44-
<url>https://opensource.org/licenses/MIT</url>
45-
<comments>All source code is under the MIT license.</comments>
46-
</license>
47-
</licenses>
48-
49-
<developers>
50-
<developer>
51-
<id>abayer</id>
52-
<name>Andrew Bayer</name>
53-
<email>[email protected]</email>
54-
<timezone>-8</timezone>
55-
</developer>
56-
<developer>
57-
<id>basil</id>
58-
<name>Basil Crow</name>
59-
<email>[email protected]</email>
60-
<timezone>-8</timezone>
61-
</developer>
62-
<developer>
63-
<id>oleg_nenashev</id>
64-
<name>Oleg Nenashev</name>
65-
<email>[email protected]</email>
66-
<timezone>+3</timezone>
67-
</developer>
68-
</developers>
69-
70-
<contributors>
71-
<contributor>
72-
<name>Darren Ball</name>
73-
<email>[email protected]</email>
74-
</contributor>
75-
</contributors>
76-
77-
<scm>
78-
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
79-
<developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
80-
<tag>${scmTag}</tag>
81-
<url>https://github.com/${gitHubRepo}</url>
82-
</scm>
83-
84-
<properties>
85-
<revision>2.13</revision>
86-
<changelist>-SNAPSHOT</changelist>
87-
<jenkins.version>2.361.4</jenkins.version>
88-
<gitHubRepo>jenkinsci/throttle-concurrent-builds-plugin</gitHubRepo>
89-
</properties>
90-
91-
<dependencyManagement>
92-
<dependencies>
93-
<dependency>
94-
<groupId>io.jenkins.tools.bom</groupId>
95-
<artifactId>bom-2.361.x</artifactId>
96-
<version>1981.v17df70e84a_a_1</version>
97-
<type>pom</type>
98-
<scope>import</scope>
99-
</dependency>
100-
</dependencies>
101-
</dependencyManagement>
102-
26+
<modelVersion>4.0.0</modelVersion>
27+
<parent>
28+
<groupId>org.jenkins-ci.plugins</groupId>
29+
<artifactId>plugin</artifactId>
30+
<version>4.59</version>
31+
<relativePath />
32+
</parent>
33+
34+
<artifactId>throttle-concurrents</artifactId>
35+
<version>${revision}${changelist}</version>
36+
<packaging>hpi</packaging>
37+
<name>Jenkins Throttle Concurrent Builds Plug-in</name>
38+
<description>Plugin to throttle the number of concurrent builds of a single job per node.</description>
39+
<url>https://github.com/jenkinsci/throttle-concurrent-builds-plugin</url>
40+
41+
<licenses>
42+
<license>
43+
<name>MIT License</name>
44+
<url>https://opensource.org/licenses/MIT</url>
45+
<comments>All source code is under the MIT license.</comments>
46+
</license>
47+
</licenses>
48+
49+
<developers>
50+
<developer>
51+
<id>abayer</id>
52+
<name>Andrew Bayer</name>
53+
<email>[email protected]</email>
54+
<timezone>-8</timezone>
55+
</developer>
56+
<developer>
57+
<id>basil</id>
58+
<name>Basil Crow</name>
59+
<email>[email protected]</email>
60+
<timezone>-8</timezone>
61+
</developer>
62+
<developer>
63+
<id>oleg_nenashev</id>
64+
<name>Oleg Nenashev</name>
65+
<email>[email protected]</email>
66+
<timezone>+3</timezone>
67+
</developer>
68+
</developers>
69+
70+
<contributors>
71+
<contributor>
72+
<name>Darren Ball</name>
73+
<email>[email protected]</email>
74+
</contributor>
75+
</contributors>
76+
77+
<scm>
78+
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
79+
<developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
80+
<tag>${scmTag}</tag>
81+
<url>https://github.com/${gitHubRepo}</url>
82+
</scm>
83+
84+
<properties>
85+
<revision>2.13</revision>
86+
<changelist>-SNAPSHOT</changelist>
87+
<jenkins.version>2.361.4</jenkins.version>
88+
<gitHubRepo>jenkinsci/throttle-concurrent-builds-plugin</gitHubRepo>
89+
</properties>
90+
91+
<dependencyManagement>
10392
<dependencies>
104-
<dependency>
105-
<groupId>org.jenkins-ci.plugins</groupId>
106-
<artifactId>matrix-project</artifactId>
107-
</dependency>
108-
<dependency>
109-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
110-
<artifactId>workflow-api</artifactId>
111-
</dependency>
112-
<dependency>
113-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
114-
<artifactId>workflow-durable-task-step</artifactId>
115-
</dependency>
116-
<dependency>
117-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
118-
<artifactId>workflow-step-api</artifactId>
119-
</dependency>
120-
<dependency>
121-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
122-
<artifactId>workflow-support</artifactId>
123-
</dependency>
124-
<dependency>
125-
<groupId>com.tngtech.jgiven</groupId>
126-
<artifactId>jgiven-junit</artifactId>
127-
<version>1.2.5</version>
128-
<scope>test</scope>
129-
<exclusions>
130-
<!-- Provided by Jenkins core -->
131-
<exclusion>
132-
<groupId>org.fusesource.jansi</groupId>
133-
<artifactId>jansi</artifactId>
134-
</exclusion>
135-
<exclusion>
136-
<groupId>org.slf4j</groupId>
137-
<artifactId>slf4j-api</artifactId>
138-
</exclusion>
139-
</exclusions>
140-
</dependency>
141-
142-
<!-- Dependencies for test -->
143-
<dependency>
144-
<groupId>org.jenkins-ci.plugins</groupId>
145-
<artifactId>cloudbees-folder</artifactId>
146-
<scope>test</scope>
147-
</dependency>
148-
<dependency>
149-
<groupId>org.jenkins-ci.plugins</groupId>
150-
<artifactId>matrix-auth</artifactId>
151-
<scope>test</scope>
152-
</dependency>
153-
<dependency>
154-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
155-
<artifactId>workflow-basic-steps</artifactId>
156-
<scope>test</scope>
157-
</dependency>
158-
<dependency>
159-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
160-
<artifactId>workflow-cps</artifactId>
161-
<scope>test</scope>
162-
</dependency>
163-
<dependency>
164-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
165-
<artifactId>workflow-cps</artifactId>
166-
<classifier>tests</classifier>
167-
<scope>test</scope>
168-
</dependency>
169-
<dependency>
170-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
171-
<artifactId>workflow-job</artifactId>
172-
<scope>test</scope>
173-
</dependency>
174-
<dependency>
175-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
176-
<artifactId>workflow-support</artifactId>
177-
<classifier>tests</classifier>
178-
<scope>test</scope>
179-
</dependency>
180-
<dependency>
181-
<groupId>org.jenkinsci.plugins</groupId>
182-
<artifactId>pipeline-model-definition</artifactId>
183-
<scope>test</scope>
184-
</dependency>
93+
<dependency>
94+
<groupId>io.jenkins.tools.bom</groupId>
95+
<artifactId>bom-2.361.x</artifactId>
96+
<version>1981.v17df70e84a_a_1</version>
97+
<type>pom</type>
98+
<scope>import</scope>
99+
</dependency>
185100
</dependencies>
186-
187-
<repositories>
188-
<repository>
189-
<id>repo.jenkins-ci.org</id>
190-
<url>https://repo.jenkins-ci.org/public/</url>
191-
</repository>
192-
</repositories>
193-
194-
<pluginRepositories>
195-
<pluginRepository>
196-
<id>repo.jenkins-ci.org</id>
197-
<url>https://repo.jenkins-ci.org/public/</url>
198-
</pluginRepository>
199-
</pluginRepositories>
200-
201-
<build>
202-
<plugins>
203-
<plugin>
204-
<groupId>com.diffplug.spotless</groupId>
205-
<artifactId>spotless-maven-plugin</artifactId>
206-
<version>2.36.0</version>
207-
<configuration>
208-
<java>
209-
<endWithNewline />
210-
<importOrder />
211-
<indent>
212-
<spaces>true</spaces>
213-
</indent>
214-
<palantirJavaFormat />
215-
<removeUnusedImports />
216-
<trimTrailingWhitespace />
217-
</java>
218-
<pom>
219-
<sortPom>
220-
<nrOfIndentSpace>4</nrOfIndentSpace>
221-
<encoding>${project.build.sourceEncoding}</encoding>
222-
<lineSeparator>\n</lineSeparator>
223-
<expandEmptyElements>false</expandEmptyElements>
224-
<spaceBeforeCloseEmptyElement>true</spaceBeforeCloseEmptyElement>
225-
<sortDependencies>scope,groupId,artifactId</sortDependencies>
226-
<sortDependencyExclusions>groupId,artifactId</sortDependencyExclusions>
227-
<sortModules>true</sortModules>
228-
<sortExecutions>true</sortExecutions>
229-
</sortPom>
230-
</pom>
231-
</configuration>
232-
<executions>
233-
<execution>
234-
<!-- Runs in verify phase by default -->
235-
<goals>
236-
<!-- Can be disabled using -Dspotless.check.skip -->
237-
<goal>check</goal>
238-
</goals>
239-
</execution>
240-
</executions>
241-
</plugin>
242-
</plugins>
243-
</build>
101+
</dependencyManagement>
102+
103+
<dependencies>
104+
<dependency>
105+
<groupId>org.jenkins-ci.plugins</groupId>
106+
<artifactId>matrix-project</artifactId>
107+
</dependency>
108+
<dependency>
109+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
110+
<artifactId>workflow-api</artifactId>
111+
</dependency>
112+
<dependency>
113+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
114+
<artifactId>workflow-durable-task-step</artifactId>
115+
</dependency>
116+
<dependency>
117+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
118+
<artifactId>workflow-step-api</artifactId>
119+
</dependency>
120+
<dependency>
121+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
122+
<artifactId>workflow-support</artifactId>
123+
</dependency>
124+
<dependency>
125+
<groupId>com.tngtech.jgiven</groupId>
126+
<artifactId>jgiven-junit</artifactId>
127+
<version>1.2.5</version>
128+
<scope>test</scope>
129+
<exclusions>
130+
<!-- Provided by Jenkins core -->
131+
<exclusion>
132+
<groupId>org.fusesource.jansi</groupId>
133+
<artifactId>jansi</artifactId>
134+
</exclusion>
135+
<exclusion>
136+
<groupId>org.slf4j</groupId>
137+
<artifactId>slf4j-api</artifactId>
138+
</exclusion>
139+
</exclusions>
140+
</dependency>
141+
142+
<!-- Dependencies for test -->
143+
<dependency>
144+
<groupId>org.jenkins-ci.plugins</groupId>
145+
<artifactId>cloudbees-folder</artifactId>
146+
<scope>test</scope>
147+
</dependency>
148+
<dependency>
149+
<groupId>org.jenkins-ci.plugins</groupId>
150+
<artifactId>matrix-auth</artifactId>
151+
<scope>test</scope>
152+
</dependency>
153+
<dependency>
154+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
155+
<artifactId>workflow-basic-steps</artifactId>
156+
<scope>test</scope>
157+
</dependency>
158+
<dependency>
159+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
160+
<artifactId>workflow-cps</artifactId>
161+
<scope>test</scope>
162+
</dependency>
163+
<dependency>
164+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
165+
<artifactId>workflow-cps</artifactId>
166+
<classifier>tests</classifier>
167+
<scope>test</scope>
168+
</dependency>
169+
<dependency>
170+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
171+
<artifactId>workflow-job</artifactId>
172+
<scope>test</scope>
173+
</dependency>
174+
<dependency>
175+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
176+
<artifactId>workflow-support</artifactId>
177+
<classifier>tests</classifier>
178+
<scope>test</scope>
179+
</dependency>
180+
<dependency>
181+
<groupId>org.jenkinsci.plugins</groupId>
182+
<artifactId>pipeline-model-definition</artifactId>
183+
<scope>test</scope>
184+
</dependency>
185+
</dependencies>
186+
187+
<repositories>
188+
<repository>
189+
<id>repo.jenkins-ci.org</id>
190+
<url>https://repo.jenkins-ci.org/public/</url>
191+
</repository>
192+
</repositories>
193+
194+
<pluginRepositories>
195+
<pluginRepository>
196+
<id>repo.jenkins-ci.org</id>
197+
<url>https://repo.jenkins-ci.org/public/</url>
198+
</pluginRepository>
199+
</pluginRepositories>
244200
</project>

0 commit comments

Comments
 (0)