Skip to content

Commit 5aa4e7d

Browse files
authored
Tidy up (#236)
Changes: * share guice version as property * up Maven deps to latest 3.9.12 * junit and testng rolled back to their original versions
1 parent 7e2ddf4 commit 5aa4e7d

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ Runtime requirements:
3636

3737
Build time requirements:
3838
* Java 17+
39-
* Maven 3.9.9+
39+
* Maven 3.9.12+

pom.xml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,12 @@
124124

125125
<!-- Versions -->
126126
<mavenRuntimeVersion>3.3.1</mavenRuntimeVersion>
127-
<mavenBuildVersion>3.9.9</mavenBuildVersion>
127+
<mavenBuildVersion>3.9.12</mavenBuildVersion>
128128
<javaBuildVersion>17</javaBuildVersion>
129129
<mavenPluginToolsVersion>3.15.2</mavenPluginToolsVersion>
130130
<asmVersion>9.9.1</asmVersion>
131131
<slf4jVersion>1.7.36</slf4jVersion>
132+
<guiceVersion>4.2.3</guiceVersion>
132133
<!-- define empty, as jacoco is only conditionally executed (https://www.eclemma.org/jacoco/trunk/doc/prepare-agent-mojo.html) -->
133134
<argLine />
134135
<njordVersion>0.9.3</njordVersion>
@@ -165,18 +166,18 @@
165166
<dependency>
166167
<groupId>com.google.inject</groupId>
167168
<artifactId>guice</artifactId>
168-
<version>4.2.3</version>
169+
<version>${guiceVersion}</version>
169170
<classifier>classes</classifier>
170171
</dependency>
171172
<dependency>
172173
<groupId>com.google.inject.extensions</groupId>
173174
<artifactId>guice-servlet</artifactId>
174-
<version>4.2.3</version>
175+
<version>${guiceVersion}</version>
175176
</dependency>
176177
<dependency>
177178
<groupId>com.google.inject.extensions</groupId>
178179
<artifactId>guice-assistedinject</artifactId>
179-
<version>4.2.3</version>
180+
<version>${guiceVersion}</version>
180181
</dependency>
181182

182183
<!-- To get rid of CVE warnings (is provided anyway) -->
@@ -263,13 +264,14 @@
263264
<dependency>
264265
<groupId>junit</groupId>
265266
<artifactId>junit</artifactId>
266-
<version>4.13.2</version>
267267
<!-- older version not supported by junit-vintage runner -->
268+
<version>4.13.2</version>
268269
</dependency>
269270
<dependency>
270271
<groupId>org.testng</groupId>
271272
<artifactId>testng</artifactId>
272-
<version>7.5.1</version>
273+
<!-- is not transitive dep; we just use annotations -->
274+
<version>6.14.3</version>
273275
</dependency>
274276
<dependency>
275277
<groupId>org.apache.felix</groupId>
@@ -302,7 +304,7 @@
302304
<dependency>
303305
<groupId>org.junit</groupId>
304306
<artifactId>junit-bom</artifactId>
305-
<version>6.0.2</version>
307+
<version>5.12.2</version>
306308
<type>pom</type>
307309
<scope>import</scope>
308310
</dependency>
@@ -492,7 +494,7 @@ Bundle-DocURL: http://www.eclipse.org/sisu/
492494
<scmCommentPrefix>|</scmCommentPrefix>
493495
<goals>deploy</goals>
494496
<signTag>true</signTag>
495-
<tagNameFormat>milestones/@{project.version}</tagNameFormat>
497+
<tagNameFormat>releases/@{project.version}</tagNameFormat>
496498
</configuration>
497499
</plugin>
498500
<plugin>

0 commit comments

Comments
 (0)