From 195fb238d0f5fc9c8c07703b10716f8c75d10b1e Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Sat, 28 Nov 2020 11:02:27 +0100 Subject: [PATCH 1/5] Update versions for the release. --- agrirouter-api-java-api/pom.xml | 2 +- agrirouter-api-java-convenience/pom.xml | 2 +- agrirouter-api-java-impl/pom.xml | 2 +- agrirouter-api-tests/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/agrirouter-api-java-api/pom.xml b/agrirouter-api-java-api/pom.xml index b568c4a9..3d2bc243 100644 --- a/agrirouter-api-java-api/pom.xml +++ b/agrirouter-api-java-api/pom.xml @@ -5,7 +5,7 @@ com.agrirouter.api agrirouter-api-java - 1.3.2-SNAPSHOT + 1.4.0 AGRIROUTER API JAVA - API agrirouter-api-java-api diff --git a/agrirouter-api-java-convenience/pom.xml b/agrirouter-api-java-convenience/pom.xml index 39460e82..253b5ad1 100644 --- a/agrirouter-api-java-convenience/pom.xml +++ b/agrirouter-api-java-convenience/pom.xml @@ -5,7 +5,7 @@ com.agrirouter.api agrirouter-api-java - 1.3.2-SNAPSHOT + 1.4.0 AGRIROUTER API JAVA - CONVENIENCE agrirouter-api-java-convenience diff --git a/agrirouter-api-java-impl/pom.xml b/agrirouter-api-java-impl/pom.xml index 5bd04aac..d09bf723 100644 --- a/agrirouter-api-java-impl/pom.xml +++ b/agrirouter-api-java-impl/pom.xml @@ -6,7 +6,7 @@ com.agrirouter.api agrirouter-api-java - 1.3.2-SNAPSHOT + 1.4.0 AGRIROUTER API JAVA - IMPL agrirouter-api-java-impl diff --git a/agrirouter-api-tests/pom.xml b/agrirouter-api-tests/pom.xml index 132fba6e..70b0b576 100644 --- a/agrirouter-api-tests/pom.xml +++ b/agrirouter-api-tests/pom.xml @@ -5,7 +5,7 @@ agrirouter-api-java com.agrirouter.api - 1.3.2-SNAPSHOT + 1.4.0 4.0.0 AGRIROUTER API JAVA - TESTS diff --git a/pom.xml b/pom.xml index 799a2d92..37fd2257 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.agrirouter.api agrirouter-api-java - 1.3.2-SNAPSHOT + 1.4.0 pom AGRIROUTER API JAVA From 5455826ea505499b652024e04ebc1e7b80e51f54 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Sat, 13 Mar 2021 16:51:29 +0100 Subject: [PATCH 2/5] Move back to tags instead of branches to have no new releases for documentation / workflow updates. --- .github/workflows/release.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ec361003..35c7278c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,8 +2,9 @@ name: Release on: push: - branches: - - master + tags: + - 1.* + - 2.* jobs: deploy: From d0eca247b93194e8cb96a01dc04af776d060cc70 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Sat, 13 Mar 2021 16:54:35 +0100 Subject: [PATCH 3/5] Update documentation. --- README.adoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.adoc b/README.adoc index 0af65351..a9fbe8c0 100644 --- a/README.adoc +++ b/README.adoc @@ -30,6 +30,10 @@ Feel free to get in touch by visiting our https://www.lmis.de[website] or contac This project contains the API for the communication with the agrirouter. Everything you need for the onboarding process, secure communication and much more. +== Releases + +The release workflow follows the https://docs.microsoft.com/en-us/azure/devops/repos/git/git-branching-guidance?view=azure-devops[Microsoft DevOps Release Model] where a release shows up as a branch in the repository. + == Modules === `api` Module From 6d5a5a92e0c1bac1bb898710163b98dd22c1e26b Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Sat, 13 Mar 2021 16:57:59 +0100 Subject: [PATCH 4/5] Update supported Java versions. --- .github/workflows/continuous_integration.yml | 48 ++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index 0f8f4064..44f25430 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -54,6 +54,54 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: mvn -B package --file pom.xml --settings ci/settings.xml -DskipTests=true + build_jdk12: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 12 + uses: actions/setup-java@v1 + with: + java-version: 12 + - name: Build with Maven + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: mvn -B package --file pom.xml --settings ci/settings.xml -DskipTests=true + build_jdk13: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 13 + uses: actions/setup-java@v1 + with: + java-version: 13 + - name: Build with Maven + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: mvn -B package --file pom.xml --settings ci/settings.xml -DskipTests=true + build_jdk14: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 14 + uses: actions/setup-java@v1 + with: + java-version: 14 + - name: Build with Maven + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: mvn -B package --file pom.xml --settings ci/settings.xml -DskipTests=true + build_jdk15: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 15 + uses: actions/setup-java@v1 + with: + java-version: 15 + - name: Build with Maven + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: mvn -B package --file pom.xml --settings ci/settings.xml -DskipTests=true integration_test: runs-on: ubuntu-latest steps: From 9de2be240751cc654847a134f7b8d565a793a9b0 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Sat, 13 Mar 2021 17:06:48 +0100 Subject: [PATCH 5/5] Update version to the next release version. --- agrirouter-api-java-api/pom.xml | 2 +- agrirouter-api-java-convenience/pom.xml | 2 +- agrirouter-api-java-impl/pom.xml | 2 +- agrirouter-api-tests/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/agrirouter-api-java-api/pom.xml b/agrirouter-api-java-api/pom.xml index 3d2bc243..1faf659f 100644 --- a/agrirouter-api-java-api/pom.xml +++ b/agrirouter-api-java-api/pom.xml @@ -5,7 +5,7 @@ com.agrirouter.api agrirouter-api-java - 1.4.0 + 2.0.0-SNAPSHOT AGRIROUTER API JAVA - API agrirouter-api-java-api diff --git a/agrirouter-api-java-convenience/pom.xml b/agrirouter-api-java-convenience/pom.xml index 253b5ad1..42b473c1 100644 --- a/agrirouter-api-java-convenience/pom.xml +++ b/agrirouter-api-java-convenience/pom.xml @@ -5,7 +5,7 @@ com.agrirouter.api agrirouter-api-java - 1.4.0 + 2.0.0-SNAPSHOT AGRIROUTER API JAVA - CONVENIENCE agrirouter-api-java-convenience diff --git a/agrirouter-api-java-impl/pom.xml b/agrirouter-api-java-impl/pom.xml index d09bf723..c6cbf5ff 100644 --- a/agrirouter-api-java-impl/pom.xml +++ b/agrirouter-api-java-impl/pom.xml @@ -6,7 +6,7 @@ com.agrirouter.api agrirouter-api-java - 1.4.0 + 2.0.0-SNAPSHOT AGRIROUTER API JAVA - IMPL agrirouter-api-java-impl diff --git a/agrirouter-api-tests/pom.xml b/agrirouter-api-tests/pom.xml index 70b0b576..cdcce731 100644 --- a/agrirouter-api-tests/pom.xml +++ b/agrirouter-api-tests/pom.xml @@ -5,7 +5,7 @@ agrirouter-api-java com.agrirouter.api - 1.4.0 + 2.0.0-SNAPSHOT 4.0.0 AGRIROUTER API JAVA - TESTS diff --git a/pom.xml b/pom.xml index 37fd2257..27659504 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.agrirouter.api agrirouter-api-java - 1.4.0 + 2.0.0-SNAPSHOT pom AGRIROUTER API JAVA