diff --git a/.github/workflows/perform-release.yml b/.github/workflows/perform-release.yml index 05202e8..aff58d0 100644 --- a/.github/workflows/perform-release.yml +++ b/.github/workflows/perform-release.yml @@ -79,9 +79,9 @@ jobs: run: >- sed -i - -e 's;.*;${{ github.server_url }}/${{ github.repository }}/tree/${{ github.ref_name }};' - -e 's;.*;scm:git:${{ github.server_url }}/${{ github.repository }}.git;' - -e 's;.*;scm:git:${{ github.server_url }}/${{ github.repository }}.git;' + -e '//,/<\/scm>/ s;.*;https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/;' + -e '//,/<\/scm>/ s;.*;scm:git:${{ github.server_url }}/${{ github.repository }}.git;' + -e '//,/<\/scm>/ s;.*;scm:git:${{ github.server_url }}/${{ github.repository }}.git;' pom.xml - name: Prepare Maven Release (build code and create tag) diff --git a/.github/workflows/render-and-deploy-site.yml b/.github/workflows/render-and-deploy-site.yml index f9b27d3..e261572 100644 --- a/.github/workflows/render-and-deploy-site.yml +++ b/.github/workflows/render-and-deploy-site.yml @@ -69,17 +69,16 @@ jobs: if: ${{ success() && !inputs.dry-run }} - name: Run Maven Site - # compile needs to run so Maven figures out cross-module dependencies - # and stagingDirectory will have a value appended relative to parent for each module run: >- ./mvnw --settings ${{ github.workspace }}/settings.xml --batch-mode - compile + verify post-site site:stage + -Ppitest-include-it -Ddefault.dokka-srclink-base=${{ github.server_url }}/${{ github.repository }}/tree/${{ inputs.git-ref }} - -DtopSiteURL=https://fwmotion.github.io/${{ github.repository }} + -DtopSiteURL=https://${{ github.repository_owner }}.github.io/${{ github.repository }} - name: Upload Site Artifacts uses: actions/upload-pages-artifact@v2 diff --git a/cli/pom.xml b/cli/pom.xml index f6c1c02..feb27ff 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -14,7 +14,7 @@ jar 3scale CMS Tools (command-line interface) - https://fwmotion.github.io/3scale-cms/cli + https://FwMotion.github.io/3scale-cms/cli fwmotion.github.io - https://fwmotion.github.io/3scale-cms/cli + https://FwMotion.github.io/3scale-cms/cli/ diff --git a/cli/src/site/site.xml b/cli/src/site/site.xml index bea308f..258b403 100644 --- a/cli/src/site/site.xml +++ b/cli/src/site/site.xml @@ -13,23 +13,8 @@ - - - - - - - - - - - - - - - diff --git a/openapi-generator-template/pom.xml b/openapi-generator-template/pom.xml index f303bb7..bd7b316 100644 --- a/openapi-generator-template/pom.xml +++ b/openapi-generator-template/pom.xml @@ -14,7 +14,7 @@ jar 3scale CMS Tools (OpenAPI-Generator Template Customizations) - https://fwmotion.github.io/3scale-cms/openapi-generator-template + https://FwMotion.github.io/3scale-cms/openapi-generator-template fwmotion.github.io - https://fwmotion.github.io/3scale-cms/cli + https://FwMotion.github.io/3scale-cms/openapi-generator-template @@ -31,4 +31,29 @@ 1 + + true + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + + dependencies + dependency-info + index + issue-management + licenses + plugins + scm + summary + team + + + + + + + diff --git a/openapi-generator-template/src/main/site/site.xml b/openapi-generator-template/src/main/site/site.xml index ea350f8..162e931 100644 --- a/openapi-generator-template/src/main/site/site.xml +++ b/openapi-generator-template/src/main/site/site.xml @@ -13,23 +13,8 @@ - - - - - - - - - - - - - - - diff --git a/parent/pom.xml b/parent/pom.xml index 6463f1d..94756d8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -7,8 +7,8 @@ 2.0.0-SNAPSHOT pom - 3scale CMS Tools (parent) - https://fwmotion.github.io/3scale-cms + 3scale CMS Tools (Parent) + https://FwMotion.github.io/3scale-cms/ fwmotion.github.io - https://fwmotion.github.io/3scale-cms + https://FwMotion.github.io/3scale-cms/ @@ -58,7 +58,7 @@ ${project.basedir}/.. - https://fwmotion.github.io/3scale-cms + https://FwMotion.github.io/3scale-cms ${project.version} @@ -72,6 +72,7 @@ 21 + 2.0.0-M8 diff --git a/parent/src/site/site.xml b/parent/src/site/site.xml index 6eeb86f..2128db5 100644 --- a/parent/src/site/site.xml +++ b/parent/src/site/site.xml @@ -18,13 +18,14 @@ - - + + - + + diff --git a/pom.xml b/pom.xml index 139ef36..7ec33a1 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ pom 3scale CMS Tools - https://github.com/FwMotion/3scale-cms/tree/main + https://FwMotion.github.io/3scale-cms/aggregate/ - https://github.com/FwMotion/3scale-cms/tree/main + blah scm:git:https://github.com/FwMotion/3scale-cms.git scm:git:https://github.com/FwMotion/3scale-cms.git HEAD @@ -37,7 +37,7 @@ fwmotion.github.io - https://github.com/FwMotion/3scale-cms/tree/main + https://FwMotion.github.io/3scale-cms/aggregate/ diff --git a/rest-client/pom.xml b/rest-client/pom.xml index 9b80580..1972484 100644 --- a/rest-client/pom.xml +++ b/rest-client/pom.xml @@ -14,7 +14,7 @@ jar 3scale CMS Tools (REST client library) - https://fwmotion.github.io/3scale-cms/rest-client + https://FwMotion.github.io/3scale-cms/rest-client/ fwmotion.github.io - https://fwmotion.github.io/3scale-cms/rest-client + https://FwMotion.github.io/3scale-cms/rest-client/ @@ -152,6 +152,30 @@ + + + + org.jacoco + jacoco-maven-plugin + ${version.jacoco-maven-plugin} + + + + com.fwmotion.threescale.cms + com.fwmotion.threescale.cms.* + + + com/fwmotion/threescale/cms/**/* + + + + com/fwmotion/threescale/cms/mappers/*Impl.class + + + + + + org.apache.maven.plugins @@ -164,20 +188,6 @@ org.jacoco jacoco-maven-plugin - - - - com.fwmotion.threescale.cms - com.fwmotion.threescale.cms.* - - - com/fwmotion/threescale/cms/**/* - - - - com/fwmotion/threescale/cms/mappers/*Impl.class - - org.apache.maven.plugins @@ -383,6 +393,28 @@ + + org.jacoco + jacoco-maven-plugin + + + + report + + + + + + org.pitest + pitest-maven + + + + report + + + + diff --git a/rest-client/src/site/site.xml b/rest-client/src/site/site.xml index 010cf38..6f66923 100644 --- a/rest-client/src/site/site.xml +++ b/rest-client/src/site/site.xml @@ -13,23 +13,8 @@ - - - - - - - - - - - - - - - diff --git a/src/site/site.xml b/src/site/site.xml index ab8fcb6..7c71ad4 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -13,22 +13,10 @@ - - - - - - - + - - - - - -