Merge pull request #15 from digipost/gh_release_action

Ta i bruk nyeste super-pom og action deploy for snapshot og release

.github/workflows/build.yml

@@ -0,0 +1,37 @@
+name: Build snapshot
+
+on: [push]
+
+jobs:
+ build:
+
+ runs-on: ubuntu-latest
+
+ strategy:
+ matrix:
+ java: [ '1.8', '11' ]
+
+ name: build java ${{ matrix.java }}
+ steps:
+ - uses: actions/checkout@v1
+ - name: Set up java
+ uses: actions/setup-java@v1
+ with:
+ java-version: ${{ matrix.java }}
+ - name: Build with Maven
+ run: mvn -B package --no-transfer-progress --file pom.xml
+
+ deploy:
+ runs-on: ubuntu-latest
+
+ name: deploy snapshot
+ steps:
+ - uses: actions/checkout@v1
+ - name: Set release version
+ run: echo ::set-env name=RELEASE_VERSION::$(echo ${GITHUB_REF:11}"-SNAPSHOT")
+ - name: Build and deploy to Sonatype snapshot
+ uses: digipost/[email protected]
+ with:
+ sonatype_secrets: ${{ secrets.sonatype_secrets }}
+ release_version: ${{ env.RELEASE_VERSION }}
+ perform_release: false

.github/workflows/release.yml

@@ -0,0 +1,21 @@
+name: Release
+
+on:
+ push:
+ tags:
+ - '*'
+jobs:
+ release:
+ runs-on: ubuntu-latest
+ name: Release 
+ steps:
+ - name: Check out Git repository
+ uses: actions/checkout@v1
+ - name: Set release version
+ run: echo ::set-env name=RELEASE_VERSION::$(echo ${GITHUB_REF:10})
+ - name: Release to Central Repository
+ uses: digipost/[email protected]
+ with:
+ sonatype_secrets: ${{ secrets.sonatype_secrets }}
+ release_version: ${{ env.RELEASE_VERSION }}
+ perform_release: true

README.md

@@ -1,3 +1,7 @@
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/no.digipost/digg/badge.svg)](https://maven-badges.herokuapp.com/maven-central/no.digipost/digg)
+![](https://github.com/digipost/digg/workflows/Build%20snapshot/badge.svg)
+[![License](https://img.shields.io/badge/license-Apache%202-blue)](https://github.com/digipost/digg/blob/master/LICENCE)
+
 Digipost Digg 🍬
 ===============================
 

pom.xml

@@ -22,11 +22,11 @@
  <parent>
  <groupId>no.digipost</groupId>
  <artifactId>digipost-open-super-pom</artifactId>
- <version>3</version>
+ <version>6</version>
  </parent>
 
  <artifactId>digg</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>LOCAL-SNAPSHOT</version>
  <name>Digipost Digg</name>
  <description>Some stellar general purpose utils.</description>
  <url>https://github.com/digipost/digg/</url>
@@ -99,22 +99,6 @@
  </exclusion>
  </exclusions>
  </dependency>
- <dependency>
- <groupId>org.xmlmatchers</groupId>
- <artifactId>xml-matchers</artifactId>
- <version>1.0-RC1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
  <dependency>
  <groupId>com.mockrunner</groupId>
  <artifactId>mockrunner-jdbc</artifactId>
@@ -155,6 +139,8 @@
  <exclude>NOTICE</exclude>
  <exclude>src/main/notice/NOTICE.template</exclude>
  <exclude>.mvn/maven.config</exclude>
+ <exclude>.java-version</exclude>
+ <exclude>.github/**/*.yml</exclude>
  </excludes>
  </configuration>
  </plugin>

src/main/java/no/digipost/DiggBase.java

@@ -117,7 +117,7 @@ public static <T, X extends Throwable> T nonNull(String descriptiveRefKey, Funct
 
  /**
  * The "friendly name" of a class is defined as its {@link Class#getSimpleName() simple name}, with
- * all enclosing classes prepended and joined with a <tt>'.'</tt> delimiter. This name is typically
+ * all enclosing classes prepended and joined with a <code>'.'</code> delimiter. This name is typically
  * useful for logging, naming based on classes, where the fully qualified name would be too verbose
  * and the simple name is not specific enough.
  * <p>
@@ -200,8 +200,8 @@ public static final <T, R> Stream<R> extractIfPresent(T object, Function<? super
  * in {@code DiggCollectors}.
  * <p>
  * If you have non-AutoCloseable related actions that need to be performed as well, this can be achieved
- * by using <tt><a href="https://docs.oracle.com/javase/8/docs/api/java/util/stream/Stream.html#concat-java.util.stream.Stream-java.util.stream.Stream-">Stream.concat(</a>close(..),
- * {@link #forceOnAll(ThrowingConsumer, Object...) forceOnAll(T::action, T ... instances)})</tt>
+ * by using <code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/stream/Stream.html#concat-java.util.stream.Stream-java.util.stream.Stream-">Stream.concat(</a>close(..),
+ * {@link #forceOnAll(ThrowingConsumer, Object...) forceOnAll(T::action, T ... instances)})</code>
  *
  *
  * @param closeables The {@code AutoCloseable} instances to close.

src/main/java/no/digipost/function/DecaFunction.java

@@ -29,9 +29,9 @@
  * @param <X> the type of the fifth argument to the function
  * @param <Y> the type of the sixth argument to the function
  * @param <Z> the type of the seventh argument to the function
- * @param <Z> the type of the eight argument to the function
- * @param <Z> the type of the ninth argument to the function
- * @param <Z> the type of the tenth argument to the function
+ * @param <A> the type of the eight argument to the function
+ * @param <B> the type of the ninth argument to the function
+ * @param <C> the type of the tenth argument to the function
  * @param <R> the type of the result of the function
  *
  * @see NonaFunction

src/main/java/no/digipost/function/NonaFunction.java

@@ -29,8 +29,8 @@
  * @param <X> the type of the fifth argument to the function
  * @param <Y> the type of the sixth argument to the function
  * @param <Z> the type of the seventh argument to the function
- * @param <Z> the type of the eight argument to the function
- * @param <Z> the type of the ninth argument to the function
+ * @param <A> the type of the eight argument to the function
+ * @param <B> the type of the ninth argument to the function
  * @param <R> the type of the result of the function
  *
  * @see OctoFunction

src/main/java/no/digipost/function/OctoFunction.java

@@ -29,7 +29,7 @@
  * @param <X> the type of the fifth argument to the function
  * @param <Y> the type of the sixth argument to the function
  * @param <Z> the type of the seventh argument to the function
- * @param <Z> the type of the eight argument to the function
+ * @param <A> the type of the eight argument to the function
  * @param <R> the type of the result of the function
  *
  * @see SeptiFunction