Skip to content

Commit 0a43778

Browse files
basilbasil
authored
Update build (#179)
1 parent fa6e28c commit 0a43778

File tree

2 files changed

+12
-152
lines changed

2 files changed

+12
-152
lines changed

‎Jenkinsfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
* allowing one to test against multiple Jenkins versions.
55
*/
66
buildPlugin(useContainerAgent: true, configurations: [
7-
[ platform: 'linux', jdk: '8' ],
8-
[ platform: 'linux', jdk: '11' ],
9-
[ platform: 'windows', jdk: '11' ]
7+
[platform: 'linux', jdk: 21],
8+
[platform: 'windows', jdk: 17],
109
])

‎pom.xml‎

Lines changed: 10 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@
1717
<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">
1818
<modelVersion>4.0.0</modelVersion>
1919

20+
<parent>
21+
<groupId>io.jenkins.tools</groupId>
22+
<artifactId>central-repository-pom</artifactId>
23+
<version>1.5</version>
24+
<relativePath />
25+
</parent>
26+
2027
<groupId>com.cloudbees</groupId>
2128
<artifactId>syslog-java-client</artifactId>
2229
<version>1.1.8-SNAPSHOT</version>
@@ -88,30 +95,6 @@
8895
</dependencies>
8996

9097
<build>
91-
<pluginManagement>
92-
<plugins>
93-
<plugin>
94-
<groupId>org.apache.maven.plugins</groupId>
95-
<artifactId>maven-compiler-plugin</artifactId>
96-
<version>3.14.0</version>
97-
</plugin>
98-
<plugin>
99-
<groupId>org.apache.maven.plugins</groupId>
100-
<artifactId>maven-javadoc-plugin</artifactId>
101-
<version>3.11.2</version>
102-
</plugin>
103-
<plugin>
104-
<groupId>org.apache.maven.plugins</groupId>
105-
<artifactId>maven-source-plugin</artifactId>
106-
<version>3.3.1</version>
107-
</plugin>
108-
<plugin>
109-
<groupId>org.apache.maven.plugins</groupId>
110-
<artifactId>maven-surefire-plugin</artifactId>
111-
<version>3.5.3</version>
112-
</plugin>
113-
</plugins>
114-
</pluginManagement>
11598
<plugins>
11699
<plugin>
117100
<groupId>com.github.spotbugs</groupId>
@@ -143,18 +126,17 @@
143126
<execution>
144127
<id>display-info</id>
145128
<goals>
146-
<goal>display-info</goal>
147129
<goal>enforce</goal>
148130
</goals>
149131
<phase>validate</phase>
150132
<configuration>
151133
<rules>
152134
<requireMavenVersion>
153-
<version>[3.8.1,)</version>
154-
<message>3.8.1 required to no longer download dependencies via HTTP (use HTTPS instead).</message>
135+
<version>[3.9.6,)</version>
136+
<message>3.9.6 to use Maven plugins using JDK17 bytecode.</message>
155137
</requireMavenVersion>
156138
<requireJavaVersion>
157-
<version>[1.8.0,]</version>
139+
<version>[${maven.compiler.release},)</version>
158140
</requireJavaVersion>
159141
<bannedDependencies>
160142
<excludes>
@@ -167,130 +149,9 @@
167149
</execution>
168150
</executions>
169151
</plugin>
170-
<plugin>
171-
<groupId>org.apache.maven.plugins</groupId>
172-
<artifactId>maven-javadoc-plugin</artifactId>
173-
<configuration>
174-
<doclint>all,-missing,-reference</doclint>
175-
<locale>en_US</locale>
176-
</configuration>
177-
</plugin>
178-
<plugin>
179-
<groupId>org.apache.maven.plugins</groupId>
180-
<artifactId>maven-release-plugin</artifactId>
181-
<version>3.1.1</version>
182-
<configuration>
183-
<useReleaseProfile>false</useReleaseProfile>
184-
<releaseProfiles>jenkins-release</releaseProfiles>
185-
</configuration>
186-
</plugin>
187-
<plugin>
188-
<groupId>org.sonatype.plugins</groupId>
189-
<artifactId>nexus-staging-maven-plugin</artifactId>
190-
<version>1.7.0</version>
191-
<extensions>true</extensions>
192-
<configuration>
193-
<serverId>sonatype-nexus-staging</serverId>
194-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
195-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
196-
</configuration>
197-
</plugin>
198152
</plugins>
199153
</build>
200154
<profiles>
201-
<profile>
202-
<id>jdk-8-and-below</id>
203-
<activation>
204-
<jdk>(,1.8]</jdk>
205-
</activation>
206-
<build>
207-
<plugins>
208-
<plugin>
209-
<artifactId>maven-compiler-plugin</artifactId>
210-
<configuration>
211-
<source>1.8</source>
212-
<target>1.8</target>
213-
<testSource>1.8</testSource>
214-
<testTarget>1.8</testTarget>
215-
</configuration>
216-
</plugin>
217-
<plugin>
218-
<artifactId>maven-javadoc-plugin</artifactId>
219-
<configuration>
220-
<source>1.8</source>
221-
</configuration>
222-
</plugin>
223-
</plugins>
224-
</build>
225-
</profile>
226-
<profile>
227-
<id>jdk-9-and-above</id>
228-
<activation>
229-
<jdk>[9,)</jdk>
230-
</activation>
231-
<build>
232-
<plugins>
233-
<plugin>
234-
<artifactId>maven-compiler-plugin</artifactId>
235-
<configuration>
236-
<release>8</release>
237-
<testRelease>8</testRelease>
238-
</configuration>
239-
</plugin>
240-
<plugin>
241-
<artifactId>maven-javadoc-plugin</artifactId>
242-
<configuration>
243-
<release>8</release>
244-
</configuration>
245-
</plugin>
246-
</plugins>
247-
</build>
248-
</profile>
249-
<profile>
250-
<id>jenkins-release</id>
251-
<build>
252-
<plugins>
253-
<plugin>
254-
<groupId>org.apache.maven.plugins</groupId>
255-
<artifactId>maven-gpg-plugin</artifactId>
256-
<version>3.2.7</version>
257-
<executions>
258-
<execution>
259-
<id>sign-artifacts</id>
260-
<goals>
261-
<goal>sign</goal>
262-
</goals>
263-
<phase>verify</phase>
264-
</execution>
265-
</executions>
266-
</plugin>
267-
<plugin>
268-
<groupId>org.apache.maven.plugins</groupId>
269-
<artifactId>maven-javadoc-plugin</artifactId>
270-
<executions>
271-
<execution>
272-
<id>attach-javadocs</id>
273-
<goals>
274-
<goal>jar</goal>
275-
</goals>
276-
</execution>
277-
</executions>
278-
</plugin>
279-
<plugin>
280-
<groupId>org.apache.maven.plugins</groupId>
281-
<artifactId>maven-source-plugin</artifactId>
282-
<executions>
283-
<execution>
284-
<id>attach-sources</id>
285-
<goals>
286-
<goal>jar-no-fork</goal>
287-
</goals>
288-
</execution>
289-
</executions>
290-
</plugin>
291-
</plugins>
292-
</build>
293-
</profile>
294155
<profile>
295156
<id>network-constrained</id>
296157
<activation>

0 commit comments

Comments
 (0)