Merge branch 'eiffel-community:master' into eicommon

Author: george1209

.github/workflows/main.yml

@@ -88,40 +88,13 @@ jobs:
       - name: Run integration tests
         run: |
           mvn --version
-          mvn verify -DskipUTs -Djasypt.encryptor.password=integrationtest -Dspring.config.location=src/integrationtests/resources/application.properties -B 
-        
-  reportCoverage:
-    if: github.repository == 'eiffel-community/eiffel-intelligence' && github.event_name == 'push'
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-    env: 
-      M2_HOME: /opt/apache-maven-3.6.3
-      MAVEN_HOME: /opt/apache-maven-3.6.3
+          mvn verify -DskipUTs -Djasypt.encryptor.password=integrationtest -Dspring.config.location=src/integrationtests/resources/application.properties jacoco:report -Dformats=xml -B 
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-          
-      - name: Install Maven
-        shell: bash
-        run: |  
-          wget https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz -P /tmp
-          tar xf /tmp/apache-maven-3.6.3-bin.tar.gz -C /opt
-          echo "${M2_HOME}/bin" >> $GITHUB_PATH
-          
-      - name: Run cobertura
-        shell: bash
-        run: |
-          mvn cobertura:cobertura -Dcobertura.report.format=xml -B
-          
       # Generating test coverage report and publishing to Codacy
       - name: Run report coverage
+        if: github.event_name == 'push'
         uses: codacy/codacy-coverage-reporter-action@v1
         with:
-          project-token: 571cdd20d4bf435f84b25d806d304792
-          coverage-reports: target/site/cobertura/coverage.xml
+          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
+          coverage-reports: target/site/jacoco/jacoco.xml
+ 

pom.xml

@@ -664,26 +664,44 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.8.8</version>
-                <configuration>
-                    <excludes>
-                        <exclude>com/ericsson/ei/controller/model/*</exclude>
-                    </excludes>
-                </configuration>
                 <executions>
                     <execution>
-                        <id>jacoco-initialize</id>
+                        <id>prepare-agent</id>
                         <goals>
                             <goal>prepare-agent</goal>
                         </goals>
                     </execution>
                     <execution>
-                        <id>jacoco-site</id>
-                        <phase>package</phase>
+                        <id>report</id>
+                        <phase>prepare-package</phase>
                         <goals>
                             <goal>report</goal>
                         </goals>
                     </execution>
+                    <execution>
+                        <id>post-unit-test</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Sets the path to the file which contains 
+                                the execution data. -->
+                            <dataFile>target/jacoco.exec</dataFile>
+                            <!-- Sets the output directory for the code coverage 
+                                report. -->
+                            <outputDirectory>target/jacoco</outputDirectory>
+                        </configuration>
+                    </execution>
                 </executions>
+                <configuration>
+                    <excludes>
+                        <exclude>com/ericsson/ei/controller/model/*</exclude>
+                    </excludes>
+                    <systemPropertyVariables>
+                        <jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile>
+                    </systemPropertyVariables>
+	        </configuration>
             </plugin>
         </plugins>
     </build>