Skip to content

Commit 8651b44

Browse files
eivinhbeivinhb
authored
Merge pull request #15 from digipost/gh_release_action
Ta i bruk nyeste super-pom og action deploy for snapshot og release
2 parents 64c340e + bc5844d commit 8651b44

15 files changed

+75
-387
lines changed

‎.github/workflows/build.yml

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Build snapshot
2+
3+
on: [push]
4+
5+
jobs:
6+
build:
7+
8+
runs-on: ubuntu-latest
9+
10+
strategy:
11+
matrix:
12+
java: [ '1.8', '11' ]
13+
14+
name: build java ${{ matrix.java }}
15+
steps:
16+
- uses: actions/checkout@v1
17+
- name: Set up java
18+
uses: actions/setup-java@v1
19+
with:
20+
java-version: ${{ matrix.java }}
21+
- name: Build with Maven
22+
run: mvn -B package --no-transfer-progress --file pom.xml
23+
24+
deploy:
25+
runs-on: ubuntu-latest
26+
27+
name: deploy snapshot
28+
steps:
29+
- uses: actions/checkout@v1
30+
- name: Set release version
31+
run: echo ::set-env name=RELEASE_VERSION::$(echo ${GITHUB_REF:11}"-SNAPSHOT")
32+
- name: Build and deploy to Sonatype snapshot
33+
uses: digipost/[email protected]
34+
with:
35+
sonatype_secrets: ${{ secrets.sonatype_secrets }}
36+
release_version: ${{ env.RELEASE_VERSION }}
37+
perform_release: false

‎.github/workflows/release.yml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Release
2+
3+
on:
4+
push:
5+
tags:
6+
- '*'
7+
jobs:
8+
release:
9+
runs-on: ubuntu-latest
10+
name: Release
11+
steps:
12+
- name: Check out Git repository
13+
uses: actions/checkout@v1
14+
- name: Set release version
15+
run: echo ::set-env name=RELEASE_VERSION::$(echo ${GITHUB_REF:10})
16+
- name: Release to Central Repository
17+
uses: digipost/[email protected]
18+
with:
19+
sonatype_secrets: ${{ secrets.sonatype_secrets }}
20+
release_version: ${{ env.RELEASE_VERSION }}
21+
perform_release: true

‎.travis.maven.settings.xml

-29
This file was deleted.

‎.travis.yml

-21
This file was deleted.

‎README.md

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

‎pom.xml

+4-18
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
<parent>
2323
<groupId>no.digipost</groupId>
2424
<artifactId>digipost-open-super-pom</artifactId>
25-
<version>3</version>
25+
<version>6</version>
2626
</parent>
2727

2828
<artifactId>digg</artifactId>
29-
<version>1.0-SNAPSHOT</version>
29+
<version>LOCAL-SNAPSHOT</version>
3030
<name>Digipost Digg</name>
3131
<description>Some stellar general purpose utils.</description>
3232
<url>https://github.com/digipost/digg/</url>
@@ -99,22 +99,6 @@
9999
</exclusion>
100100
</exclusions>
101101
</dependency>
102-
<dependency>
103-
<groupId>org.xmlmatchers</groupId>
104-
<artifactId>xml-matchers</artifactId>
105-
<version>1.0-RC1</version>
106-
<scope>test</scope>
107-
<exclusions>
108-
<exclusion>
109-
<groupId>org.hamcrest</groupId>
110-
<artifactId>hamcrest-core</artifactId>
111-
</exclusion>
112-
<exclusion>
113-
<groupId>xerces</groupId>
114-
<artifactId>xercesImpl</artifactId>
115-
</exclusion>
116-
</exclusions>
117-
</dependency>
118102
<dependency>
119103
<groupId>com.mockrunner</groupId>
120104
<artifactId>mockrunner-jdbc</artifactId>
@@ -155,6 +139,8 @@
155139
<exclude>NOTICE</exclude>
156140
<exclude>src/main/notice/NOTICE.template</exclude>
157141
<exclude>.mvn/maven.config</exclude>
142+
<exclude>.java-version</exclude>
143+
<exclude>.github/**/*.yml</exclude>
158144
</excludes>
159145
</configuration>
160146
</plugin>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public static <T, X extends Throwable> T nonNull(String descriptiveRefKey, Funct
117117

118118
/**
119119
* The "friendly name" of a class is defined as its {@link Class#getSimpleName() simple name}, with
120-
* all enclosing classes prepended and joined with a <tt>'.'</tt> delimiter. This name is typically
120+
* all enclosing classes prepended and joined with a <code>'.'</code> delimiter. This name is typically
121121
* useful for logging, naming based on classes, where the fully qualified name would be too verbose
122122
* and the simple name is not specific enough.
123123
* <p>
@@ -200,8 +200,8 @@ public static final <T, R> Stream<R> extractIfPresent(T object, Function<? super
200200
* in {@code DiggCollectors}.
201201
* <p>
202202
* If you have non-AutoCloseable related actions that need to be performed as well, this can be achieved
203-
* 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(..),
204-
* {@link #forceOnAll(ThrowingConsumer, Object...) forceOnAll(T::action, T ... instances)})</tt>
203+
* 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(..),
204+
* {@link #forceOnAll(ThrowingConsumer, Object...) forceOnAll(T::action, T ... instances)})</code>
205205
*
206206
*
207207
* @param closeables The {@code AutoCloseable} instances to close.

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
* @param <X> the type of the fifth argument to the function
3030
* @param <Y> the type of the sixth argument to the function
3131
* @param <Z> the type of the seventh argument to the function
32-
* @param <Z> the type of the eight argument to the function
33-
* @param <Z> the type of the ninth argument to the function
34-
* @param <Z> the type of the tenth argument to the function
32+
* @param <A> the type of the eight argument to the function
33+
* @param <B> the type of the ninth argument to the function
34+
* @param <C> the type of the tenth argument to the function
3535
* @param <R> the type of the result of the function
3636
*
3737
* @see NonaFunction

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
* @param <X> the type of the fifth argument to the function
3030
* @param <Y> the type of the sixth argument to the function
3131
* @param <Z> the type of the seventh argument to the function
32-
* @param <Z> the type of the eight argument to the function
33-
* @param <Z> the type of the ninth argument to the function
32+
* @param <A> the type of the eight argument to the function
33+
* @param <B> the type of the ninth argument to the function
3434
* @param <R> the type of the result of the function
3535
*
3636
* @see OctoFunction

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @param <X> the type of the fifth argument to the function
3030
* @param <Y> the type of the sixth argument to the function
3131
* @param <Z> the type of the seventh argument to the function
32-
* @param <Z> the type of the eight argument to the function
32+
* @param <A> the type of the eight argument to the function
3333
* @param <R> the type of the result of the function
3434
*
3535
* @see SeptiFunction

‎src/main/java/no/digipost/jaxb/SimpleXmlAdapter.java

-95
This file was deleted.

0 commit comments

Comments
 (0)