From: Erik Brakkee <erik@brakkee.org>
Date: Tue, 12 Nov 2024 19:16:02 +0000 (+0100)
Subject: removed cobertura
X-Git-Url: http://wamblee.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;hp=1155ae79ae8adc1954bbe7aea34160a3279092d8;p=utils

removed cobertura
---

diff --git a/Jenkinsfile b/Jenkinsfile
index 23c3df3d..a27eee22 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,4 +1,4 @@
-String cron_string = BRANCH_NAME == "trunk" ? "10 3 * * *" : ""
+String cron_string = BRANCH_NAME == "master" ? "10 3 * * *" : ""
 
 
 pipeline {
@@ -7,6 +7,12 @@ pipeline {
   }
   options {
     disableConcurrentBuilds()
+    buildDiscarder(logRotator(
+            numToKeepStr: '5',            // Number of build records to keep
+            artifactNumToKeepStr: '3',    // Number of builds for which to keep artifacts
+            daysToKeepStr: '30',          // Days to keep builds
+            artifactDaysToKeepStr: '15'   // Days to keep artifacts
+        ))
   }
   triggers { cron(cron_string) }
   
@@ -29,7 +35,7 @@ pipeline {
               echo ""
               echo "Building site for $dir"
               echo ""
-              mvn -N -Ddistrib=/data/www/http.utils.wamblee.org/ site site:deploy
+              mvn -N -o -Ddistrib=/data/www/http.utils.wamblee.org/ site site:deploy
               echo ""
               echo ""
             )
@@ -47,7 +53,6 @@ pipeline {
   post {
     always {
       junit '**/surefire-reports/*.xml'
-      cobertura coberturaReportFile: '**/target/site/cobertura/coverage.xml'
     }
     changed {
       mail to: "jenkins@wamblee.org",
diff --git a/pom.xml b/pom.xml
index ec3d5642..73a442eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -410,26 +410,6 @@
 				</executions>
 			</plugin>
 
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.7</version>
-				<executions>
-                    <execution>
-					    <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>cobertura</goal>
-                        </goals>
-                    </execution>
-				</executions>
-				<configuration>
-                    <aggregate>true</aggregate>
-                    <formats>
-                        <format>html</format>
-                        <format>xml</format>
-                    </formats>
-				</configuration>
-			</plugin>
 			<plugin>
 				<artifactId>maven-site-plugin</artifactId>
 				<configuration>
diff --git a/test/enterprise/src/test/java/org/wamblee/test/persistence/MyTables.java b/test/enterprise/src/test/java/org/wamblee/test/persistence/MyTables.java
index 750dfc87..3675faff 100644
--- a/test/enterprise/src/test/java/org/wamblee/test/persistence/MyTables.java
+++ b/test/enterprise/src/test/java/org/wamblee/test/persistence/MyTables.java
@@ -26,9 +26,6 @@ public class MyTables implements ITableFilterSimple {
 
     /**
      * 
-     * @param aJpaTables
-     *            Specific tables used by the JPA provider in addition to those
-     *            for the entities.
      */
     public MyTables() {
         // Empty.