From 05375e7cfd8bfb9d4cce92af68489e68db97bfb3 Mon Sep 17 00:00:00 2001 From: Daniel Kocot Date: Sat, 17 Apr 2021 00:09:05 +0200 Subject: [PATCH 1/3] set revision 2.1.0-alpha --- pom.xml | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 102 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3a2ac80..24f19a4 100644 --- a/pom.xml +++ b/pom.xml @@ -7,11 +7,11 @@ de.codecentric.reedelk module-parent - 2.0.0 + 2.1.0-alpha bundle - 2.0.0 + 2.1.0-alpha module-file @@ -20,6 +20,14 @@ UTF-8 5.5.2 0.8.2 + + + 2.8.1 + 3.0.0-M1 + 1.6 + 3.2.1 + 3.2.0 + 1.6.8 @@ -82,4 +90,96 @@ + + + + central-deploy + + + + maven-gpg-plugin + ${maven-gpg-plugin.version} + + + sign-artifacts + verify + + sign + + + + + --pinentry-mode + loopback + + + + + + + org.codehaus.mojo + versions-maven-plugin + ${versions-maven-plugin.version} + + false + + + + maven-deploy-plugin + ${maven-deploy-plugin.version} + + true + + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + attach-javadocs + + jar + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${nexus-staging-maven-plugin.version} + true + + oss.sonatype.org + https://oss.sonatype.org/ + ${project.version} + + + + deploy-to-sonatype + deploy + + deploy + release + + + + + + + + From af35ea5cb147bfcc796221a3c819241047fdf642 Mon Sep 17 00:00:00 2001 From: Daniel Kocot Date: Fri, 23 Apr 2021 11:18:33 +0200 Subject: [PATCH 2/3] prepared 2.1.0-beta3 --- pom.xml | 129 ++++++++++++-------------------------------------------- 1 file changed, 27 insertions(+), 102 deletions(-) diff --git a/pom.xml b/pom.xml index 24f19a4..0798657 100644 --- a/pom.xml +++ b/pom.xml @@ -7,11 +7,11 @@ de.codecentric.reedelk module-parent - 2.1.0-alpha + 2.1.0-beta3 bundle - 2.1.0-alpha + 2.1.0-beta3 module-file @@ -20,15 +20,32 @@ UTF-8 5.5.2 0.8.2 - - - 2.8.1 - 3.0.0-M1 - 1.6 - 3.2.1 - 3.2.0 - 1.6.8 + + + github + Reedelk Runtime Packages + https://maven.pkg.github.com/codecentric/reedelk-runtime + true + true + + + + + github + Reedelk Runtime Packages + https://maven.pkg.github.com/codecentric/reedelk-runtime + true + true + + + + + github + GitHub Packages + https://maven.pkg.github.com/codecentric/reedelk-module-database + + @@ -90,96 +107,4 @@ - - - - central-deploy - - - - maven-gpg-plugin - ${maven-gpg-plugin.version} - - - sign-artifacts - verify - - sign - - - - - --pinentry-mode - loopback - - - - - - - org.codehaus.mojo - versions-maven-plugin - ${versions-maven-plugin.version} - - false - - - - maven-deploy-plugin - ${maven-deploy-plugin.version} - - true - - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - - attach-javadocs - - jar - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} - true - - oss.sonatype.org - https://oss.sonatype.org/ - ${project.version} - - - - deploy-to-sonatype - deploy - - deploy - release - - - - - - - - From 6c4eccbc7a34d25525b5ce18768be48d32aa9d01 Mon Sep 17 00:00:00 2001 From: Daniel Kocot Date: Fri, 23 Apr 2021 11:21:29 +0200 Subject: [PATCH 3/3] prepared 2.1.0-beta3 iteration 2 --- .github/workflows/maven.yml | 6 ++ .../workflows/publish_to_github-packages.yml | 21 +++++++ .../workflows/release-to-maven-central.yml | 56 ------------------- pom.xml | 2 +- 4 files changed, 28 insertions(+), 57 deletions(-) create mode 100644 .github/workflows/publish_to_github-packages.yml delete mode 100644 .github/workflows/release-to-maven-central.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 63c228a..c6642c1 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -13,6 +13,12 @@ jobs: uses: actions/setup-java@v1 with: java-version: 11 + server-id: github + server-username: GITHUB_USER_REF + server-password: GITHUB_TOKEN_REF - name: Build with Maven run: mvn -B install --no-transfer-progress --file pom.xml + env: + GITHUB_USER_REF: ${{ secrets.GH_PACKAGE_REPO_USERNAME }} + GITHUB_TOKEN_REF: ${{ secrets.GH_PACKAGE_REPO_PASSWORD }} \ No newline at end of file diff --git a/.github/workflows/publish_to_github-packages.yml b/.github/workflows/publish_to_github-packages.yml new file mode 100644 index 0000000..bc49831 --- /dev/null +++ b/.github/workflows/publish_to_github-packages.yml @@ -0,0 +1,21 @@ +name: Publish packages to GitHub Packages +on: + release: + types: [created] +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + server-id: github + server-username: GITHUB_USER_REF + server-password: GITHUB_TOKEN_REF + - name: Publish package + run: mvn --batch-mode deploy -DskipTests + env: + GITHUB_USER_REF: ${{ secrets.GH_PACKAGE_REPO_USERNAME }} + GITHUB_TOKEN_REF: ${{ secrets.GH_PACKAGE_REPO_PASSWORD }} \ No newline at end of file diff --git a/.github/workflows/release-to-maven-central.yml b/.github/workflows/release-to-maven-central.yml deleted file mode 100644 index f25bfa1..0000000 --- a/.github/workflows/release-to-maven-central.yml +++ /dev/null @@ -1,56 +0,0 @@ -name: release-to-maven-central -on: - workflow_dispatch: - inputs: - releaseversion: - description: 'Release version' - required: true - default: '2.0.0' -jobs: - publish: - runs-on: ubuntu-latest - steps: - - run: echo "Will start a Maven Central upload with version ${{ github.event.inputs.releaseversion }}" - - - uses: actions/checkout@v2 - - - name: Set up settings.xml for Maven Central Repository - uses: actions/setup-java@v1 - with: - java-version: 11 - server-id: oss.sonatype.org - server-username: MAVEN_USERNAME - server-password: MAVEN_PASSWORD - gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} - gpg-passphrase: MAVEN_GPG_PASSPHRASE - - - name: Set projects Maven version to GitHub Action GUI set version - run: mvn versions:set "-DnewVersion=${{ github.event.inputs.releaseversion }}" --no-transfer-progress - - - name: Publish package - run: mvn --batch-mode clean deploy --no-transfer-progress -P central-deploy -DskipTests=true - env: - MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }} - MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - - - name: Generate changelog - id: changelog - uses: metcalfc/changelog-generator@v0.4.4 - with: - myToken: ${{ secrets.GITHUB_TOKEN }} - - - name: Create GitHub Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ github.event.inputs.releaseversion }} - release_name: ${{ github.event.inputs.releaseversion }} - body: | - Grab the new version from Maven central https://repo1.maven.org/maven2/de/codecentric/reedelk/module-file/${{ github.event.inputs.releaseversion }}/ - ### Things that changed in this release - ${{ steps.changelog.outputs.changelog }} - draft: false - prerelease: false \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0798657..0d70020 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ github GitHub Packages - https://maven.pkg.github.com/codecentric/reedelk-module-database + https://maven.pkg.github.com/codecentric/reedelk-module-file