Skip to content

Commit e8bcd8a

Browse files
jfallowsjfallows
committed
Merge branch 'release/0.21' into main
2 parents f18f03c + 5df45f3 commit e8bcd8a

13 files changed

Lines changed: 239 additions & 36 deletions

File tree

‎.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: 157 additions & 25 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>nukleus-echo</artifactId>
9-
<version>0.20</version>
9+
<version>0.21</version>
1010
<name>Echo Nukleus Implementation</name>
1111
<description>Echo Nukleus Implementation</description>
1212
<url>https://github.com/reaktivity/nukleus-echo.java</url>
@@ -35,6 +35,13 @@
3535
<url>https://github.com/reaktivity/nukleus-echo.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>
@@ -51,10 +58,10 @@
5158

5259
<k3po.version>3.1.0</k3po.version>
5360

54-
<nukleus.plugin.version>0.64</nukleus.plugin.version>
61+
<nukleus.plugin.version>0.83</nukleus.plugin.version>
5562

56-
<nukleus.echo.spec.version>0.16</nukleus.echo.spec.version>
57-
<reaktor.version>0.155</reaktor.version>
63+
<nukleus.echo.spec.version>0.17</nukleus.echo.spec.version>
64+
<reaktor.version>0.159</reaktor.version>
5865
</properties>
5966

6067
<dependencies>
@@ -140,7 +147,7 @@
140147
<configuration>
141148
<header>COPYRIGHT</header>
142149
<properties>
143-
<copyrightYears>2016-2020</copyrightYears>
150+
<copyrightYears>2016-2021</copyrightYears>
144151
</properties>
145152
<includes>
146153
<include>src/**</include>
@@ -344,14 +351,15 @@
344351
<id>release</id>
345352

346353
<distributionManagement>
347-
<snapshotRepository>
348-
<id>ossrh</id>
349-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
350-
</snapshotRepository>
354+
<downloadUrl>https://maven.pkg.github.com/reaktivity/nukleus-echo.java/</downloadUrl>
351355
<repository>
352-
<id>ossrh</id>
353-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
356+
<id>github</id>
357+
<url>https://maven.pkg.github.com/reaktivity/nukleus-echo.java/</url>
354358
</repository>
359+
<snapshotRepository>
360+
<id>github</id>
361+
<url>https://maven.pkg.github.com/reaktivity/nukleus-echo.java/</url>
362+
</snapshotRepository>
355363
</distributionManagement>
356364

357365
<build>
@@ -373,7 +381,7 @@
373381
<message>No Snapshots Allowed!</message>
374382
</requireReleaseDeps>
375383
<requireJavaVersion>
376-
<version>[9,10)</version>
384+
<version>[13,14)</version>
377385
</requireJavaVersion>
378386
</rules>
379387
</configuration>
@@ -392,10 +400,33 @@
392400
</execution>
393401
</executions>
394402
</plugin>
403+
<plugin>
404+
<groupId>org.apache.maven.plugins</groupId>
405+
<artifactId>maven-antrun-plugin</artifactId>
406+
<version>3.0.0</version>
407+
<executions>
408+
<execution>
409+
<phase>package</phase>
410+
<configuration>
411+
<target>
412+
<mkdir dir="${project.build.directory}/apidocs" />
413+
</target>
414+
</configuration>
415+
<goals>
416+
<goal>run</goal>
417+
</goals>
418+
</execution>
419+
</executions>
420+
</plugin>
395421
<plugin>
396422
<groupId>org.apache.maven.plugins</groupId>
397423
<artifactId>maven-javadoc-plugin</artifactId>
398-
<version>3.0.0-M1</version>
424+
<version>3.2.0</version>
425+
<configuration>
426+
<sourceFileExcludes>
427+
<exclude>**/internal/**/*.java</exclude>
428+
</sourceFileExcludes>
429+
</configuration>
399430
<executions>
400431
<execution>
401432
<goals>
@@ -404,6 +435,119 @@
404435
</execution>
405436
</executions>
406437
</plugin>
438+
</plugins>
439+
</build>
440+
</profile>
441+
442+
<profile>
443+
<id>github.packages</id>
444+
445+
<build>
446+
<plugins>
447+
<plugin>
448+
<groupId>org.apache.maven.plugins</groupId>
449+
<artifactId>maven-dependency-plugin</artifactId>
450+
<version>3.1.2</version>
451+
<configuration>
452+
<outputDirectory>${project.build.directory}</outputDirectory>
453+
<overWriteReleases>true</overWriteReleases>
454+
<artifactItems>
455+
<artifact>
456+
<groupId>${project.groupId}</groupId>
457+
<artifactId>${project.artifactId}</artifactId>
458+
<version>${project.version}</version>
459+
<type>pom</type>
460+
</artifact>
461+
<artifact>
462+
<groupId>${project.groupId}</groupId>
463+
<artifactId>${project.artifactId}</artifactId>
464+
<version>${project.version}</version>
465+
</artifact>
466+
<artifact>
467+
<groupId>${project.groupId}</groupId>
468+
<artifactId>${project.artifactId}</artifactId>
469+
<version>${project.version}</version>
470+
<classifier>sources</classifier>
471+
</artifact>
472+
<artifact>
473+
<groupId>${project.groupId}</groupId>
474+
<artifactId>${project.artifactId}</artifactId>
475+
<version>${project.version}</version>
476+
<classifier>javadoc</classifier>
477+
</artifact>
478+
<artifact>
479+
<groupId>${project.groupId}</groupId>
480+
<artifactId>${project.artifactId}</artifactId>
481+
<version>${project.version}</version>
482+
<classifier>tests</classifier>
483+
</artifact>
484+
</artifactItems>
485+
</configuration>
486+
</plugin>
487+
</plugins>
488+
</build>
489+
</profile>
490+
491+
<profile>
492+
<id>ossrh</id>
493+
494+
<distributionManagement>
495+
<snapshotRepository>
496+
<id>ossrh</id>
497+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
498+
</snapshotRepository>
499+
<repository>
500+
<id>ossrh</id>
501+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
502+
</repository>
503+
</distributionManagement>
504+
505+
<build>
506+
<plugins>
507+
<plugin>
508+
<groupId>com.github.genthaler</groupId>
509+
<artifactId>beanshell-maven-plugin</artifactId>
510+
<version>1.4</version>
511+
<configuration>
512+
<script>
513+
<![CDATA[
514+
project.getArtifact().setFile(new java.io.File(project.getBuild().getDirectory(), project.getBuild().getFinalName() + ".jar"));
515+
]]>
516+
</script>
517+
</configuration>
518+
</plugin>
519+
<plugin>
520+
<groupId>org.codehaus.mojo</groupId>
521+
<artifactId>build-helper-maven-plugin</artifactId>
522+
<version>3.2.0</version>
523+
<configuration>
524+
<artifacts>
525+
<artifact>
526+
<classifier>sources</classifier>
527+
<file>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</file>
528+
</artifact>
529+
<artifact>
530+
<classifier>javadoc</classifier>
531+
<file>${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar</file>
532+
</artifact>
533+
<artifact>
534+
<classifier>tests</classifier>
535+
<file>${project.build.directory}/${project.artifactId}-${project.version}-tests.jar</file>
536+
</artifact>
537+
</artifacts>
538+
</configuration>
539+
</plugin>
540+
<plugin>
541+
<groupId>org.apache.maven.plugins</groupId>
542+
<artifactId>maven-gpg-plugin</artifactId>
543+
<version>1.6</version>
544+
<configuration>
545+
<gpgArguments>
546+
<arg>--pinentry-mode</arg>
547+
<arg>loopback</arg>
548+
</gpgArguments>
549+
</configuration>
550+
</plugin>
407551
<plugin>
408552
<groupId>org.sonatype.plugins</groupId>
409553
<artifactId>nexus-staging-maven-plugin</artifactId>
@@ -415,18 +559,6 @@
415559
<autoReleaseAfterClose>true</autoReleaseAfterClose>
416560
</configuration>
417561
</plugin>
418-
<plugin>
419-
<groupId>org.apache.maven.plugins</groupId>
420-
<artifactId>maven-gpg-plugin</artifactId>
421-
<version>1.6</version>
422-
<executions>
423-
<execution>
424-
<goals>
425-
<goal>sign</goal>
426-
</goals>
427-
</execution>
428-
</executions>
429-
</plugin>
430562
</plugins>
431563
</build>
432564
</profile>

‎src/main/java/org/reaktivity/nukleus/echo/internal/EchoConfiguration.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/nukleus/echo/internal/EchoController.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/nukleus/echo/internal/EchoControllerFactorySpi.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/nukleus/echo/internal/EchoElektron.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/nukleus/echo/internal/EchoNukleus.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/nukleus/echo/internal/EchoNukleusFactorySpi.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/nukleus/echo/internal/stream/EchoServerFactory.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/nukleus/echo/internal/stream/EchoServerFactoryBuilder.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)