Skip to content

Commit 61d7f81

Browse files
Update pom.xml
1 parent d4fa36a commit 61d7f81

1 file changed

Lines changed: 129 additions & 53 deletions

File tree

pom.xml

Lines changed: 129 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
Licensed to the Apache Software Foundation (ASF) under one or more
4-
contributor license agreements. See the NOTICE file distributed with
4+
contributor license agreements. See the NOTICE file distributed with
55
this work for additional information regarding copyright ownership.
66
The ASF licenses this file to You under the Apache License, Version 2.0
77
(the "License"); you may not use this file except in compliance with
8-
the License. You may obtain a copy of the License at
8+
the License. You may obtain a copy of the License at
99
1010
http://www.apache.org/licenses/LICENSE-2.0
1111
@@ -15,39 +15,63 @@
1515
See the License for the specific language governing permissions and
1616
limitations under the License.
1717
-->
18-
<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">
18+
19+
<project xmlns="http://maven.apache.org/POM/4.0.0"
20+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
22+
http://maven.apache.org/xsd/maven-4.0.0.xsd">
1923

2024
<modelVersion>4.0.0</modelVersion>
25+
2126
<groupId>de.martinspielmann.wicket</groupId>
2227
<artifactId>wicket-pwnedpasswords-validator</artifactId>
23-
<packaging>jar</packaging>
2428
<version>2.0.1-SNAPSHOT</version>
29+
<packaging>jar</packaging>
30+
2531
<name>wicket-pwnedpasswords-validator</name>
26-
<description>A validator for Apache Wicket that checks if a given password has been pwned.</description>
32+
<description>
33+
A validator for Apache Wicket that checks if a given password has been pwned.
34+
</description>
35+
2736
<url>https://github.com/pingunaut/wicket-pwnedpasswords-validator</url>
37+
2838
<licenses>
2939
<license>
3040
<name>The Apache Software License, Version 2.0</name>
3141
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
3242
<distribution>repo</distribution>
3343
</license>
3444
</licenses>
45+
3546
<properties>
47+
<java.version>21</java.version>
48+
49+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
50+
3651
<wicket.version>8.0.0</wicket.version>
3752
<jetty9.version>9.2.24.v20180105</jetty9.version>
38-
<log4j.version>2.6.2</log4j.version>
39-
<junit.version>4.12</junit.version>
40-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
53+
<junit.version>4.13.2</junit.version>
54+
55+
<maven.compiler.plugin.version>3.15.0</maven.compiler.plugin.version>
56+
<maven.surefire.plugin.version>3.2.5</maven.surefire.plugin.version>
57+
<jacoco.plugin.version>0.8.12</jacoco.plugin.version>
58+
4159
<!-- allowed values: R7, 1.0, 1.5, 2.0 or none -->
4260
<wtp.version>none</wtp.version>
4361
</properties>
4462

4563
<scm>
46-
<connection>scm:git:git@github.com:pingunaut/wicket-pwnedpasswords-validator.git</connection>
47-
<developerConnection>scm:git:git@github.com:pingunaut/wicket-pwnedpasswords-validator.git</developerConnection>
48-
<url>https://github.com/pingunaut/wicket-pwnedpasswords-validator.git</url>
49-
<tag>HEAD</tag>
50-
</scm>
64+
<connection>
65+
scm:git:git@github.com:pingunaut/wicket-pwnedpasswords-validator.git
66+
</connection>
67+
<developerConnection>
68+
scm:git:git@github.com:pingunaut/wicket-pwnedpasswords-validator.git
69+
</developerConnection>
70+
<url>
71+
https://github.com/pingunaut/wicket-pwnedpasswords-validator.git
72+
</url>
73+
<tag>HEAD</tag>
74+
</scm>
5175

5276
<developers>
5377
<developer>
@@ -58,144 +82,196 @@
5882
</developers>
5983

6084
<dependencies>
61-
<!-- WICKET DEPENDENCIES -->
85+
86+
<!-- Apache Wicket -->
6287
<dependency>
6388
<groupId>org.apache.wicket</groupId>
6489
<artifactId>wicket-core</artifactId>
6590
<version>${wicket.version}</version>
6691
</dependency>
6792

68-
<!-- JUNIT DEPENDENCY FOR TESTING -->
93+
<!-- JUnit -->
6994
<dependency>
7095
<groupId>junit</groupId>
7196
<artifactId>junit</artifactId>
7297
<version>${junit.version}</version>
7398
<scope>test</scope>
7499
</dependency>
75100

76-
<!-- JETTY DEPENDENCIES FOR TESTING -->
101+
<!-- Jetty -->
77102
<dependency>
78103
<groupId>org.eclipse.jetty.aggregate</groupId>
79104
<artifactId>jetty-all</artifactId>
80105
<version>${jetty9.version}</version>
81106
<scope>test</scope>
82107
</dependency>
108+
83109
</dependencies>
110+
84111
<build>
112+
85113
<resources>
86114
<resource>
87-
<filtering>false</filtering>
88115
<directory>src/main/resources</directory>
116+
<filtering>false</filtering>
89117
</resource>
118+
90119
<resource>
91-
<filtering>false</filtering>
92120
<directory>src/main/java</directory>
121+
<filtering>false</filtering>
122+
93123
<includes>
94124
<include>**</include>
95125
</includes>
126+
96127
<excludes>
97128
<exclude>**/*.java</exclude>
98129
</excludes>
99130
</resource>
100131
</resources>
132+
101133
<testResources>
102134
<testResource>
103-
<filtering>false</filtering>
104135
<directory>src/test/resources</directory>
136+
<filtering>false</filtering>
105137
</testResource>
138+
106139
<testResource>
107-
<filtering>false</filtering>
108140
<directory>src/test/java</directory>
141+
<filtering>false</filtering>
142+
109143
<includes>
110144
<include>**</include>
111145
</includes>
146+
112147
<excludes>
113148
<exclude>**/*.java</exclude>
114149
</excludes>
115150
</testResource>
116151
</testResources>
152+
117153
<plugins>
154+
155+
<!-- Maven Compiler -->
118156
<plugin>
119157
<groupId>org.apache.maven.plugins</groupId>
120158
<artifactId>maven-compiler-plugin</artifactId>
121-
<version>3.15.0</version>
122-
<configuration>
123-
<release>21</release>
124-
<source>21</source>
125-
<target>21</target>
126-
</configuration>
127-
</plugin>
128-
<plugin>
129-
<groupId>org.apache.maven.plugins</groupId>
130-
<artifactId>maven-release-plugin</artifactId>
131-
<version>2.5.1</version>
132-
</plugin>
133-
<plugin>
134-
<groupId>org.eclipse.jetty</groupId>
135-
<artifactId>jetty-maven-plugin</artifactId>
136-
<version>${jetty9.version}</version>
159+
<version>${maven.compiler.plugin.version}</version>
160+
137161
<configuration>
138-
<systemProperties>
139-
<systemProperty>
140-
<name>maven.project.build.directory.test-classes</name>
141-
<value>${project.build.directory}/test-classes</value>
142-
</systemProperty>
143-
</systemProperties>
144-
<jettyXml>
145-
${project.basedir}/src/test/jetty/jetty.xml,${project.basedir}/src/test/jetty/jetty-ssl.xml,${project.basedir}/src/test/jetty/jetty-http.xml,${project.basedir}/src/test/jetty/jetty-https.xml
146-
</jettyXml>
162+
<release>${java.version}</release>
163+
<source>${java.version}</source>
164+
<target>${java.version}</target>
147165
</configuration>
148166
</plugin>
167+
168+
<!-- Maven Surefire -->
149169
<plugin>
150170
<groupId>org.apache.maven.plugins</groupId>
151-
<artifactId>maven-eclipse-plugin</artifactId>
152-
<version>2.9</version>
171+
<artifactId>maven-surefire-plugin</artifactId>
172+
<version>${maven.surefire.plugin.version}</version>
173+
153174
<configuration>
154-
<downloadSources>true</downloadSources>
155-
<wtpversion>${wtp.version}</wtpversion>
175+
<argLine>${surefireArgLine}</argLine>
156176
</configuration>
157177
</plugin>
178+
179+
<!-- JaCoCo -->
158180
<plugin>
159181
<groupId>org.jacoco</groupId>
160182
<artifactId>jacoco-maven-plugin</artifactId>
161-
<version>0.8.7</version>
183+
<version>${jacoco.plugin.version}</version>
184+
162185
<executions>
186+
163187
<execution>
164188
<id>jacoco-initialize</id>
189+
165190
<goals>
166191
<goal>prepare-agent</goal>
167192
</goals>
168193
</execution>
194+
169195
<execution>
170196
<id>jacoco-report</id>
171197
<phase>prepare-package</phase>
198+
172199
<goals>
173200
<goal>report</goal>
174201
</goals>
175202
</execution>
203+
176204
<execution>
177205
<id>post-unit-test</id>
178206
<phase>test</phase>
207+
179208
<goals>
180209
<goal>report</goal>
181210
</goals>
211+
182212
<configuration>
183213
<dataFile>target/jacoco.exec</dataFile>
184214
<outputDirectory>target/jacoco-ut</outputDirectory>
185215
</configuration>
186216
</execution>
217+
187218
</executions>
219+
188220
<configuration>
189221
<propertyName>surefireArgLine</propertyName>
190222
</configuration>
191223
</plugin>
224+
225+
<!-- Jetty Maven Plugin -->
192226
<plugin>
193-
<artifactId>maven-surefire-plugin</artifactId>
194-
<version>2.21.0</version>
227+
<groupId>org.eclipse.jetty</groupId>
228+
<artifactId>jetty-maven-plugin</artifactId>
229+
<version>${jetty9.version}</version>
230+
195231
<configuration>
196-
<argLine>${surefireArgLine}</argLine>
232+
233+
<systemProperties>
234+
<systemProperty>
235+
<name>
236+
maven.project.build.directory.test-classes
237+
</name>
238+
<value>
239+
${project.build.directory}/test-classes
240+
</value>
241+
</systemProperty>
242+
</systemProperties>
243+
244+
<jettyXml>
245+
${project.basedir}/src/test/jetty/jetty.xml,
246+
${project.basedir}/src/test/jetty/jetty-ssl.xml,
247+
${project.basedir}/src/test/jetty/jetty-http.xml,
248+
${project.basedir}/src/test/jetty/jetty-https.xml
249+
</jettyXml>
250+
197251
</configuration>
198252
</plugin>
253+
254+
<!-- Maven Release Plugin -->
255+
<plugin>
256+
<groupId>org.apache.maven.plugins</groupId>
257+
<artifactId>maven-release-plugin</artifactId>
258+
<version>3.0.1</version>
259+
</plugin>
260+
261+
<!-- Eclipse Plugin -->
262+
<plugin>
263+
<groupId>org.apache.maven.plugins</groupId>
264+
<artifactId>maven-eclipse-plugin</artifactId>
265+
<version>2.10</version>
266+
267+
<configuration>
268+
<downloadSources>true</downloadSources>
269+
<wtpversion>${wtp.version}</wtpversion>
270+
</configuration>
271+
</plugin>
272+
199273
</plugins>
274+
200275
</build>
276+
201277
</project>

0 commit comments

Comments
 (0)