diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..01ebc156 --- /dev/null +++ b/.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/action-maven-publish@1.1.0 + with: + sonatype_secrets: ${{ secrets.sonatype_secrets }} + release_version: ${{ env.RELEASE_VERSION }} + perform_release: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000..29e92841 --- /dev/null +++ b/.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/action-maven-publish@1.1.0 + with: + sonatype_secrets: ${{ secrets.sonatype_secrets }} + release_version: ${{ env.RELEASE_VERSION }} + perform_release: true diff --git a/.gitmodules b/.gitmodules index 4bf75823..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule ".travis"] - path = .travis - url = https://github.com/digipost/digipost-open-travis-config diff --git a/.travis b/.travis deleted file mode 160000 index e57885d0..00000000 --- a/.travis +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e57885d09c03991dcab546fcfe6f3008ebf079f8 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 2a045786..00000000 --- a/.travis.yml +++ /dev/null @@ -1,24 +0,0 @@ -dist: trusty -language: java - -jdk: -- oraclejdk8 -#- openjdk11 # will not build on JDK > 8, until we upgrade Lombok -#- openjdk12 - -cache: - directories: - - "$HOME/.m2" - -env: - global: - - secure: dEmO9A2TvDhHBVwuMq7nUqO7IBtSwStTqZ/jwscAPdgKIB/lE/+Zojk4ovBoSKgu/sW+Zr3KOGgikrJoTinSmvlu2sZXkS0AetZoGjG9iympqOH/a9yiiIlDhSjccxWyfStHpXNYBFs8/dpQ3S8omAue2WNWrI3TK0u7Kw4XRvH0RB/byyvv6zFp6Dnyx8doK96MHXTGIWdWV99xtz5a24s/TMpND2ohFvgrtXbc9nNV/YZbui2RGhX50cBrUPoiNBGh+FnBSSjdwhTA1bGzDog0ym1aQ9/Uya5qmpHS8Z5vCRgWvYQW/l7v/y4Jvolz8sJRccf7pj8qTpmfKKP1nj1P5bX+Hn6TYKBRzBJaHxPn4XWi/E7bCbssLvEPmE2oYWvExnKaHzERJlkMoNOtiRNfm+RWQRLvEIXsbwnr8hL1GUYlokeHDiQMM896tAdmPn9kh73huThNTVn25XZPKc3o1W18pmQjpcO8rW2FDVR73vvW1kmldRJd/UU+oqM96QYwWcRFpCmRzNWIAntJo8yQXkCcUsHA9a14nuTHAeYWbczv9d9+X+ypbsjHg4PCvkkKYz6DfwElUjrShbhgUMqu4qOzgu0gW5ZhRAEQlCqF9WjgyzeYxzcKakZQxqriSOkYKL9xFDaiFe0CaQOqNL9WOaggah7cKjiopvAEgPo= - - secure: huH1J4qQxTu/ll2QmozX+QbcQBUinmOEW+UnmZzWyib8l40nmXzul8c9/9RQgk732yTkqHAJrNd6hbFwN786nRLThfTGnvTSTUwBNyBvfnnVppm5IKU0VPa5hCLCNHz/e3WG4qdOAZMnd/NnoB8diRaC9vOxaiXPumN51hx9nkahhs3JdbCU/ZW1zHTf7U+Kh6UP4V4DXimwnqwlTgrO4jvcb+pwGzVKt+BNi1lP4Xzajm400FEkbZbscr3Wc6MXNFoIawQbENbvQr4LJyh3Tys9YRTTHWF78vGnENiaz0VWQ5Zxv71DSTlMqnyk2uGyIQmbpqM1HsbOgk8dpoeMC5+EEBc4C905Q8JMjMoh7vf+7ipnAmC1HPGWicwq9MOZ60jnoiCBpsk75JuzESB909Ecxz28AnR81Kh6eKwT5q5HTy4cMUHV9yVsnMDisj8/C2yuEVRjeIIP5ebg3QACrIVty6jJIbScLWOX8Bzky38kn8faJ/DvS8Nap5f29d5hp1wGI85Zq86EgRJZYIpfjoF6EIVRGZrVGzc1+cA/9pQhBSLjwquLqOeoLuV26SHvEExZEvvtgniH7RXZ8ktVnUKKgezqiiQpiCJuhNkKHKiCy+uznEiPPccNIDcyEtHOoj87uDO/MeyvjbdzQS9xsyFax9k7UJWbauzCmn/WlyA= - -install: true - -before_script: -- cp .travis/maven.settings.xml ~/.m2/settings.xml - -script: -- mvn clean deploy --update-snapshots diff --git a/NOTICE b/NOTICE index 42b79f0a..50b85d2d 100644 --- a/NOTICE +++ b/NOTICE @@ -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 diff --git a/pom.xml b/pom.xml index 0572f2d5..85377be6 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ org.projectlombok lombok - 1.16.16 + 1.18.10 provided @@ -83,6 +83,17 @@ 3.0.3 runtime + + jakarta.xml.bind + jakarta.xml.bind-api + 2.3.2 + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + runtime + org.junit.jupiter junit-jupiter-api @@ -217,7 +228,7 @@ org.projectlombok lombok-maven-plugin - 1.16.16.0 + 1.18.10.0 generate-sources @@ -244,6 +255,19 @@ + + + jakarta.xml.bind + jakarta.xml.bind-api + 2.3.2 + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + runtime + + ${project.build.directory}/schemagen-work/lombok @@ -335,6 +359,19 @@ generate-resources + + + jakarta.xml.bind + jakarta.xml.bind-api + 2.3.2 + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + runtime + +