Skip to content

Commit 702f8e9

Browse files
committed
Merge branch 'release/0.53' into main
2 parents 132a44f + fd1c93c commit 702f8e9

3 files changed

Lines changed: 51 additions & 9 deletions

File tree

pom.xml

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>org.reaktivity</groupId>
88
<artifactId>ry</artifactId>
9-
<version>0.52</version>
9+
<version>0.53</version>
1010
<name>Reaktivity Tool for Java</name>
1111
<description>Reaktivity Tool for Java</description>
1212
<url>https://github.com/reaktivity/ry.java</url>
@@ -181,6 +181,7 @@
181181
<artifactId>jacoco-maven-plugin</artifactId>
182182
<version>0.8.6</version>
183183
<configuration>
184+
<propertyName>jacoco.java.option</propertyName>
184185
<excludes>
185186
<exclude>org/reaktivity/ry/internal/RyMain.class</exclude>
186187
</excludes>
@@ -211,24 +212,38 @@
211212
</execution>
212213
</executions>
213214
</plugin>
215+
<plugin>
216+
<groupId>org.moditect</groupId>
217+
<artifactId>moditect-maven-plugin</artifactId>
218+
<version>1.0.0.RC1</version>
219+
<configuration>
220+
<module>
221+
<moduleInfoFile>src/main/moditect/module-info.java</moduleInfoFile>
222+
</module>
223+
</configuration>
224+
<executions>
225+
<execution>
226+
<phase>package</phase>
227+
<goals>
228+
<goal>add-module-info</goal>
229+
</goals>
230+
</execution>
231+
</executions>
232+
</plugin>
214233
<plugin>
215234
<groupId>org.apache.maven.plugins</groupId>
216235
<artifactId>maven-surefire-plugin</artifactId>
217-
<version>3.0.0-M2</version>
236+
<version>3.0.0-M5</version>
218237
<configuration>
219-
<useModulePath>false</useModulePath>
220-
<argLine>@{argLine}</argLine>
221-
<excludes>
222-
<exclude/>
223-
</excludes>
238+
<argLine>@{jacoco.java.option}</argLine>
224239
</configuration>
225240
</plugin>
226241
<plugin>
227242
<groupId>org.apache.maven.plugins</groupId>
228243
<artifactId>maven-failsafe-plugin</artifactId>
229-
<version>2.22.1</version>
244+
<version>3.0.0-M4</version>
230245
<configuration>
231-
<argLine>@{argLine}</argLine>
246+
<argLine>@{jacoco.java.option}</argLine>
232247
</configuration>
233248
</plugin>
234249
<plugin>
@@ -266,6 +281,19 @@
266281
<ignore></ignore>
267282
</action>
268283
</pluginExecution>
284+
<pluginExecution>
285+
<pluginExecutionFilter>
286+
<groupId>org.moditect</groupId>
287+
<artifactId>moditect-maven-plugin</artifactId>
288+
<versionRange>[1.0.0.RC1,)</versionRange>
289+
<goals>
290+
<goal>add-module-info</goal>
291+
</goals>
292+
</pluginExecutionFilter>
293+
<action>
294+
<ignore></ignore>
295+
</action>
296+
</pluginExecution>
269297
</pluginExecutions>
270298
</lifecycleMappingMetadata>
271299
</configuration>
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<license-lookup xmlns="https://source.jasig.org/schemas/maven-notice-plugin/license-lookup" >
2+
<artifact>
3+
<groupId>com.guicedee.services</groupId>
4+
<artifactId>commons-lang3</artifactId>
5+
<version>1.1.0.7</version>
6+
<license>The Apache License, Version 2.0</license>
7+
</artifact>
8+
<artifact>
9+
<groupId>com.guicedee.services</groupId>
10+
<artifactId>commons-collections4</artifactId>
11+
<version>1.1.0.7</version>
12+
<license>The Apache License, Version 2.0</license>
13+
</artifact>
14+
</license-lookup>

0 commit comments

Comments
 (0)