re-enabled SonarCloud

LorenzoBettini · Jun 25, 2021 · 18e74aa · 18e74aa
1 parent 9d20ad5
commit 18e74aa
Show file tree

Hide file tree

Showing 3 changed files with 108 additions and 40 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -10,14 +10,21 @@ on:
 
 jobs:
   build:
+    env:
+       COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
+       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+      with:
+        # Shallow clones should be disabled for a better relevancy of SonarQube analysis
+        fetch-depth: 0
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: Cache Maven packages
       uses: actions/cache@v2
       with:
@@ -26,19 +33,23 @@ jobs:
           ~/.sonar/cache
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml', '**/*.yml', '**/*.target') }}
         restore-keys: ${{ runner.os }}-m2-
+    - name: Set Maven Additional Goals
+      run: |
+        echo "ADDITIONAL_GOALS=coveralls:report sonar:sonar" >> $GITHUB_ENV
+      if: ${{ env.COVERALLS_REPO_TOKEN }}
     - name: Build with Maven
       run: >
         xvfb-run
         mvn -f javamm.parent/pom.xml
         verify -Pide-tests -Pjacoco-report
         -DrepoToken=$COVERALLS_REPO_TOKEN
         -DpullRequest=${{ github.event.pull_request.number }}
-        coveralls:report
-      env: 
-        COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
+        -Dsonar.organization=lorenzobettini-github
+        -Dsonar.host.url=https://sonarcloud.io
+        $ADDITIONAL_GOALS
     - name: Archive Test Results
       uses: actions/upload-artifact@v2
       if: ${{ failure() }}
       with:
         name: test-results-${{ runner.os }}
-        path: '**/*.tests/target'
+        path: '**/*.tests/target/surefire-reports'
diff --git a/.github/workflows/windows-mac.yml b/.github/workflows/windows-mac.yml
@@ -25,10 +25,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: Cache Maven packages
       uses: actions/cache@v2
       with:
@@ -45,4 +45,4 @@ jobs:
       if: ${{ failure() }}
       with:
         name: test-results-${{ runner.os }}
-        path: '**/*.tests/target'
+        path: '**/*.tests/target/surefire-reports'
diff --git a/javamm.parent/pom.xml b/javamm.parent/pom.xml
@@ -8,9 +8,9 @@
   <packaging>pom</packaging>
 
   <properties>
-    <tycho-version>1.4.0</tycho-version>
+    <tycho-version>2.3.0</tycho-version>
     <tycho-extras-version>${tycho-version}</tycho-extras-version>
-    <maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
+    <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
     <maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <os-jvm-flags />
@@ -29,18 +29,15 @@
 
     <!-- Sonarqube -->
 
-    <!-- Always refer to the corresponding tests project (if it exists) otherwise 
-      Sonarqube won't be able to collect code coverage. For example, when analyzing 
-      project foo it wouldn't find code coverage information if it doesn't use 
-      foo.tests jacoco.exec. -->
-    <sonar.jacoco.reportPaths>
-      ../${project.artifactId}.tests/target/jacoco.exec
-    </sonar.jacoco.reportPaths>
+    <jacoco-aggregate-report>javamm.tests.report/target/site/jacoco-aggregate/jacoco.xml</jacoco-aggregate-report>
 
-    <!-- By default we exclude all projects from Sonarqube analysis, and 
-      we explicitly enable the ones we want to analyze. -->
-    <sonar.skip>true</sonar.skip>
+    <sonar.coverage.jacoco.xmlReportPaths>
+      ../${jacoco-aggregate-report}
+    </sonar.coverage.jacoco.xmlReportPaths>
 
+    <!-- Exclude Xtend generated files from code coverage:
+      we cover the original Xtend files, using xtendAsPrimaryDebugSource.
+      -->
     <sonar.exclusions>
       **/ui/launch/*.java,
       **/*SelfAssessmentNature.java,
@@ -50,6 +47,7 @@
       **/*ProjectFiles.java,
       **/src-gen/**,
       **/emf-gen/**,
+      **/xtend-gen/**/*.java,
       **/impl/*ImplCustom.java,
       **/*RuntimeModule.java,
       **/*UiModule.java,
@@ -60,9 +58,8 @@
       **/*Activator.java
     </sonar.exclusions>
 
-    <sonar.test.exclusions>
-      **/*Swtbot*.java
-    </sonar.test.exclusions>
+    <!-- To make SonarQube detect JUnit tests in generated Java code from Xtend -->
+    <sonar.scm.exclusions.disabled>true</sonar.scm.exclusions.disabled>
 
     <!-- see http://sonarqube.15.x6.nabble.com/sonar-issue-ignore-multicriteria-td5021722.html 
       and http://stackoverflow.com/questions/21825469/configure-sonar-sonar-issue-ignore-multicriteria-through-maven 
@@ -71,16 +68,16 @@
 
     <!-- standard convention for method names: in the outline tree provider 
       we must use methods that start with _ and they'd violate the rule squid:S00100 -->
-    <sonar.issue.ignore.multicriteria.e11.ruleKey>squid:S00100</sonar.issue.ignore.multicriteria.e11.ruleKey>
+    <sonar.issue.ignore.multicriteria.e11.ruleKey>java:S100</sonar.issue.ignore.multicriteria.e11.ruleKey>
     <sonar.issue.ignore.multicriteria.e11.resourceKey>**/*OutlineTreeProvider.java</sonar.issue.ignore.multicriteria.e11.resourceKey>
 
-    <sonar.issue.ignore.multicriteria.e12.ruleKey>squid:S00100</sonar.issue.ignore.multicriteria.e12.ruleKey>
+    <sonar.issue.ignore.multicriteria.e12.ruleKey>java:S100</sonar.issue.ignore.multicriteria.e12.ruleKey>
     <sonar.issue.ignore.multicriteria.e12.resourceKey>**/*AbstractXbaseProposalProvider.java</sonar.issue.ignore.multicriteria.e12.resourceKey>
 
-    <sonar.issue.ignore.multicriteria.e13.ruleKey>squid:S00100</sonar.issue.ignore.multicriteria.e13.ruleKey>
+    <sonar.issue.ignore.multicriteria.e13.ruleKey>java:S100</sonar.issue.ignore.multicriteria.e13.ruleKey>
     <sonar.issue.ignore.multicriteria.e13.resourceKey>**/*XbaseCompiler.java</sonar.issue.ignore.multicriteria.e13.resourceKey>
 
-    <sonar.issue.ignore.multicriteria.e14.ruleKey>squid:S00100</sonar.issue.ignore.multicriteria.e14.ruleKey>
+    <sonar.issue.ignore.multicriteria.e14.ruleKey>java:S100</sonar.issue.ignore.multicriteria.e14.ruleKey>
     <sonar.issue.ignore.multicriteria.e14.resourceKey>**/*ValueConverterService.java</sonar.issue.ignore.multicriteria.e14.resourceKey>
 
     <!-- "Tabulation characters should not be used" sorry... I don't agree 
@@ -89,11 +86,11 @@
     <sonar.issue.ignore.multicriteria.e2.resourceKey>**/*.java</sonar.issue.ignore.multicriteria.e2.resourceKey>
 
     <!-- Unused parameters are needed in these files for polymorphic dispatching -->
-    <sonar.issue.ignore.multicriteria.e3.ruleKey>squid:S1172</sonar.issue.ignore.multicriteria.e3.ruleKey>
+    <sonar.issue.ignore.multicriteria.e3.ruleKey>java:S1172</sonar.issue.ignore.multicriteria.e3.ruleKey>
     <sonar.issue.ignore.multicriteria.e3.resourceKey>**/*XbaseCompiler.java</sonar.issue.ignore.multicriteria.e3.resourceKey>
 
     <!-- Unused parameters are needed in these files for polymorphic dispatching -->
-    <sonar.issue.ignore.multicriteria.e4.ruleKey>squid:S1172</sonar.issue.ignore.multicriteria.e4.ruleKey>
+    <sonar.issue.ignore.multicriteria.e4.ruleKey>java:S1172</sonar.issue.ignore.multicriteria.e4.ruleKey>
     <sonar.issue.ignore.multicriteria.e4.resourceKey>**/*AbstractXbaseProposalProvider.java</sonar.issue.ignore.multicriteria.e4.resourceKey>
 
     <!-- Useless parenthesis; these files use code automatically generated -->
@@ -365,7 +362,7 @@
           <configuration>
             <jacocoReports>
               <!-- by default Jacoco generates its report here -->
-              <jacocoReport>${project.basedir}/../javamm.tests.report/target/site/jacoco-aggregate/jacoco.xml</jacocoReport>
+              <jacocoReport>${sonar.coverage.jacoco.xmlReportPaths}</jacocoReport>
             </jacocoReports>
           </configuration>
           <dependencies>
@@ -378,6 +375,11 @@
             </dependency>
           </dependencies>
         </plugin>
+        <plugin>
+          <groupId>org.sonarsource.scanner.maven</groupId>
+          <artifactId>sonar-maven-plugin</artifactId>
+          <version>3.9.0.2155</version>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -519,39 +521,94 @@
     </plugins>
   </build>
 
+  <repositories>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>codehaus-snapshots</id>
+      <name>disable dead 'Codehaus Snapshots' repository, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=481478</name>
+      <url>http://nexus.codehaus.org/snapshots/</url>
+    </repository>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>ossrh-snapshots</id>
+      <name>ossrh-snapshots</name>
+      <url>http://oss.sonatype.org/content/repositories/snapshots</url>
+    </repository>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>sonatype-nexus-snapshots</id>
+      <name>Sonatype Nexus Snapshots</name>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+    </repository>
+    <repository>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>central</id>
+      <name>Central Repository</name>
+      <url>https://repo.maven.apache.org/maven2</url>
+    </repository>
+  </repositories>
   <pluginRepositories>
     <pluginRepository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
       <id>codehaus-snapshots</id>
       <name>disable dead 'Codehaus Snapshots' repository, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=481478</name>
       <url>http://nexus.codehaus.org/snapshots/</url>
+    </pluginRepository>
+    <pluginRepository>
       <releases>
         <enabled>false</enabled>
       </releases>
       <snapshots>
         <enabled>false</enabled>
       </snapshots>
+      <id>ossrh-snapshots</id>
+      <name>ossrh-snapshots</name>
+      <url>http://oss.sonatype.org/content/repositories/snapshots</url>
     </pluginRepository>
-
     <pluginRepository>
-      <id>sonatype_releases</id>
-      <url>https://oss.sonatype.org/content/repositories/releases/</url>
       <releases>
-        <enabled>true</enabled>
+        <enabled>false</enabled>
       </releases>
       <snapshots>
         <enabled>false</enabled>
       </snapshots>
+      <id>sonatype-nexus-snapshots</id>
+      <name>Sonatype Nexus Snapshots</name>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
     </pluginRepository>
-
     <pluginRepository>
-      <id>sonatype_snapshots</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
       <releases>
-        <enabled>false</enabled>
+        <updatePolicy>never</updatePolicy>
       </releases>
       <snapshots>
-        <enabled>true</enabled>
+        <enabled>false</enabled>
       </snapshots>
+      <id>central</id>
+      <name>Central Repository</name>
+      <url>https://repo.maven.apache.org/maven2</url>
     </pluginRepository>
   </pluginRepositories>
+
 </project>