Merge branch 'release/0.60' into main

reaktivity · Jan 26, 2021 · d856d16 · d856d16
2 parents b933ffd + 45f0e9a
commit d856d16
Show file tree

Hide file tree

Showing 136 changed files with 352 additions and 159 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,71 @@
+name: release
+
+on:
+  push:
+    tags:
+      - '[0-9]+.[0-9]+'
+      - '[0-9]+.[0-9]+.[0-9]+'
+  workflow_dispatch:
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Release
+      uses: softprops/action-gh-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  publish:
+    needs: release
+    name: Publish
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout GitHub sources
+      uses: actions/checkout@v2
+    - name: Setup GitHub Packages
+      uses: actions/setup-java@v1
+      with:
+        java-version: 9
+    - name: Resolve from GitHub Packages
+      run: ./mvnw -B -Pgithub.packages dependency:copy
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+    - name: Setup Maven Central
+      uses: actions/setup-java@v1
+      with:
+        java-version: 9
+        server-id: ossrh
+        server-username: OSSRH_USERNAME
+        server-password: OSSRH_PASSWORD
+        gpg-private-key: ${{ secrets.OSSRH_SIGNER_KEY }}
+        gpg-passphrase: OSSRH_SIGNER_PASSPHRASE
+    - name: Deploy to Maven Central
+      id: deploy
+      continue-on-error: true
+      run: ./mvnw -B -Possrh com.github.genthaler:beanshell-maven-plugin:run build-helper:attach-artifact gpg:sign nexus-staging:deploy
+      env:
+        OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+        OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+        OSSRH_SIGNER_PASSPHRASE: ${{ secrets.OSSRH_SIGNER_PASSPHRASE }}
+    - name: Notify via Slack
+      uses: 8398a7/action-slack@v3
+      with:
+        status: custom
+        job_name: Publish
+        fields: job,repo,author,took
+        custom_payload: |
+          {
+            attachments: [{
+              color: '${{ steps.deploy.outcome }}' === 'success' ? 'good' : '${{ steps.deploy.outcome }}' === 'failure' ? 'danger' : 'warning',
+              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}`,
+            }]
+          }
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+      if: ${{ env.SLACK_WEBHOOK_URL != null }}
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.reaktivity</groupId>
   <artifactId>nukleus-tls.spec</artifactId>
-  <version>0.59</version>
+  <version>0.60</version>
   <name>TLS Nukleus Specification</name>
   <description>TLS Nukleus Specification</description>
   <url>https://github.com/reaktivity/nukleus-tls.spec</url>
@@ -36,6 +36,13 @@
     <url>https://github.com/reaktivity/nukleus-tls.spec</url>
   </scm>
 
+  <repositories>
+    <repository>
+      <id>github</id>
+      <url>https://maven.pkg.github.com/reaktivity/packages/</url>
+    </repository>
+  </repositories>
+
   <properties>
     <maven.compiler.source>9</maven.compiler.source>
     <maven.compiler.target>9</maven.compiler.target>
@@ -49,11 +56,11 @@
     <junit.version>4.13.1</junit.version>
 
     <k3po.version>3.1.0</k3po.version>
-    <reaktor.version>0.155</reaktor.version>
+    <reaktor.version>0.159</reaktor.version>
 
-    <nukleus.proxy.spec.version>0.10</nukleus.proxy.spec.version>
+    <nukleus.proxy.spec.version>0.14</nukleus.proxy.spec.version>
 
-    <nukleus.plugin.version>0.77</nukleus.plugin.version>
+    <nukleus.plugin.version>0.83</nukleus.plugin.version>
   </properties>
 
   <dependencies>
@@ -116,7 +123,7 @@
         <configuration>
           <header>COPYRIGHT</header>
           <properties>
-            <copyrightYears>2016-2020</copyrightYears>
+            <copyrightYears>2016-2021</copyrightYears>
           </properties>
           <includes>
             <include>src/**</include>
@@ -264,14 +271,15 @@
       <id>release</id>
 
       <distributionManagement>
-        <snapshotRepository>
-          <id>ossrh</id>
-          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
+        <downloadUrl>https://maven.pkg.github.com/reaktivity/nukleus-tls.spec/</downloadUrl>
         <repository>
-          <id>ossrh</id>
-          <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+          <id>github</id>
+          <url>https://maven.pkg.github.com/reaktivity/nukleus-tls.spec/</url>
         </repository>
+        <snapshotRepository>
+          <id>github</id>
+          <url>https://maven.pkg.github.com/reaktivity/nukleus-tls.spec/</url>
+        </snapshotRepository>
       </distributionManagement>
 
       <build>
@@ -293,7 +301,7 @@
                       <message>No Snapshots Allowed!</message>
                     </requireReleaseDeps>
                     <requireJavaVersion>
-                      <version>[9,10)</version>
+                      <version>[13,14)</version>
                     </requireJavaVersion>
                   </rules>
                 </configuration>
@@ -312,10 +320,33 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>3.0.0</version>
+            <executions>
+              <execution>
+                <phase>package</phase>
+                <configuration>
+                  <target>
+                    <mkdir dir="${project.build.directory}/apidocs" />
+                  </target>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.0.0-M1</version>
+            <version>3.2.0</version>
+            <configuration>
+              <sourceFileExcludes>
+                <exclude>**/internal/**/*.java</exclude>
+              </sourceFileExcludes>
+            </configuration>
             <executions>
               <execution>
                 <goals>
@@ -324,6 +355,109 @@
               </execution>
             </executions>
           </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>github.packages</id>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <version>3.1.2</version>
+            <configuration>
+              <outputDirectory>${project.build.directory}</outputDirectory>
+              <overWriteReleases>true</overWriteReleases>
+              <artifactItems>
+                <artifact>
+                  <groupId>${project.groupId}</groupId>
+                  <artifactId>${project.artifactId}</artifactId>
+                  <version>${project.version}</version>
+                  <type>pom</type>
+                </artifact>
+                <artifact>
+                  <groupId>${project.groupId}</groupId>
+                  <artifactId>${project.artifactId}</artifactId>
+                  <version>${project.version}</version>
+                </artifact>
+                <artifact>
+                  <groupId>${project.groupId}</groupId>
+                  <artifactId>${project.artifactId}</artifactId>
+                  <version>${project.version}</version>
+                  <classifier>sources</classifier>
+                </artifact>
+                <artifact>
+                  <groupId>${project.groupId}</groupId>
+                  <artifactId>${project.artifactId}</artifactId>
+                  <version>${project.version}</version>
+                  <classifier>javadoc</classifier>
+                </artifact>
+              </artifactItems>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>ossrh</id>
+
+      <distributionManagement>
+        <snapshotRepository>
+          <id>ossrh</id>
+          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+        <repository>
+          <id>ossrh</id>
+          <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+      </distributionManagement>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.github.genthaler</groupId>
+            <artifactId>beanshell-maven-plugin</artifactId>
+            <version>1.4</version>
+            <configuration>
+              <script>
+                <![CDATA[
+                project.getArtifact().setFile(new java.io.File(project.getBuild().getDirectory(), project.getBuild().getFinalName() + ".jar"));
+                ]]>
+              </script>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <version>3.2.0</version>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <classifier>sources</classifier>
+                  <file>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</file>
+                </artifact>
+                <artifact>
+                  <classifier>javadoc</classifier>
+                  <file>${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar</file>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>1.6</version>
+            <configuration>
+              <gpgArguments>
+                <arg>--pinentry-mode</arg>
+                <arg>loopback</arg>
+              </gpgArguments>
+            </configuration>
+          </plugin>
           <plugin>
             <groupId>org.sonatype.plugins</groupId>
             <artifactId>nexus-staging-maven-plugin</artifactId>
@@ -335,18 +469,6 @@
               <autoReleaseAfterClose>true</autoReleaseAfterClose>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>

diff --git a/src/main/java/org/reaktivity/specification/tls/internal/TlsFunctions.java b/src/main/java/org/reaktivity/specification/tls/internal/TlsFunctions.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2020 The Reaktivity Project
+ * Copyright 2016-2021 The Reaktivity Project
  *
  * The Reaktivity Project licenses this file to you under the Apache License,
  * version 2.0 (the "License"); you may not use this file except in compliance

diff --git a/src/main/resources/META-INF/reaktivity/tls.idl b/src/main/resources/META-INF/reaktivity/tls.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 The Reaktivity Project
+ * Copyright 2016-2021 The Reaktivity Project
  *
  * The Reaktivity Project licenses this file to you under the Apache License,
  * version 2.0 (the "License"); you may not use this file except in compliance

diff --git a/...scripts/org/reaktivity/specification/nukleus/tls/control/resolve/one.realm/controller.rpt b/...scripts/org/reaktivity/specification/nukleus/tls/control/resolve/one.realm/controller.rpt
@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2020 The Reaktivity Project
+# Copyright 2016-2021 The Reaktivity Project
 #
 # The Reaktivity Project licenses this file to you under the Apache License,
 # version 2.0 (the "License"); you may not use this file except in compliance

diff --git a/...in/scripts/org/reaktivity/specification/nukleus/tls/control/resolve/one.realm/nukleus.rpt b/...in/scripts/org/reaktivity/specification/nukleus/tls/control/resolve/one.realm/nukleus.rpt
@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2020 The Reaktivity Project
+# Copyright 2016-2021 The Reaktivity Project
 #
 # The Reaktivity Project licenses this file to you under the Apache License,
 # version 2.0 (the "License"); you may not use this file except in compliance

diff --git a/...org/reaktivity/specification/nukleus/tls/control/route/client.alpn.default/controller.rpt b/...org/reaktivity/specification/nukleus/tls/control/route/client.alpn.default/controller.rpt
@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2020 The Reaktivity Project
+# Copyright 2016-2021 The Reaktivity Project
 #
 # The Reaktivity Project licenses this file to you under the Apache License,
 # version 2.0 (the "License"); you may not use this file except in compliance

diff --git a/...ts/org/reaktivity/specification/nukleus/tls/control/route/client.alpn.default/nukleus.rpt b/...ts/org/reaktivity/specification/nukleus/tls/control/route/client.alpn.default/nukleus.rpt
@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2020 The Reaktivity Project
+# Copyright 2016-2021 The Reaktivity Project
 #
 # The Reaktivity Project licenses this file to you under the Apache License,
 # version 2.0 (the "License"); you may not use this file except in compliance

diff --git a/...scripts/org/reaktivity/specification/nukleus/tls/control/route/client.alpn/controller.rpt b/...scripts/org/reaktivity/specification/nukleus/tls/control/route/client.alpn/controller.rpt
@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2020 The Reaktivity Project
+# Copyright 2016-2021 The Reaktivity Project
 #
 # The Reaktivity Project licenses this file to you under the Apache License,
 # version 2.0 (the "License"); you may not use this file except in compliance

diff --git a/...in/scripts/org/reaktivity/specification/nukleus/tls/control/route/client.alpn/nukleus.rpt b/...in/scripts/org/reaktivity/specification/nukleus/tls/control/route/client.alpn/nukleus.rpt
@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2020 The Reaktivity Project
+# Copyright 2016-2021 The Reaktivity Project
 #
 # The Reaktivity Project licenses this file to you under the Apache License,
 # version 2.0 (the "License"); you may not use this file except in compliance

diff --git a/...rg/reaktivity/specification/nukleus/tls/control/route/client.default.store/controller.rpt b/...rg/reaktivity/specification/nukleus/tls/control/route/client.default.store/controller.rpt
@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2020 The Reaktivity Project
+# Copyright 2016-2021 The Reaktivity Project
 #
 # The Reaktivity Project licenses this file to you under the Apache License,
 # version 2.0 (the "License"); you may not use this file except in compliance

diff --git a/...s/org/reaktivity/specification/nukleus/tls/control/route/client.default.store/nukleus.rpt b/...s/org/reaktivity/specification/nukleus/tls/control/route/client.default.store/nukleus.rpt
@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2020 The Reaktivity Project
+# Copyright 2016-2021 The Reaktivity Project
 #
 # The Reaktivity Project licenses this file to you under the Apache License,
 # version 2.0 (the "License"); you may not use this file except in compliance

diff --git a/...main/scripts/org/reaktivity/specification/nukleus/tls/control/route/client/controller.rpt b/...main/scripts/org/reaktivity/specification/nukleus/tls/control/route/client/controller.rpt
@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2020 The Reaktivity Project
+# Copyright 2016-2021 The Reaktivity Project
 #
 # The Reaktivity Project licenses this file to you under the Apache License,
 # version 2.0 (the "License"); you may not use this file except in compliance

diff --git a/src/main/scripts/org/reaktivity/specification/nukleus/tls/control/route/client/nukleus.rpt b/src/main/scripts/org/reaktivity/specification/nukleus/tls/control/route/client/nukleus.rpt
@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2020 The Reaktivity Project
+# Copyright 2016-2021 The Reaktivity Project
 #
 # The Reaktivity Project licenses this file to you under the Apache License,
 # version 2.0 (the "License"); you may not use this file except in compliance