Skip to content
This repository was archived by the owner on Jun 6, 2021. It is now read-only.

Commit e2b5d0e

Browse files
jfallowsjfallows
committed
Merge branch 'release/0.143' into main
2 parents 23b6d86 + adfc10e commit e2b5d0e

58 files changed

Lines changed: 284 additions & 81 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.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-http-cache</artifactId>
9-
<version>0.142</version>
9+
<version>0.143</version>
1010
<name>HTTP Cache Nukleus Implementation</name>
1111
<description>HTTP Cache Nukleus Implementation</description>
1212
<url>https://github.com/reaktivity/nukleus-http-cache.java</url>
@@ -37,6 +37,13 @@
3737
<url>https://github.com/reaktivity/nukleus-http-cache.java</url>
3838
</scm>
3939

40+
<repositories>
41+
<repository>
42+
<id>github</id>
43+
<url>https://maven.pkg.github.com/reaktivity/packages/</url>
44+
</repository>
45+
</repositories>
46+
4047
<properties>
4148
<maven.compiler.source>9</maven.compiler.source>
4249
<maven.compiler.target>9</maven.compiler.target>
@@ -52,9 +59,9 @@
5259

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

55-
<nukleus.plugin.version>0.78</nukleus.plugin.version>
56-
<nukleus.http.cache.spec.version>0.102</nukleus.http.cache.spec.version>
57-
<reaktor.version>0.155</reaktor.version>
62+
<nukleus.plugin.version>0.83</nukleus.plugin.version>
63+
<nukleus.http.cache.spec.version>0.103</nukleus.http.cache.spec.version>
64+
<reaktor.version>0.159</reaktor.version>
5865
</properties>
5966

6067
<dependencies>
@@ -139,7 +146,7 @@
139146
<configuration>
140147
<header>COPYRIGHT</header>
141148
<properties>
142-
<copyrightYears>2016-2020</copyrightYears>
149+
<copyrightYears>2016-2021</copyrightYears>
143150
</properties>
144151
<includes>
145152
<include>src/**</include>
@@ -339,14 +346,15 @@
339346
<profile>
340347
<id>release</id>
341348
<distributionManagement>
342-
<snapshotRepository>
343-
<id>ossrh</id>
344-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
345-
</snapshotRepository>
349+
<downloadUrl>https://maven.pkg.github.com/reaktivity/nukleus-http-cache.java/</downloadUrl>
346350
<repository>
347-
<id>ossrh</id>
348-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
351+
<id>github</id>
352+
<url>https://maven.pkg.github.com/reaktivity/nukleus-http-cache.java/</url>
349353
</repository>
354+
<snapshotRepository>
355+
<id>github</id>
356+
<url>https://maven.pkg.github.com/reaktivity/nukleus-http-cache.java/</url>
357+
</snapshotRepository>
350358
</distributionManagement>
351359

352360
<build>
@@ -368,7 +376,7 @@
368376
<message>No Snapshots Allowed!</message>
369377
</requireReleaseDeps>
370378
<requireJavaVersion>
371-
<version>[9,10)</version>
379+
<version>[13,14)</version>
372380
</requireJavaVersion>
373381
</rules>
374382
</configuration>
@@ -387,10 +395,33 @@
387395
</execution>
388396
</executions>
389397
</plugin>
398+
<plugin>
399+
<groupId>org.apache.maven.plugins</groupId>
400+
<artifactId>maven-antrun-plugin</artifactId>
401+
<version>3.0.0</version>
402+
<executions>
403+
<execution>
404+
<phase>package</phase>
405+
<configuration>
406+
<target>
407+
<mkdir dir="${project.build.directory}/apidocs" />
408+
</target>
409+
</configuration>
410+
<goals>
411+
<goal>run</goal>
412+
</goals>
413+
</execution>
414+
</executions>
415+
</plugin>
390416
<plugin>
391417
<groupId>org.apache.maven.plugins</groupId>
392418
<artifactId>maven-javadoc-plugin</artifactId>
393-
<version>3.0.0-M1</version>
419+
<version>3.2.0</version>
420+
<configuration>
421+
<sourceFileExcludes>
422+
<exclude>**/internal/**/*.java</exclude>
423+
</sourceFileExcludes>
424+
</configuration>
394425
<executions>
395426
<execution>
396427
<goals>
@@ -399,6 +430,119 @@
399430
</execution>
400431
</executions>
401432
</plugin>
433+
</plugins>
434+
</build>
435+
</profile>
436+
437+
<profile>
438+
<id>github.packages</id>
439+
440+
<build>
441+
<plugins>
442+
<plugin>
443+
<groupId>org.apache.maven.plugins</groupId>
444+
<artifactId>maven-dependency-plugin</artifactId>
445+
<version>3.1.2</version>
446+
<configuration>
447+
<outputDirectory>${project.build.directory}</outputDirectory>
448+
<overWriteReleases>true</overWriteReleases>
449+
<artifactItems>
450+
<artifact>
451+
<groupId>${project.groupId}</groupId>
452+
<artifactId>${project.artifactId}</artifactId>
453+
<version>${project.version}</version>
454+
<type>pom</type>
455+
</artifact>
456+
<artifact>
457+
<groupId>${project.groupId}</groupId>
458+
<artifactId>${project.artifactId}</artifactId>
459+
<version>${project.version}</version>
460+
</artifact>
461+
<artifact>
462+
<groupId>${project.groupId}</groupId>
463+
<artifactId>${project.artifactId}</artifactId>
464+
<version>${project.version}</version>
465+
<classifier>sources</classifier>
466+
</artifact>
467+
<artifact>
468+
<groupId>${project.groupId}</groupId>
469+
<artifactId>${project.artifactId}</artifactId>
470+
<version>${project.version}</version>
471+
<classifier>javadoc</classifier>
472+
</artifact>
473+
<artifact>
474+
<groupId>${project.groupId}</groupId>
475+
<artifactId>${project.artifactId}</artifactId>
476+
<version>${project.version}</version>
477+
<classifier>tests</classifier>
478+
</artifact>
479+
</artifactItems>
480+
</configuration>
481+
</plugin>
482+
</plugins>
483+
</build>
484+
</profile>
485+
486+
<profile>
487+
<id>ossrh</id>
488+
489+
<distributionManagement>
490+
<snapshotRepository>
491+
<id>ossrh</id>
492+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
493+
</snapshotRepository>
494+
<repository>
495+
<id>ossrh</id>
496+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
497+
</repository>
498+
</distributionManagement>
499+
500+
<build>
501+
<plugins>
502+
<plugin>
503+
<groupId>com.github.genthaler</groupId>
504+
<artifactId>beanshell-maven-plugin</artifactId>
505+
<version>1.4</version>
506+
<configuration>
507+
<script>
508+
<![CDATA[
509+
project.getArtifact().setFile(new java.io.File(project.getBuild().getDirectory(), project.getBuild().getFinalName() + ".jar"));
510+
]]>
511+
</script>
512+
</configuration>
513+
</plugin>
514+
<plugin>
515+
<groupId>org.codehaus.mojo</groupId>
516+
<artifactId>build-helper-maven-plugin</artifactId>
517+
<version>3.2.0</version>
518+
<configuration>
519+
<artifacts>
520+
<artifact>
521+
<classifier>sources</classifier>
522+
<file>${project.build.directory}/${project.artifactId}-${project.version}-sources.jar</file>
523+
</artifact>
524+
<artifact>
525+
<classifier>javadoc</classifier>
526+
<file>${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar</file>
527+
</artifact>
528+
<artifact>
529+
<classifier>tests</classifier>
530+
<file>${project.build.directory}/${project.artifactId}-${project.version}-tests.jar</file>
531+
</artifact>
532+
</artifacts>
533+
</configuration>
534+
</plugin>
535+
<plugin>
536+
<groupId>org.apache.maven.plugins</groupId>
537+
<artifactId>maven-gpg-plugin</artifactId>
538+
<version>1.6</version>
539+
<configuration>
540+
<gpgArguments>
541+
<arg>--pinentry-mode</arg>
542+
<arg>loopback</arg>
543+
</gpgArguments>
544+
</configuration>
545+
</plugin>
402546
<plugin>
403547
<groupId>org.sonatype.plugins</groupId>
404548
<artifactId>nexus-staging-maven-plugin</artifactId>
@@ -410,18 +554,6 @@
410554
<autoReleaseAfterClose>true</autoReleaseAfterClose>
411555
</configuration>
412556
</plugin>
413-
<plugin>
414-
<groupId>org.apache.maven.plugins</groupId>
415-
<artifactId>maven-gpg-plugin</artifactId>
416-
<version>1.6</version>
417-
<executions>
418-
<execution>
419-
<goals>
420-
<goal>sign</goal>
421-
</goals>
422-
</execution>
423-
</executions>
424-
</plugin>
425557
</plugins>
426558
</build>
427559
</profile>

‎src/main/java/org/reaktivity/nukleus/http_cache/internal/HttpCacheConfiguration.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/http_cache/internal/HttpCacheController.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/http_cache/internal/HttpCacheControllerFactorySpi.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/http_cache/internal/HttpCacheCounters.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/http_cache/internal/HttpCacheElektron.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/http_cache/internal/HttpCacheNukleus.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/http_cache/internal/HttpCacheNukleusFactorySpi.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/http_cache/internal/proxy/cache/CacheControl.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)