Skip to content

Commit 870ce7d

Browse files
olamyolamy
committed
use jetty-parent
Signed-off-by: Olivier Lamy <[email protected]>
1 parent 1630c3c commit 870ce7d

File tree

9 files changed

+195
-183
lines changed

9 files changed

+195
-183
lines changed

‎pom.xml‎

Lines changed: 108 additions & 168 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
42
<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/xsd/maven-4.0.0.xsd">
53
<modelVersion>4.0.0</modelVersion>
64

5+
<parent>
6+
<groupId>org.eclipse.jetty</groupId>
7+
<artifactId>jetty-parent</artifactId>
8+
<version>31</version>
9+
</parent>
10+
711
<groupId>org.eclipse.jetty.toolchain</groupId>
812
<artifactId>jetty-modify-sources-maven-plugin</artifactId>
913
<version>1.0.14-SNAPSHOT</version>
1014
<packaging>maven-plugin</packaging>
1115

1216
<name>jetty-modify-sources-maven-plugin Maven Plugin</name>
1317

14-
<url>https://github.com/jetty-project/${project.artifactId}</url>
15-
1618
<description>Maven Plugin used for Jetty 12 to transform sources and resources using jakarta namespace to EE8 javax namespace</description>
17-
<prerequisites>
18-
<maven>3.8.2</maven>
19-
</prerequisites>
19+
20+
<url>https://github.com/jetty-project/${project.artifactId}</url>
2021

2122
<organization>
2223
<name>Mort Bay Consulting</name>
@@ -33,58 +34,72 @@
3334
</license>
3435
</licenses>
3536

37+
<developers>
38+
<developer>
39+
<id>olamy</id>
40+
<name>Olivier Lamy</name>
41+
<email>[email protected]</email>
42+
<organization>Webtide, LLC</organization>
43+
<organizationUrl>https://webtide.com</organizationUrl>
44+
<timezone>Australia/Brisbane</timezone>
45+
</developer>
46+
</developers>
47+
<prerequisites>
48+
<maven>3.8.2</maven>
49+
</prerequisites>
50+
3651
<scm>
3752
<connection>scm:git:https://github.com/jetty-project/${project.artifactId}.git</connection>
38-
<developerConnection>scm:git:[email protected]:jetty-project/${project.artifactId}.git</developerConnection>
39-
<url>https://github.com/jetty-project/${project.artifactId}</url>
53+
<developerConnection>scm:git:https://github.com/jetty-project/${project.artifactId}.git</developerConnection>
4054
<tag>HEAD</tag>
55+
<url>https://github.com/jetty-project/${project.artifactId}</url>
4156
</scm>
4257
<issueManagement>
4358
<system>github</system>
4459
<url>https://github.com/jetty-project/${project.artifactId}/issues</url>
4560
</issueManagement>
4661

4762
<properties>
48-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
49-
<maven.compiler.source>11</maven.compiler.source>
50-
<maven.compiler.target>11</maven.compiler.target>
51-
<maven.version>3.9.5</maven.version>
5263
<javaparser.version>3.26.4</javaparser.version>
64+
<jdk.version.minimum>17</jdk.version.minimum>
65+
<maven.version>3.9.5</maven.version>
66+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5367
</properties>
5468

55-
<developers>
56-
<developer>
57-
<id>olamy</id>
58-
<name>Olivier Lamy</name>
59-
<email>[email protected]</email>
60-
<organization>Webtide, LLC</organization>
61-
<organizationUrl>https://webtide.com</organizationUrl>
62-
<timezone>Australia/Brisbane</timezone>
63-
</developer>
64-
</developers>
65-
66-
<distributionManagement>
67-
<repository>
68-
<id>oss.sonatype.org</id>
69-
<name>Jetty Staging Repository</name>
70-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
71-
</repository>
72-
<snapshotRepository>
73-
<id>oss.sonatype.org</id>
74-
<name>Jetty Snapshot Repository</name>
75-
<url>https://oss.sonatype.org/content/repositories/jetty-snapshots/</url>
76-
</snapshotRepository>
77-
</distributionManagement>
78-
7969
<dependencies>
8070
<dependency>
8171
<groupId>com.github.javaparser</groupId>
8272
<artifactId>javaparser-core</artifactId>
8373
<version>${javaparser.version}</version>
8474
</dependency>
75+
<dependency>
76+
<groupId>commons-io</groupId>
77+
<artifactId>commons-io</artifactId>
78+
<version>2.20.0</version>
79+
</dependency>
80+
<dependency>
81+
<groupId>org.apache.commons</groupId>
82+
<artifactId>commons-lang3</artifactId>
83+
<version>3.17.0</version>
84+
</dependency>
85+
<dependency>
86+
<groupId>org.apache.commons</groupId>
87+
<artifactId>commons-text</artifactId>
88+
<version>1.13.1</version>
89+
</dependency>
90+
<dependency>
91+
<groupId>org.apache.maven.shared</groupId>
92+
<artifactId>maven-filtering</artifactId>
93+
<version>3.4.0</version>
94+
</dependency>
95+
<dependency>
96+
<groupId>org.hamcrest</groupId>
97+
<artifactId>hamcrest</artifactId>
98+
<version>3.0</version>
99+
</dependency>
85100
<dependency>
86101
<groupId>org.apache.maven</groupId>
87-
<artifactId>maven-plugin-api</artifactId>
102+
<artifactId>maven-artifact</artifactId>
88103
<version>${maven.version}</version>
89104
<scope>provided</scope>
90105
</dependency>
@@ -96,48 +111,28 @@
96111
</dependency>
97112
<dependency>
98113
<groupId>org.apache.maven</groupId>
99-
<artifactId>maven-artifact</artifactId>
114+
<artifactId>maven-plugin-api</artifactId>
100115
<version>${maven.version}</version>
101116
<scope>provided</scope>
102117
</dependency>
103-
<dependency>
104-
<groupId>org.apache.maven</groupId>
105-
<artifactId>maven-compat</artifactId>
106-
<version>${maven.version}</version>
107-
<scope>test</scope>
108-
</dependency>
109118
<dependency>
110119
<groupId>org.apache.maven.plugin-tools</groupId>
111120
<artifactId>maven-plugin-annotations</artifactId>
112121
<version>3.15.1</version>
113122
<scope>provided</scope>
114123
</dependency>
115-
<dependency>
116-
<groupId>org.apache.maven.shared</groupId>
117-
<artifactId>maven-filtering</artifactId>
118-
<version>3.4.0</version>
119-
</dependency>
120-
<dependency>
121-
<groupId>commons-io</groupId>
122-
<artifactId>commons-io</artifactId>
123-
<version>2.20.0</version>
124-
</dependency>
125-
<dependency>
126-
<groupId>org.apache.commons</groupId>
127-
<artifactId>commons-lang3</artifactId>
128-
<version>3.17.0</version>
129-
</dependency>
130-
<dependency>
131-
<groupId>org.apache.commons</groupId>
132-
<artifactId>commons-text</artifactId>
133-
<version>1.13.1</version>
134-
</dependency>
135124
<dependency>
136125
<groupId>junit</groupId>
137126
<artifactId>junit</artifactId>
138127
<version>4.13.2</version>
139128
<scope>test</scope>
140129
</dependency>
130+
<dependency>
131+
<groupId>org.apache.maven</groupId>
132+
<artifactId>maven-compat</artifactId>
133+
<version>${maven.version}</version>
134+
<scope>test</scope>
135+
</dependency>
141136
<dependency>
142137
<groupId>org.apache.maven.plugin-testing</groupId>
143138
<artifactId>maven-plugin-testing-harness</artifactId>
@@ -150,11 +145,6 @@
150145
<version>1.7.36</version>
151146
<scope>test</scope>
152147
</dependency>
153-
<dependency>
154-
<groupId>org.hamcrest</groupId>
155-
<artifactId>hamcrest</artifactId>
156-
<version>3.0</version>
157-
</dependency>
158148
</dependencies>
159149

160150
<build>
@@ -167,13 +157,13 @@
167157
</plugin>
168158
<plugin>
169159
<groupId>org.apache.maven.plugins</groupId>
170-
<artifactId>maven-resources-plugin</artifactId>
171-
<version>3.3.1</version>
160+
<artifactId>maven-compiler-plugin</artifactId>
161+
<version>3.12.1</version>
172162
</plugin>
173163
<plugin>
174164
<groupId>org.apache.maven.plugins</groupId>
175-
<artifactId>maven-compiler-plugin</artifactId>
176-
<version>3.12.1</version>
165+
<artifactId>maven-deploy-plugin</artifactId>
166+
<version>3.1.4</version>
177167
</plugin>
178168
<plugin>
179169
<groupId>org.apache.maven.plugins</groupId>
@@ -182,13 +172,13 @@
182172
</plugin>
183173
<plugin>
184174
<groupId>org.apache.maven.plugins</groupId>
185-
<artifactId>maven-plugin-plugin</artifactId>
186-
<version>3.11.0</version>
175+
<artifactId>maven-install-plugin</artifactId>
176+
<version>3.1.4</version>
187177
</plugin>
188178
<plugin>
189179
<groupId>org.apache.maven.plugins</groupId>
190-
<artifactId>maven-surefire-plugin</artifactId>
191-
<version>3.5.3</version>
180+
<artifactId>maven-invoker-plugin</artifactId>
181+
<version>3.9.1</version>
192182
</plugin>
193183
<plugin>
194184
<groupId>org.apache.maven.plugins</groupId>
@@ -202,18 +192,26 @@
202192
</plugin>
203193
<plugin>
204194
<groupId>org.apache.maven.plugins</groupId>
205-
<artifactId>maven-install-plugin</artifactId>
206-
<version>3.1.4</version>
195+
<artifactId>maven-plugin-plugin</artifactId>
196+
<version>3.11.0</version>
207197
</plugin>
208198
<plugin>
209199
<groupId>org.apache.maven.plugins</groupId>
210-
<artifactId>maven-deploy-plugin</artifactId>
211-
<version>3.1.4</version>
200+
<artifactId>maven-release-plugin</artifactId>
201+
<version>3.1.1</version>
202+
<configuration>
203+
<useReleaseProfile>false</useReleaseProfile>
204+
<goals>deploy</goals>
205+
<arguments>-Peclipse-release -DskipTests</arguments>
206+
<preparationGoals>clean install</preparationGoals>
207+
<mavenExecutorId>forked-path</mavenExecutorId>
208+
<localCheckout>true</localCheckout>
209+
</configuration>
212210
</plugin>
213211
<plugin>
214212
<groupId>org.apache.maven.plugins</groupId>
215-
<artifactId>maven-invoker-plugin</artifactId>
216-
<version>3.9.1</version>
213+
<artifactId>maven-resources-plugin</artifactId>
214+
<version>3.3.1</version>
217215
</plugin>
218216
<plugin>
219217
<groupId>org.apache.maven.plugins</groupId>
@@ -222,43 +220,12 @@
222220
</plugin>
223221
<plugin>
224222
<groupId>org.apache.maven.plugins</groupId>
225-
<artifactId>maven-release-plugin</artifactId>
226-
<version>3.1.1</version>
227-
<configuration>
228-
<useReleaseProfile>false</useReleaseProfile>
229-
<goals>deploy</goals>
230-
<arguments>-Peclipse-release -DskipTests</arguments>
231-
<preparationGoals>clean install</preparationGoals>
232-
<mavenExecutorId>forked-path</mavenExecutorId>
233-
<localCheckout>true</localCheckout>
234-
</configuration>
223+
<artifactId>maven-surefire-plugin</artifactId>
224+
<version>3.5.3</version>
235225
</plugin>
236226
</plugins>
237227
</pluginManagement>
238228
<plugins>
239-
<plugin>
240-
<groupId>org.apache.maven.plugins</groupId>
241-
<artifactId>maven-plugin-plugin</artifactId>
242-
<version>3.11.0</version>
243-
<configuration>
244-
<!-- <goalPrefix>maven-archetype-plugin</goalPrefix> -->
245-
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
246-
</configuration>
247-
<executions>
248-
<execution>
249-
<id>mojo-descriptor</id>
250-
<goals>
251-
<goal>descriptor</goal>
252-
</goals>
253-
</execution>
254-
<execution>
255-
<id>help-goal</id>
256-
<goals>
257-
<goal>helpmojo</goal>
258-
</goals>
259-
</execution>
260-
</executions>
261-
</plugin>
262229
<plugin>
263230
<groupId>org.apache.maven.plugins</groupId>
264231
<artifactId>maven-invoker-plugin</artifactId>
@@ -288,57 +255,30 @@
288255
</execution>
289256
</executions>
290257
</plugin>
258+
<plugin>
259+
<groupId>org.apache.maven.plugins</groupId>
260+
<artifactId>maven-plugin-plugin</artifactId>
261+
<version>3.11.0</version>
262+
<configuration>
263+
<!-- <goalPrefix>maven-archetype-plugin</goalPrefix> -->
264+
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
265+
</configuration>
266+
<executions>
267+
<execution>
268+
<id>help-goal</id>
269+
<goals>
270+
<goal>helpmojo</goal>
271+
</goals>
272+
</execution>
273+
<execution>
274+
<id>mojo-descriptor</id>
275+
<goals>
276+
<goal>descriptor</goal>
277+
</goals>
278+
</execution>
279+
</executions>
280+
</plugin>
291281
</plugins>
292282
</build>
293-
<profiles>
294-
<profile>
295-
<id>eclipse-release</id>
296-
<build>
297-
<plugins>
298-
<plugin>
299-
<inherited>true</inherited>
300-
<groupId>org.apache.maven.plugins</groupId>
301-
<artifactId>maven-deploy-plugin</artifactId>
302-
</plugin>
303-
<plugin>
304-
<groupId>org.apache.maven.plugins</groupId>
305-
<artifactId>maven-source-plugin</artifactId>
306-
<executions>
307-
<execution>
308-
<id>attach-sources</id>
309-
<goals>
310-
<goal>jar</goal>
311-
</goals>
312-
</execution>
313-
</executions>
314-
</plugin>
315-
<plugin>
316-
<groupId>org.apache.maven.plugins</groupId>
317-
<artifactId>maven-javadoc-plugin</artifactId>
318-
<executions>
319-
<execution>
320-
<id>attach-javadocs</id>
321-
<goals>
322-
<goal>jar</goal>
323-
</goals>
324-
</execution>
325-
</executions>
326-
</plugin>
327-
<plugin>
328-
<groupId>org.apache.maven.plugins</groupId>
329-
<artifactId>maven-gpg-plugin</artifactId>
330-
<executions>
331-
<execution>
332-
<id>sign-artifacts</id>
333-
<phase>verify</phase>
334-
<goals>
335-
<goal>sign</goal>
336-
</goals>
337-
</execution>
338-
</executions>
339-
</plugin>
340-
</plugins>
341-
</build>
342-
</profile>
343-
</profiles>
283+
344284
</project>

0 commit comments

Comments
 (0)