diff --git a/.github/workflows/increment-version.yml b/.github/workflows/increment-version.yml index 4a0fe715..f0c3dfd1 100644 --- a/.github/workflows/increment-version.yml +++ b/.github/workflows/increment-version.yml @@ -3,14 +3,14 @@ name: Increment Version on: workflow_dispatch: inputs: - release-version: - description: "release-version" - required: true - default: "0.25.1" old-version: description: "old-version" required: true default: "0.25.0" + release-version: + description: "release-version" + required: true + default: "0.25.1" jobs: run-script: diff --git a/.github/workflows/mvn-set-version.yml b/.github/workflows/mvn-set-version.yml new file mode 100644 index 00000000..0c90776f --- /dev/null +++ b/.github/workflows/mvn-set-version.yml @@ -0,0 +1,34 @@ +name: Increment Version + +on: + workflow_dispatch: + inputs: + new-version: + description: "new-version" + required: true + default: "0.25.0-SNAPSHOT" + +jobs: + run-script: + runs-on: ubuntu-latest + + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Setup Java + uses: actions/setup-java@v4 + with: + distribution: zulu + java-version: 21 + cache: maven + + - name: Build with Maven + shell: bash + run: | + git config user.name '${{ github.actor }}' + git config user.email '${{ github.actor }}@users.noreply.github.com' + mvn versions:set -DnewVersion="${{ inputs.new-version }}" + mvn versions:commit + git commit -a -m "mvn set version to ${{ inputs.new-version }}" + git push origin diff --git a/README.md b/README.md index 260c265d..ed12f2e6 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ japicmp is available in the Maven Central Repository: com.github.siom79.japicmp japicmp - 0.25.2 + 0.25.3 ``` A maven plugin allows you to integrate the checks into your build: @@ -27,7 +27,7 @@ A maven plugin allows you to integrate the checks into your build: com.github.siom79.japicmp japicmp-maven-plugin - 0.25.2 + 0.25.3 @@ -152,11 +152,7 @@ This is the release procedure: mvn versions:set -DnewVersion=-SNAPSHOT mvn versions:commit ``` -* Increment version in README.md / Site-Report -``` bash -python3 release.py --release-version --old-version -``` -* Push changes to remote repository. +* Increment version in README.md / Site-Report by running [this Action](https://github.com/siom79/japicmp/actions/workflows/increment-version.yml) on the release branch * Run release [Action](https://github.com/siom79/japicmp/actions/workflows/release.yml) * Login to [Central repository](https://central.sonatype.com/publishing) * Download released artifact from staging repository. diff --git a/pom.xml b/pom.xml index c3cd86a6..d34cc3ca 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 com.github.siom79.japicmp @@ -448,7 +447,7 @@ scm:git:https://github.com/${github.account}/${github.project}.git scm:git:https://github.com/${github.account}/${github.project}.git https://github.com/${github.account}/${github.project}.git - japicmp-base-0.24.2 + japicmp-base-0.25.2 diff --git a/src/site/markdown/CliTool.md b/src/site/markdown/CliTool.md index de9ba4dc..ba4d67df 100644 --- a/src/site/markdown/CliTool.md +++ b/src/site/markdown/CliTool.md @@ -147,18 +147,18 @@ When your library implements interfaces or extends classes from other libraries compatibility you must specify the classpath for the two different versions: ```bash -java -jar japicmp-0.25.2-jar-with-dependencies.jar -n new-version.jar -o old-version.jar --new-classpath other-library-v2.jar +java -jar japicmp-0.25.3-jar-with-dependencies.jar -n new-version.jar -o old-version.jar --new-classpath other-library-v2.jar --old-classpath other-library-v1.jar ``` In case the classpath for both versions did not change, you can add the library using the standard way: ```bash -java -cp japicmp-0.25.2-jar-with-dependencies.jar;otherLibrary.jar japicmp.JApiCmp -n new-version.jar -o old-version.jar +java -cp japicmp-0.25.3-jar-with-dependencies.jar;otherLibrary.jar japicmp.JApiCmp -n new-version.jar -o old-version.jar ``` For reporting purposes you can also provide more than one jar as old or new version(s): ```bash -java -jar japicmp-0.25.2-jar-with-dependencies.jar -o lib1-old.jar;lib2-old.jar -n lib1-new.jar;lib2-new.jar +java -jar japicmp-0.25.3-jar-with-dependencies.jar -o lib1-old.jar;lib2-old.jar -n lib1-new.jar;lib2-new.jar ``` diff --git a/src/site/markdown/MavenPlugin.md b/src/site/markdown/MavenPlugin.md index 0c8cb482..2aa07578 100644 --- a/src/site/markdown/MavenPlugin.md +++ b/src/site/markdown/MavenPlugin.md @@ -10,7 +10,7 @@ The maven plugin can be included in the pom.xml file of your artifact in the fol com.github.siom79.japicmp japicmp-maven-plugin - 0.25.2 + 0.25.3 @@ -46,7 +46,7 @@ You can also leave out the <oldVersion> and <newVersion> elements: com.github.siom79.japicmp japicmp-maven-plugin - 0.25.2 + 0.25.3 @@ -70,7 +70,7 @@ to configure the latest version more precisely (e.g. only GA versions), then you com.github.siom79.japicmp japicmp-maven-plugin - 0.25.2 + 0.25.3 \d+\.\d+\.\d+\.GA @@ -116,13 +116,13 @@ An advanced configuration can utilize the following parameters: com.github.siom79.japicmp japicmp-maven-plugin - 0.25.2 + 0.25.3 japicmp japicmp-test-v1 - 0.25.2 + 0.25.3 jar @@ -382,7 +382,7 @@ Alternatively it can be used inside the `` tag in order to be invoke com.github.siom79.japicmp japicmp-maven-plugin - 0.25.2 + 0.25.3 diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md index f57b8fdf..420cb0fc 100644 --- a/src/site/markdown/index.md +++ b/src/site/markdown/index.md @@ -4,7 +4,7 @@ japicmp japicmp is a tool to compare two versions of a jar archive: ```bash -java -jar japicmp-0.25.2-jar-with-dependencies.jar -n new-version.jar -o old-version.jar +java -jar japicmp-0.25.3-jar-with-dependencies.jar -n new-version.jar -o old-version.jar ``` It can also be used as a library: @@ -21,7 +21,7 @@ japicmp is available in the Maven Central Repository: com.github.siom79.japicmp japicmp - 0.25.2 + 0.25.3 ``` @@ -31,7 +31,7 @@ A maven plugin allows you to integrate the checks into your build: com.github.siom79.japicmp japicmp-maven-plugin - 0.25.2 + 0.25.3