diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 15570d8..6ca5e4a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -5,8 +5,8 @@ on: - master env: - RELEASE_VERSION: "0.4.23" - DEVELOP_VERSION: "0.4.24-SNAPSHOT" + RELEASE_VERSION: "0.4.24" + DEVELOP_VERSION: "0.4.25-SNAPSHOT" GIT_AUTHOR_NAME: "@swisspost-devs" GIT_AUTHOR_EMAIL: "oss@post.ch" GIT_COMMITTER_NAME: "swisspost-devs" diff --git a/README.md b/README.md index 2883886..08b15a9 100644 --- a/README.md +++ b/README.md @@ -73,5 +73,8 @@ There is a complete [documentation](https://nidi3.github.io/apikana-java/site/pl ### Development The development is done in the `develop` branch. -Releasing is done by defining the release and new development version in `release.sh` and by rebasing the develop branch onto the master branch. -[Travis CI](https://travis-ci.org) will then pick this up and perform the release. + +### Release +Releasing is done by incrementing the new RELEASE and DEVELOP version in `publish.yml` and by merging the develop branch +into the master branch. [GitHub Actions](https://github.com/swisspost/apikana-java/actions) will then pick this up and +perform the release. diff --git a/apikana-maven-plugin/pom.xml b/apikana-maven-plugin/pom.xml index ebd1365..3566dfb 100644 --- a/apikana-maven-plugin/pom.xml +++ b/apikana-maven-plugin/pom.xml @@ -5,7 +5,7 @@ org.swisspush.apikana apikana - 0.4.24-SNAPSHOT + 0.4.23 org.swisspush.maven.plugins diff --git a/apikana-parent/pom.xml b/apikana-parent/pom.xml index 94a5891..632a820 100644 --- a/apikana-parent/pom.xml +++ b/apikana-parent/pom.xml @@ -5,7 +5,7 @@ org.swisspush.apikana apikana - 0.4.24-SNAPSHOT + 0.4.23 apikana-parent diff --git a/pom.xml b/pom.xml index 32fd0b9..417fa8e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.swisspush.apikana apikana - 0.4.24-SNAPSHOT + 0.4.23 pom ${project.artifactId}