removed cobertura

diff --git a/Jenkinsfile b/Jenkinsfile
index 23c3df3d74552e63d3b88622dd83e0ad0d5ff510..a27eee227dcf25910bc9f4529b1caeae92a2c706 100644 (file)
--- 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 {
 
 
 pipeline {


@@ -7,6 +7,12 @@ pipeline {
   }
   options {
     disableConcurrentBuilds()
   }
   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) }
   
   }
   triggers { cron(cron_string) }
   


@@ -29,7 +35,7 @@ pipeline {
               echo ""
               echo "Building site for $dir"
               echo ""
               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 ""
             )
               echo ""
               echo ""
             )


@@ -47,7 +53,6 @@ pipeline {
   post {
     always {
       junit '**/surefire-reports/*.xml'
   post {
     always {
       junit '**/surefire-reports/*.xml'

-      cobertura coberturaReportFile: '**/target/site/cobertura/coverage.xml'

     }
     changed {
       mail to: "jenkins@wamblee.org",
     }
     changed {
       mail to: "jenkins@wamblee.org",

diff --git a/pom.xml b/pom.xml
index ec3d564283b1a0149dbd76abd18a398894ac71ac..73a442eb5d481b890b330c28a05cda6534c9ff33 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -410,26 +410,6 @@
                                </executions>
                        </plugin>
 
                                </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>
                        <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 750dfc8701b795ec83574d4ee1aa350026d8d2d3..3675faffe8169743a319273e091c568ca838af97 100644 (file)
--- 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.
      */
     public MyTables() {
         // Empty.