enable SonarCloud, disable codecov.io

Author: stefanseifert

.github/workflows/maven-build.yml

@@ -8,6 +8,7 @@ on:
       - master
       - experimental/**
   pull_request:
+    types: [opened, synchronize, reopened]
     branches-ignore:
       - master
       - experimental/**
@@ -31,22 +32,35 @@ jobs:
             distribution: temurin
 
     steps:
-      # Check out Git repository
       - name: Checkout code
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
-      # Set up environment with Java and Maven
       - name: Setup JDK
         uses: actions/setup-java@v2
         with:
           distribution: ${{ matrix.distribution }}
           java-version: ${{ matrix.java }}
           cache: 'maven'
 
-      # Build & install (required for 2nd build: example)
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v1
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+
       - name: Build and verify
         run: ./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean install
 
-      # Build & verify example
       - name: Build and verify example
         run: ./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean verify -f example
+
+      - name: Analyze in SonarCloud
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        # SONAR_TOKEN is not present when building for external PR
+        run:  ([ -z $SONAR_TOKEN ] || ./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B sonar:sonar -Dsonar.projectKey=${{github.repository_owner}}_${{github.event.repository.name}} -Dsonar.projectName=${{github.event.repository.name}})
+        if: ${{ matrix.java == '11' && matrix.os == 'ubuntu-latest' }}

.github/workflows/maven-deploy.yml

@@ -14,36 +14,27 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      # Check out Git repository
       - name: Checkout code
         uses: actions/checkout@v2
 
-      # Configure GIT
       - name: Configure GIT
         run: |
           git config --global user.email "${{ secrets.GH_SITE_DEPLOY_EMAIL }}"
           git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
 
-      # Set up environment with Java and Maven
       - name: Setup JDK
         uses: actions/setup-java@v2
         with:
           distribution: temurin
           java-version: 8
           cache: 'maven'
 
-      # Build, deploy to ossrh, generate and stage site
       - name: Build, verify, deploy, generate site
         env:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
         run: ./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean deploy site
 
-      # Run code coverage check
-      - name: Run code coverage check
-        run: bash <(curl -s https://codecov.io/bash)
-
-      # Deploy site to Github Pages
       - name: Stage and deploy site
         run: >
           ./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B site:stage scm-publish:publish-scm

README.md

@@ -1,7 +1,8 @@
 <img src="https://wcm.io/images/favicon-16@2x.png"/> CONGA Plugin for AEM
 ======
 [![Build](https://github.com/wcm-io-devops/conga-aem-plugin/workflows/Build/badge.svg?branch=develop)](https://github.com/wcm-io-devops/conga-aem-plugin/actions?query=workflow%3ABuild+branch%3Adevelop)
-[![Code Coverage](https://codecov.io/gh/wcm-io-devops/conga-aem-plugin/branch/develop/graph/badge.svg)](https://codecov.io/gh/wcm-io-devops/conga-aem-plugin)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga.plugins/io.wcm.devops.conga.plugins.aem/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga.plugins/io.wcm.devops.conga.plugins.aem)
+[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=wcm-io-devops_conga-aem-plugin&metric=coverage)](https://sonarcloud.io/summary/new_code?id=wcm-io-devops_conga-aem-plugin)
 
 Documentation: https://devops.wcm.io/conga/plugins/aem/<br/>
 Issues: https://wcm-io.atlassian.net/projects/WDCONGA<br/>

parent/pom.xml

@@ -25,7 +25,7 @@
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.2.10</version>
+    <version>1.3.0-SNAPSHOT</version>
     <relativePath />
   </parent>
 

src/site/site.xml

@@ -22,7 +22,7 @@
 <project name="CONGA AEM Plugin"
   xmlns="http://maven.apache.org/DECORATION/1.8.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
 
   <bannerRight>
     <name><![CDATA[<img src="https://devops.wcm.io/conga/images/conga.png" style="height:120px"/>]]></name>