Skip to content

Commit 7e40b63

Browse files
jfallowsjfallows
committed
Merge branch 'release/0.84' into main
2 parents e919c35 + 643195b commit 7e40b63

21 files changed

Lines changed: 252 additions & 49 deletions

‎.github/workflows/release.yml‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
name: release
2+
3+
on:
4+
push:
5+
tags:
6+
- '[0-9]+.[0-9]+'
7+
- '[0-9]+.[0-9]+.[0-9]+'
8+
workflow_dispatch:
9+
10+
jobs:
11+
release:
12+
name: Release
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v2
17+
- name: Release
18+
uses: softprops/action-gh-release@v1
19+
env:
20+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
21+
22+
publish:
23+
needs: release
24+
name: Publish
25+
runs-on: ubuntu-latest
26+
27+
steps:
28+
- name: Checkout GitHub sources
29+
uses: actions/checkout@v2
30+
- name: Setup GitHub Packages
31+
uses: actions/setup-java@v1
32+
with:
33+
java-version: 9
34+
- name: Resolve from GitHub Packages
35+
run: ./mvnw -B -Pgithub.packages dependency:copy
36+
env:
37+
GITHUB_TOKEN: ${{ github.token }}
38+
- name: Setup Maven Central
39+
uses: actions/setup-java@v1
40+
with:
41+
java-version: 9
42+
server-id: ossrh
43+
server-username: OSSRH_USERNAME
44+
server-password: OSSRH_PASSWORD
45+
gpg-private-key: ${{ secrets.OSSRH_SIGNER_KEY }}
46+
gpg-passphrase: OSSRH_SIGNER_PASSPHRASE
47+
- name: Deploy to Maven Central
48+
id: deploy
49+
continue-on-error: true
50+
run: ./mvnw -B -Possrh com.github.genthaler:beanshell-maven-plugin:run build-helper:attach-artifact gpg:sign nexus-staging:deploy
51+
env:
52+
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
53+
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
54+
OSSRH_SIGNER_PASSPHRASE: ${{ secrets.OSSRH_SIGNER_PASSPHRASE }}
55+
- name: Notify via Slack
56+
uses: 8398a7/action-slack@v3
57+
with:
58+
status: custom
59+
job_name: Publish
60+
fields: job,repo,author,took
61+
custom_payload: |
62+
{
63+
attachments: [{
64+
color: '${{ steps.deploy.outcome }}' === 'success' ? 'good' : '${{ steps.deploy.outcome }}' === 'failure' ? 'danger' : 'warning',
65+
text: `${process.env.AS_JOB} of ${process.env.AS_REPO} (${process.env.GITHUB_REF.replace(/refs\/tags\//, '')}) by ${process.env.AS_AUTHOR.replace(/\<.*\>/, '')} completed in ${process.env.AS_TOOK}`,
66+
}]
67+
}
68+
env:
69+
GITHUB_TOKEN: ${{ github.token }}
70+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
71+
if: ${{ env.SLACK_WEBHOOK_URL != null }}

‎pom.xml‎

Lines changed: 162 additions & 30 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.83</version>
9+
<version>0.84</version>
1010
<name>Reaktivity log Command</name>
1111
<description>Reaktivity log Command</description>
1212
<url>https://github.com/reaktivity/command-log.java</url>
@@ -35,6 +35,13 @@
3535
<url>https://github.com/reaktivity/command-log.java</url>
3636
</scm>
3737

38+
<repositories>
39+
<repository>
40+
<id>github</id>
41+
<url>https://maven.pkg.github.com/reaktivity/packages/</url>
42+
</repository>
43+
</repositories>
44+
3845
<properties>
3946
<maven.compiler.source>9</maven.compiler.source>
4047
<maven.compiler.target>9</maven.compiler.target>
@@ -43,14 +50,14 @@
4350
<checkstyle.config.location>src/conf/checkstyle/configuration.xml</checkstyle.config.location>
4451
<checkstyle.suppressions.location>src/conf/checkstyle/suppressions.xml</checkstyle.suppressions.location>
4552

46-
<reaktor.version>0.155</reaktor.version>
47-
<nukleus.plugin.version>0.77</nukleus.plugin.version>
48-
<nukleus.amqp.spec.version>0.57</nukleus.amqp.spec.version>
49-
<nukleus.mqtt.spec.version>0.58</nukleus.mqtt.spec.version>
50-
<nukleus.kafka.spec.version>0.168</nukleus.kafka.spec.version>
51-
<nukleus.http.spec.version>0.106</nukleus.http.spec.version>
52-
<nukleus.tls.spec.version>0.59</nukleus.tls.spec.version>
53-
<nukleus.proxy.spec.version>0.10</nukleus.proxy.spec.version>
53+
<reaktor.version>0.159</reaktor.version>
54+
<nukleus.plugin.version>0.83</nukleus.plugin.version>
55+
<nukleus.amqp.spec.version>0.58</nukleus.amqp.spec.version>
56+
<nukleus.mqtt.spec.version>0.59</nukleus.mqtt.spec.version>
57+
<nukleus.kafka.spec.version>0.169</nukleus.kafka.spec.version>
58+
<nukleus.http.spec.version>0.107</nukleus.http.spec.version>
59+
<nukleus.tls.spec.version>0.60</nukleus.tls.spec.version>
60+
<nukleus.proxy.spec.version>0.14</nukleus.proxy.spec.version>
5461

5562
<jacoco.coverage.ratio>1.00</jacoco.coverage.ratio>
5663
<jacoco.missed.count>0</jacoco.missed.count>
@@ -130,7 +137,7 @@
130137
<configuration>
131138
<header>COPYRIGHT</header>
132139
<properties>
133-
<copyrightYears>2016-2020</copyrightYears>
140+
<copyrightYears>2016-2021</copyrightYears>
134141
</properties>
135142
<includes>
136143
<include>src/**</include>
@@ -264,14 +271,15 @@
264271
<id>release</id>
265272

266273
<distributionManagement>
267-
<snapshotRepository>
268-
<id>ossrh</id>
269-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
270-
</snapshotRepository>
274+
<downloadUrl>https://maven.pkg.github.com/reaktivity/command-log.java/</downloadUrl>
271275
<repository>
272-
<id>ossrh</id>
273-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
276+
<id>github</id>
277+
<url>https://maven.pkg.github.com/reaktivity/command-log.java/</url>
274278
</repository>
279+
<snapshotRepository>
280+
<id>github</id>
281+
<url>https://maven.pkg.github.com/reaktivity/command-log.java/</url>
282+
</snapshotRepository>
275283
</distributionManagement>
276284

277285
<build>
@@ -293,7 +301,7 @@
293301
<message>No Snapshots Allowed!</message>
294302
</requireReleaseDeps>
295303
<requireJavaVersion>
296-
<version>[9,10)</version>
304+
<version>[13,14)</version>
297305
</requireJavaVersion>
298306
</rules>
299307
</configuration>
@@ -312,10 +320,33 @@
312320
</execution>
313321
</executions>
314322
</plugin>
323+
<plugin>
324+
<groupId>org.apache.maven.plugins</groupId>
325+
<artifactId>maven-antrun-plugin</artifactId>
326+
<version>3.0.0</version>
327+
<executions>
328+
<execution>
329+
<phase>package</phase>
330+
<configuration>
331+
<target>
332+
<mkdir dir="${project.build.directory}/apidocs" />
333+
</target>
334+
</configuration>
335+
<goals>
336+
<goal>run</goal>
337+
</goals>
338+
</execution>
339+
</executions>
340+
</plugin>
315341
<plugin>
316342
<groupId>org.apache.maven.plugins</groupId>
317343
<artifactId>maven-javadoc-plugin</artifactId>
318-
<version>3.0.0-M1</version>
344+
<version>3.2.0</version>
345+
<configuration>
346+
<sourceFileExcludes>
347+
<exclude>**/internal/**/*.java</exclude>
348+
</sourceFileExcludes>
349+
</configuration>
319350
<executions>
320351
<execution>
321352
<goals>
@@ -324,6 +355,119 @@
324355
</execution>
325356
</executions>
326357
</plugin>
358+
</plugins>
359+
</build>
360+
</profile>
361+
362+
<profile>
363+
<id>github.packages</id>
364+
365+
<build>
366+
<plugins>
367+
<plugin>
368+
<groupId>org.apache.maven.plugins</groupId>
369+
<artifactId>maven-dependency-plugin</artifactId>
370+
<version>3.1.2</version>
371+
<configuration>
372+
<outputDirectory>${project.build.directory}</outputDirectory>
373+
<overWriteReleases>true</overWriteReleases>
374+
<artifactItems>
375+
<artifact>
376+
<groupId>${project.groupId}</groupId>
377+
<artifactId>${project.artifactId}</artifactId>
378+
<version>${project.version}</version>
379+
<type>pom</type>
380+
</artifact>
381+
<artifact>
382+
<groupId>${project.groupId}</groupId>
383+
<artifactId>${project.artifactId}</artifactId>
384+
<version>${project.version}</version>
385+
</artifact>
386+
<artifact>
387+
<groupId>${project.groupId}</groupId>
388+
<artifactId>${project.artifactId}</artifactId>
389+
<version>${project.version}</version>
390+
<classifier>sources</classifier>
391+
</artifact>
392+
<artifact>
393+
<groupId>${project.groupId}</groupId>
394+
<artifactId>${project.artifactId}</artifactId>
395+
<version>${project.version}</version>
396+
<classifier>javadoc</classifier>
397+
</artifact>
398+
<artifact>
399+
<groupId>${project.groupId}</groupId>
400+
<artifactId>${project.artifactId}</artifactId>
401+
<version>${project.version}</version>
402+
<classifier>tests</classifier>
403+
</artifact>
404+
</artifactItems>
405+
</configuration>
406+
</plugin>
407+
</plugins>
408+
</build>
409+
</profile>
410+
411+
<profile>
412+
<id>ossrh</id>
413+
414+
<distributionManagement>
415+
<snapshotRepository>
416+
<id>ossrh</id>
417+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
418+
</snapshotRepository>
419+
<repository>
420+
<id>ossrh</id>
421+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
422+
</repository>
423+
</distributionManagement>
424+
425+
<build>
426+
<plugins>
427+
<plugin>
428+
<groupId>com.github.genthaler</groupId>
429+
<artifactId>beanshell-maven-plugin</artifactId>
430+
<version>1.4</version>
431+
<configuration>
432+
<script>
433+
<![CDATA[
434+
project.getArtifact().setFile(new java.io.File(project.getBuild().getDirectory(), project.getBuild().getFinalName() + ".jar"));
435+
]]>
436+
</script>
437+
</configuration>
438+
</plugin>
439+
<plugin>
440+
<groupId>org.codehaus.mojo</groupId>
441+
<artifactId>build-helper-maven-plugin</artifactId>
442+
<version>3.2.0</version>
443+
<configuration>
444+
<artifacts>
445+
<artifact>
446+
<classifier>sources</classifier>
447+
<file>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</file>
448+
</artifact>
449+
<artifact>
450+
<classifier>javadoc</classifier>
451+
<file>${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar</file>
452+
</artifact>
453+
<artifact>
454+
<classifier>tests</classifier>
455+
<file>${project.build.directory}/${project.artifactId}-${project.version}-tests.jar</file>
456+
</artifact>
457+
</artifacts>
458+
</configuration>
459+
</plugin>
460+
<plugin>
461+
<groupId>org.apache.maven.plugins</groupId>
462+
<artifactId>maven-gpg-plugin</artifactId>
463+
<version>1.6</version>
464+
<configuration>
465+
<gpgArguments>
466+
<arg>--pinentry-mode</arg>
467+
<arg>loopback</arg>
468+
</gpgArguments>
469+
</configuration>
470+
</plugin>
327471
<plugin>
328472
<groupId>org.sonatype.plugins</groupId>
329473
<artifactId>nexus-staging-maven-plugin</artifactId>
@@ -335,18 +479,6 @@
335479
<autoReleaseAfterClose>true</autoReleaseAfterClose>
336480
</configuration>
337481
</plugin>
338-
<plugin>
339-
<groupId>org.apache.maven.plugins</groupId>
340-
<artifactId>maven-gpg-plugin</artifactId>
341-
<version>1.6</version>
342-
<executions>
343-
<execution>
344-
<goals>
345-
<goal>sign</goal>
346-
</goals>
347-
</execution>
348-
</executions>
349-
</plugin>
350482
</plugins>
351483
</build>
352484
</profile>

‎src/main/java/org/reaktivity/command/log/internal/LogBudgetsCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2016-2020 The Reaktivity Project
2+
* Copyright 2016-2021 The Reaktivity Project
33
*
44
* The Reaktivity Project licenses this file to you under the Apache License,
55
* version 2.0 (the "License"); you may not use this file except in compliance

‎src/main/java/org/reaktivity/command/log/internal/LogBuffersCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2016-2020 The Reaktivity Project
2+
* Copyright 2016-2021 The Reaktivity Project
33
*
44
* The Reaktivity Project licenses this file to you under the Apache License,
55
* version 2.0 (the "License"); you may not use this file except in compliance

‎src/main/java/org/reaktivity/command/log/internal/LogCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2016-2020 The Reaktivity Project
2+
* Copyright 2016-2021 The Reaktivity Project
33
*
44
* The Reaktivity Project licenses this file to you under the Apache License,
55
* version 2.0 (the "License"); you may not use this file except in compliance

‎src/main/java/org/reaktivity/command/log/internal/LogCountersCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2016-2020 The Reaktivity Project
2+
* Copyright 2016-2021 The Reaktivity Project
33
*
44
* The Reaktivity Project licenses this file to you under the Apache License,
55
* version 2.0 (the "License"); you may not use this file except in compliance

‎src/main/java/org/reaktivity/command/log/internal/LogQueueDepthCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2016-2020 The Reaktivity Project
2+
* Copyright 2016-2021 The Reaktivity Project
33
*
44
* The Reaktivity Project licenses this file to you under the Apache License,
55
* version 2.0 (the "License"); you may not use this file except in compliance

‎src/main/java/org/reaktivity/command/log/internal/LogRoutesCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2016-2020 The Reaktivity Project
2+
* Copyright 2016-2021 The Reaktivity Project
33
*
44
* The Reaktivity Project licenses this file to you under the Apache License,
55
* version 2.0 (the "License"); you may not use this file except in compliance

‎src/main/java/org/reaktivity/command/log/internal/LogStreamsCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2016-2020 The Reaktivity Project
2+
* Copyright 2016-2021 The Reaktivity Project
33
*
44
* The Reaktivity Project licenses this file to you under the Apache License,
55
* version 2.0 (the "License"); you may not use this file except in compliance

‎src/main/java/org/reaktivity/command/log/internal/LoggableRoutes.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2016-2020 The Reaktivity Project
2+
* Copyright 2016-2021 The Reaktivity Project
33
*
44
* The Reaktivity Project licenses this file to you under the Apache License,
55
* version 2.0 (the "License"); you may not use this file except in compliance

0 commit comments

Comments
 (0)