Skip to content

Commit

Permalink
Merge branch 'release/1.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
zambrovski committed Nov 23, 2023
2 parents 9b0d5f6 + 7e56882 commit ec121eb
Show file tree
Hide file tree
Showing 30 changed files with 224 additions and 334 deletions.
2 changes: 2 additions & 0 deletions .github/release-notes.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
changelog:
sections:
- title: ":zap: Breaking Changes"
labels: [ "Type: breaking" ]
- title: ":rocket: Enhancements & Features"
labels: [ "Type: enhancement", "Type: documentation", "Type: example" ]
- title: ":bug: Bug Fixes"
Expand Down
23 changes: 6 additions & 17 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,16 @@ jobs:
uses: actions/checkout@v2

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.9
cache: pip

- name: Upgrade pip
run: |
# install pip=>20.1 to use "pip cache dir"
python3 -m pip install --upgrade pip
- name: Get pip cache dir
id: pip-cache
run: echo "::set-output name=dir::$(pip cache dir)"

- name: Cache dependencies
uses: actions/cache@v2
with:
path: ${{ steps.pip-cache.outputs.dir }}
key: ${{ runner.os }}-pip-${{ hashFiles('./docs/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Install dependencies
run: python3 -m pip install -r ./docs/requirements.txt

Expand All @@ -48,7 +37,7 @@ jobs:
GH_USERNAME: ${{ github.actor }}

- name: Pre-fetch the gh-pages branch
run: git fetch
run: git fetch --depth=1

- name: Build docs with MkDocs
run: mkdocs build
Expand All @@ -61,13 +50,13 @@ jobs:
# This is for a tagged version
- name: Create a new version of documentation and push to GH pages.
if: startsWith(github.ref, 'refs/tags/')
run: mike deploy ${{ steps.get_tag_name.outputs.TAG_NAME }} stable --push --rebase -u
run: mike deploy ${{ steps.get_tag_name.outputs.TAG_NAME }} stable --push -u

- name: Make stable to default.
if: startsWith(github.ref, 'refs/tags/')
run: mike set-default stable --push --rebase
run: mike set-default stable --push

# This is for develop
- name: Deploy latest develop snapshot docs to GH pages.
if: github.ref == 'refs/heads/develop'
run: mike deploy snapshot --push --rebase -u
run: mike deploy snapshot --push -u
20 changes: 13 additions & 7 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,6 @@ jobs:
server-username: OSS_CENTRAL_USERNAME # env variable for Maven Central
server-password: OSS_CENTRAL_PASSWORD # env variable for Maven Central

# Get GPG private key into GPG
- name: Import GPG Owner Trust
run: echo ${{ secrets.GPG_OWNERTRUST }} | base64 --decode | gpg --import-ownertrust

- name: Import GPG key
run: echo ${{ secrets.GPG_SECRET_KEYS }} | base64 --decode | gpg --import --no-tty --batch --yes

- name: Prepare mvnw
run: chmod +x ./mvnw

Expand All @@ -39,12 +32,25 @@ jobs:
- name: Run integration tests and generate coverage reports
run: ./mvnw -Pitest verify failsafe:verify

# Get GPG private key into GPG
- name: Import GPG Owner Trust
run: echo ${{ secrets.GPG_OWNERTRUST }} | base64 --decode | gpg --import-ownertrust

- name: Import GPG key
run: echo ${{ secrets.GPG_SECRET_KEYS }} | base64 --decode | gpg --import --no-tty --batch --yes

- name: Deploy a new version to central
run: ./mvnw clean deploy -B -DskipTests -DskipExamples -Prelease -Dgpg.keyname="${{secrets.GPG_KEYNAME}}" -Dgpg.passphrase="${{secrets.GPG_PASSPHRASE}}"
env:
OSS_CENTRAL_USERNAME: "${{ secrets.SONATYPE_USERNAME }}"
OSS_CENTRAL_PASSWORD: "${{ secrets.SONATYPE_PASSWORD }}"

- name: Upload coverage to Codecov
if: github.event_name == 'push' && github.actor != 'dependabot[bot]'
uses: codecov/codecov-action@v3
with:
token: ${{secrets.CODECOV_TOKEN}}

- name: Upload test coverage to Codacy
if: github.event_name == 'push' && github.actor != 'dependabot[bot]'
run: bash <(curl -Ls https://coverage.codacy.com/get.sh)
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## Camunda BPM Data

[![stable](https://img.shields.io/badge/lifecycle-STABLE-green.svg)](https://github.com/holisticon#open-source-lifecycle)
[![Camunda 7.20](https://img.shields.io/badge/Camunda%20Version-7.20-orange.svg)](https://docs.camunda.org/manual/7.20/)
[![Build Status](https://github.com/holunda-io/camunda-bpm-data/workflows/default/badge.svg)](https://github.com/holunda-io/camunda-bpm-data/actions)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.holunda.data/camunda-bpm-data/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.holunda.data/camunda-bpm-data)
[![CodeCov](https://codecov.io/gh/holunda-io/camunda-bpm-data/branch/master/graph/badge.svg)](https://codecov.io/gh/holunda-io/camunda-bpm-data)
Expand Down Expand Up @@ -41,20 +42,20 @@ If you just want to start using the library, put the following dependency into y
<dependency>
<groupId>io.holunda.data</groupId>
<artifactId>camunda-bpm-data</artifactId>
<version>1.2.6</version>
<version>1.4.0</version>
</dependency>
```

If you are using Gradle Kotlin DSL add to your `build.gradle.kts`:

``` kotlin
implementation("io.holunda.data:camunda-bpm-data:1.2.6")
implementation("io.holunda.data:camunda-bpm-data:1.4.0")
```

For Gradle Groovy DSL add to your `build.gradle`:

``` groovy
implementation 'io.holunda.data:camunda-bpm-data:1.2.6'
implementation 'io.holunda.data:camunda-bpm-data:1.4.0'
```
### Variable declaration
Now your setup is completed, and you can declare your variables like this:
Expand Down
2 changes: 1 addition & 1 deletion example/coverage-report-aggregator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.data.example</groupId>
<artifactId>camunda-bpm-data-example-parent</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>

<artifactId>camunda-bpm-data-coverage-report</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion example/example-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.data.example</groupId>
<artifactId>camunda-bpm-data-example-parent</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>

<artifactId>camunda-bpm-data-example-java</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion example/example-kotlin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.data.example</groupId>
<artifactId>camunda-bpm-data-example-parent</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>

<artifactId>camunda-bpm-data-example-kotlin</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ class OrderApproval {
}

object Variables {
val ORDER_ID = stringVariable("orderId")
val ORDER_ID = stringVariable("orderId").nonNull
val ORDER_APPROVED = booleanVariable("orderApproved").nonNull
val ORDER: VariableFactory<Order> = customVariable("order")
val ORDER_APPROVED = booleanVariable("orderApproved")
val ORDER_POSITION: VariableFactory<OrderPosition> = customVariable("orderPosition")
val ORDER_TOTAL: VariableFactory<BigDecimal> = customVariable("orderTotal")
}
Expand Down
9 changes: 1 addition & 8 deletions example/example-no-engine/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.data.example</groupId>
<artifactId>camunda-bpm-data-example-parent</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>

<artifactId>camunda-bpm-data-example-no-engine</artifactId>
Expand All @@ -20,13 +20,6 @@
<dependency>
<groupId>io.holunda.data</groupId>
<artifactId>camunda-bpm-data</artifactId>
<exclusions>
<!-- Camunda Engine is NOT on the classpath -->
<exclusion>
<groupId>org.camunda.bpm</groupId>
<artifactId>camunda-engine</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion example/itest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.data.example</groupId>
<artifactId>camunda-bpm-data-example-parent</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>

<artifactId>camunda-bpm-data-integration-test</artifactId>
Expand Down
14 changes: 7 additions & 7 deletions example/itest/src/test/kotlin/itest/CamundaBpmDataITestBase.kt
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ abstract class CamundaBpmDataITestBase : SpringScenarioTest<ActionStage, ActionS

companion object {

val STRING_VAR: VariableFactory<String> = stringVariable("String Variable")
val DATE_VAR: VariableFactory<Date> = dateVariable("Date Variable")
val SHORT_VAR: VariableFactory<Short> = shortVariable("Short Variable")
val INT_VAR: VariableFactory<Int> = intVariable("Int Variable")
val LONG_VAR: VariableFactory<Long> = longVariable("Long Variable")
val DOUBLE_VAR: VariableFactory<Double> = doubleVariable("Double Variable")
val BOOLEAN_VAR: VariableFactory<Boolean> = booleanVariable("Boolean Variable")
val STRING_VAR: VariableFactory<String> = stringVariable("String Variable").nonNull
val DATE_VAR: VariableFactory<Date> = dateVariable("Date Variable").nonNull
val SHORT_VAR: VariableFactory<Short> = shortVariable("Short Variable").nonNull
val INT_VAR: VariableFactory<Int> = intVariable("Int Variable").nonNull
val LONG_VAR: VariableFactory<Long> = longVariable("Long Variable").nonNull
val DOUBLE_VAR: VariableFactory<Double> = doubleVariable("Double Variable").nonNull
val BOOLEAN_VAR: VariableFactory<Boolean> = booleanVariable("Boolean Variable").nonNull
val COMPLEX_VAR: VariableFactory<ComplexDataStructure> = customVariable("Complex Variable")
val LIST_STRING_VAR: VariableFactory<List<String>> = listVariable("List Of String Variable")
val SET_STRING_VAR: VariableFactory<Set<String>> = setVariable("Set Of String Variable")
Expand Down
2 changes: 1 addition & 1 deletion example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.data</groupId>
<artifactId>camunda-bpm-data-parent</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>

<groupId>io.holunda.data.example</groupId>
Expand Down
2 changes: 1 addition & 1 deletion example/spin-type-detector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.holunda.data.example</groupId>
<artifactId>camunda-bpm-data-example-parent</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</parent>

<artifactId>camunda-bpm-data-spin-type-detector</artifactId>
Expand Down
123 changes: 0 additions & 123 deletions extension/c7/pom.xml

This file was deleted.

Loading

0 comments on commit ec121eb

Please sign in to comment.