Skip to content

Commit f4c9b12

Browse files
committed
Merge branch 'release/0.87' into main
2 parents 2946d2d + d57bdad commit f4c9b12

2 files changed

Lines changed: 63 additions & 16 deletions

File tree

pom.xml

Lines changed: 45 additions & 16 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>command-log</artifactId>
9-
<version>0.86</version>
9+
<version>0.87</version>
1010
<name>Reaktivity log Command</name>
1111
<description>Reaktivity log Command</description>
1212
<url>https://github.com/reaktivity/command-log.java</url>
@@ -50,14 +50,14 @@
5050
<checkstyle.config.location>src/conf/checkstyle/configuration.xml</checkstyle.config.location>
5151
<checkstyle.suppressions.location>src/conf/checkstyle/suppressions.xml</checkstyle.suppressions.location>
5252

53-
<reaktor.version>0.161</reaktor.version>
54-
<nukleus.plugin.version>0.84</nukleus.plugin.version>
55-
<nukleus.amqp.spec.version>0.59</nukleus.amqp.spec.version>
56-
<nukleus.mqtt.spec.version>0.60</nukleus.mqtt.spec.version>
57-
<nukleus.kafka.spec.version>0.170</nukleus.kafka.spec.version>
58-
<nukleus.http.spec.version>0.108</nukleus.http.spec.version>
59-
<nukleus.tls.spec.version>0.61</nukleus.tls.spec.version>
60-
<nukleus.proxy.spec.version>0.15</nukleus.proxy.spec.version>
53+
<reaktor.version>0.163</reaktor.version>
54+
<nukleus.plugin.version>0.85</nukleus.plugin.version>
55+
<nukleus.amqp.spec.version>0.60</nukleus.amqp.spec.version>
56+
<nukleus.mqtt.spec.version>0.61</nukleus.mqtt.spec.version>
57+
<nukleus.kafka.spec.version>0.171</nukleus.kafka.spec.version>
58+
<nukleus.http.spec.version>0.109</nukleus.http.spec.version>
59+
<nukleus.tls.spec.version>0.62</nukleus.tls.spec.version>
60+
<nukleus.proxy.spec.version>0.16</nukleus.proxy.spec.version>
6161

6262
<jacoco.coverage.ratio>1.00</jacoco.coverage.ratio>
6363
<jacoco.missed.count>0</jacoco.missed.count>
@@ -245,6 +245,7 @@
245245
<artifactId>jacoco-maven-plugin</artifactId>
246246
<version>0.8.6</version>
247247
<configuration>
248+
<propertyName>jacoco.java.option</propertyName>
248249
<rules>
249250
<rule>
250251
<element>BUNDLE</element>
@@ -272,23 +273,38 @@
272273
</execution>
273274
</executions>
274275
</plugin>
276+
<plugin>
277+
<groupId>org.moditect</groupId>
278+
<artifactId>moditect-maven-plugin</artifactId>
279+
<version>1.0.0.RC1</version>
280+
<configuration>
281+
<module>
282+
<moduleInfoFile>src/main/moditect/module-info.java</moduleInfoFile>
283+
</module>
284+
</configuration>
285+
<executions>
286+
<execution>
287+
<phase>package</phase>
288+
<goals>
289+
<goal>add-module-info</goal>
290+
</goals>
291+
</execution>
292+
</executions>
293+
</plugin>
275294
<plugin>
276295
<groupId>org.apache.maven.plugins</groupId>
277296
<artifactId>maven-surefire-plugin</artifactId>
278-
<version>2.22.1</version>
297+
<version>3.0.0-M5</version>
279298
<configuration>
280-
<argLine>@{argLine}</argLine>
281-
<excludes>
282-
<exclude/>
283-
</excludes>
299+
<argLine>@{jacoco.java.option}</argLine>
284300
</configuration>
285301
</plugin>
286302
<plugin>
287303
<groupId>org.apache.maven.plugins</groupId>
288304
<artifactId>maven-failsafe-plugin</artifactId>
289-
<version>2.22.1</version>
305+
<version>3.0.0-M4</version>
290306
<configuration>
291-
<argLine>@{argLine}</argLine>
307+
<argLine>@{jacoco.java.option}</argLine>
292308
</configuration>
293309
</plugin>
294310
</plugins>
@@ -314,6 +330,19 @@
314330
<ignore></ignore>
315331
</action>
316332
</pluginExecution>
333+
<pluginExecution>
334+
<pluginExecutionFilter>
335+
<groupId>org.moditect</groupId>
336+
<artifactId>moditect-maven-plugin</artifactId>
337+
<versionRange>[1.0.0.RC1,)</versionRange>
338+
<goals>
339+
<goal>add-module-info</goal>
340+
</goals>
341+
</pluginExecutionFilter>
342+
<action>
343+
<ignore></ignore>
344+
</action>
345+
</pluginExecution>
317346
</pluginExecutions>
318347
</lifecycleMappingMetadata>
319348
</configuration>

src/main/moditect/module-info.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/**
2+
* Copyright 2016-2021 The Reaktivity Project
3+
*
4+
* The Reaktivity Project licenses this file to you under the Apache License,
5+
* version 2.0 (the "License"); you may not use this file except in compliance
6+
* with the License. You may obtain a copy of the License at:
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13+
* License for the specific language governing permissions and limitations
14+
* under the License.
15+
*/
16+
module org.reaktivity.commands.log
17+
{
18+
}

0 commit comments

Comments
 (0)