Skip to content

Commit

Permalink
Merge branch 'version/1.5.2' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
rnschk committed Dec 16, 2022
2 parents d5071d3 + 57c30a6 commit f376f17
Show file tree
Hide file tree
Showing 5 changed files with 78 additions and 42 deletions.
49 changes: 10 additions & 39 deletions .github/workflows/maven-build.yml
Original file line number Diff line number Diff line change
@@ -1,51 +1,22 @@
#
# BSD 3-Clause License
#
# Copyright (c) 2021, viadee IT-Unternehmensberatung AG
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# 3. Neither the name of the copyright holder nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

name: Java CI
name: Build Maven

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]
branches:
- '**'
- '!develop'
- '!main'

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up JDK 1.8
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
java-version: 1.8
distribution: 'temurin'
java-version: '8'
cache: 'maven'
- name: Build with Maven
run: mvn -B verify --file pom.xml
31 changes: 31 additions & 0 deletions .github/workflows/maven-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Release Artifact

on:
release:
types: [ created ]
workflow_dispatch:

jobs:
publish:
runs-on: ubuntu-latest
steps:
- name: Import GPG Key
uses: crazy-max/ghaction-import-gpg@v4
with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.GPG_PASSPHRASE }}
- uses: actions/checkout@v3
- name: Set up Maven Central Repository
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '8'
cache: 'maven'
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Publish package
run: mvn -DperformRelease=true clean package source:jar javadoc:jar deploy --batch-mode
env:
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
33 changes: 33 additions & 0 deletions .github/workflows/maven-snapshot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Release Snapshot

on:
push:
branches: [ develop ]
pull_request:
branches: [ develop ]
workflow_dispatch:

jobs:
publish:
runs-on: ubuntu-latest
steps:
- name: Import GPG Key
uses: crazy-max/ghaction-import-gpg@v4
with:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.GPG_PASSPHRASE }}
- uses: actions/checkout@v3
- name: Set up Maven Central Repository
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '8'
cache: 'maven'
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Publish package
run: mvn clean package source:jar javadoc:jar deploy --batch-mode
env:
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Compiled class file
*.class
target/
.local/

# Log file
*.log
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<description>This tool helps to control the retry-behaviour in external-task-handlers
based on the official java-client provided by Camunda BPM
</description>
<version>1.5.1</version>
<version>1.5.2</version>
<inceptionYear>2021</inceptionYear>

<organization>
Expand Down Expand Up @@ -41,10 +41,10 @@
<external-task-client.version>7.18.0</external-task-client.version>
<commons-lang3.version>3.11</commons-lang3.version>
<junit.version>4.13.2</junit.version>
<mockito.version>4.8.1</mockito.version>
<mockito.version>4.9.0</mockito.version>

<!-- plugins -->
<maven-release.version>3.0.0-M6</maven-release.version>
<maven-release.version>3.0.0-M7</maven-release.version>
<maven-source.version>3.2.1</maven-source.version>
<maven-compiler.version>3.10.1</maven-compiler.version>
<license-maven.version>4.1</license-maven.version>
Expand Down

0 comments on commit f376f17

Please sign in to comment.