Skip to content

Commit

Permalink
Merge pull request #57 from digipost/gh_release_action
Browse files Browse the repository at this point in the history
Ta i bruk nyeste super-pom og action deploy for snapshot og release
  • Loading branch information
eivinhb authored Dec 5, 2019
2 parents d643795 + f8bd461 commit 1eab826
Show file tree
Hide file tree
Showing 7 changed files with 104 additions and 30 deletions.
37 changes: 37 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -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
21 changes: 21 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -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
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule ".travis"]
path = .travis
url = https://github.com/digipost/digipost-open-travis-config
1 change: 0 additions & 1 deletion .travis
Submodule .travis deleted from e57885
24 changes: 0 additions & 24 deletions .travis.yml

This file was deleted.

7 changes: 7 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,20 @@ under the License.
This project includes:
ClassMate under The Apache Software License, Version 2.0
Digipost Data Types under The Apache Software License, Version 2.0
Extended StAX API under Eclipse Distribution License - v 1.0
fastinfoset under Apache License, Version 2.0 or Eclipse Distribution License - v 1.0
Hibernate Validator Engine under Apache License 2.0
istack common utility code runtime under Eclipse Distribution License - v 1.0
Jackson datatype: JSR310 under The Apache Software License, Version 2.0
Jackson-annotations under The Apache Software License, Version 2.0
Jackson-core under The Apache Software License, Version 2.0
jackson-databind under The Apache Software License, Version 2.0
Jakarta Bean Validation API under Apache License 2.0
Jakarta Expression Language 3.0 under EPL 2.0 or GPL2 w/ CPE
jakarta.xml.bind-api under Eclipse Distribution License - v 1.0
JavaBeans Activation Framework API jar under EDL 1.0
JAXB Runtime under Eclipse Distribution License - v 1.0
JBoss Logging 3 under Apache License, version 2.0
Project Lombok under The MIT License
TXW2 Runtime under Eclipse Distribution License - v 1.0

41 changes: 39 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.16.16</version>
<version>1.18.10</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -83,6 +83,17 @@
<version>3.0.3</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand Down Expand Up @@ -217,7 +228,7 @@
<plugin>
<groupId>org.projectlombok</groupId>
<artifactId>lombok-maven-plugin</artifactId>
<version>1.16.16.0</version>
<version>1.18.10.0</version>
<executions>
<execution>
<phase>generate-sources</phase>
Expand All @@ -244,6 +255,19 @@
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.2</version>
<scope>runtime</scope>
</dependency>
</dependencies>
<configuration>
<sources>
<source>${project.build.directory}/schemagen-work/lombok</source>
Expand Down Expand Up @@ -335,6 +359,19 @@
<phase>generate-resources</phase>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.2</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
Expand Down

0 comments on commit 1eab826

Please sign in to comment.