Skip to content

Commit b3f0136

Browse files
committed
Updated to 2.x parent POM.
1 parent 12f6ff0 commit b3f0136

File tree

2 files changed

+16
-93
lines changed

2 files changed

+16
-93
lines changed

pom.xml

Lines changed: 16 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<parent>
3030
<groupId>org.jenkins-ci.plugins</groupId>
3131
<artifactId>plugin</artifactId>
32-
<version>1.609.1</version>
32+
<version>2.3</version>
3333
</parent>
3434

3535
<artifactId>ssh-agent</artifactId>
@@ -65,11 +65,8 @@
6565
</scm>
6666

6767
<properties>
68-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
69-
<project.build.outputEncoding>UTF-8</project.build.outputEncoding>
70-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
71-
<findbugs-maven-plugin.version>3.0.1</findbugs-maven-plugin.version>
72-
<findbugs.failOnError>true</findbugs.failOnError>
68+
<jenkins.version>1.609.3</jenkins.version>
69+
<java.level>7</java.level> <!-- sshd-core is 7+ -->
7370
<workflow-jenkins-plugin.version>1.9</workflow-jenkins-plugin.version>
7471
</properties>
7572

@@ -120,12 +117,6 @@
120117
<artifactId>jnr-unixsocket-nodep</artifactId>
121118
<version>0.3.1</version>
122119
</dependency>
123-
<dependency>
124-
<groupId>com.google.code.findbugs</groupId>
125-
<artifactId>annotations</artifactId>
126-
<version>3.0.0</version>
127-
<scope>provided</scope>
128-
</dependency>
129120
<dependency>
130121
<groupId>org.jenkins-ci.plugins.workflow</groupId>
131122
<artifactId>workflow-step-api</artifactId>
@@ -176,43 +167,23 @@
176167
<classifier>tests</classifier>
177168
<scope>test</scope>
178169
</dependency>
170+
<dependency> <!-- TODO Jenkins sshd (1.6) depends on sshd-core 0.8, which is incompatible with 1.0 -->
171+
<groupId>org.jenkins-ci.main</groupId>
172+
<artifactId>jenkins-war</artifactId>
173+
<version>${jenkins.version}</version>
174+
<classifier>war-for-test</classifier>
175+
<scope>test</scope>
176+
<exclusions>
177+
<exclusion>
178+
<groupId>org.jenkins-ci.modules</groupId>
179+
<artifactId>sshd</artifactId>
180+
</exclusion>
181+
</exclusions>
182+
</dependency>
179183
</dependencies>
180184

181185
<build>
182-
<pluginManagement>
183-
<plugins>
184-
<plugin>
185-
<artifactId>maven-enforcer-plugin</artifactId>
186-
<version>1.0.1</version>
187-
<executions>
188-
<execution>
189-
<id>enforce-maven</id>
190-
<goals>
191-
<goal>enforce</goal>
192-
</goals>
193-
<configuration>
194-
<rules>
195-
<requireMavenVersion>
196-
<version>(,2.1.0),(2.1.0,2.2.0),(2.2.0,)</version>
197-
<message>Maven 2.1.0 and 2.2.0 produce incorrect GPG signatures and checksums respectively.
198-
</message>
199-
</requireMavenVersion>
200-
<requireMavenVersion>
201-
<version>(,3.0),[3.0.4,)</version>
202-
<message>Maven 3.0 through 3.0.3 inclusive do not pass correct settings.xml to Maven Release Plugin</message>
203-
</requireMavenVersion>
204-
</rules>
205-
</configuration>
206-
</execution>
207-
</executions>
208-
</plugin>
209-
</plugins>
210-
</pluginManagement>
211186
<plugins>
212-
<plugin>
213-
<artifactId>maven-release-plugin</artifactId>
214-
<version>2.5.1</version>
215-
</plugin>
216187
<plugin>
217188
<groupId>org.jenkins-ci.tools</groupId>
218189
<artifactId>maven-hpi-plugin</artifactId>
@@ -222,25 +193,6 @@
222193
<compatibleSinceVersion>1.5</compatibleSinceVersion>
223194
</configuration>
224195
</plugin>
225-
<plugin>
226-
<groupId>org.codehaus.mojo</groupId>
227-
<artifactId>findbugs-maven-plugin</artifactId>
228-
<version>${findbugs-maven-plugin.version}</version>
229-
<configuration>
230-
<excludeFilterFile>src/findbugs/excludesFilter.xml</excludeFilterFile>
231-
<failOnError>${findbugs.failOnError}</failOnError>
232-
<xmlOutput>true</xmlOutput>
233-
<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
234-
</configuration>
235-
<executions>
236-
<execution>
237-
<phase>verify</phase>
238-
<goals>
239-
<goal>check</goal>
240-
</goals>
241-
</execution>
242-
</executions>
243-
</plugin>
244196
</plugins>
245197
</build>
246198

src/findbugs/excludesFilter.xml

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)