From bf392edadb70734d98ba9508377bf7545936ec03 Mon Sep 17 00:00:00 2001 From: Enrico Olivelli - Diennea Date: Mon, 31 Dec 2018 17:35:24 +0100 Subject: [PATCH 1/4] Add JaCoCo plugin --- .travis.yml | 2 +- pom.xml | 39 +++++++++++++++++++++++++++++---------- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index e0feb70..af911cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ jobs: include: - stage: test jdk: openjdk11 - script: mvn verify -Pjenkins -Dmaven.test.redirectTestOutputToFile=true + script: mvn verify -Dmaven.test.redirectTestOutputToFile=true branches: only: diff --git a/pom.xml b/pom.xml index 119dc87..cd32618 100644 --- a/pom.xml +++ b/pom.xml @@ -72,6 +72,7 @@ 1.0 3.1.0 3.1.8 + 0.8.2 @@ -94,6 +95,11 @@ spotbugs-maven-plugin ${libs.spotbugsmaven} + + org.jacoco + jacoco-maven-plugin + ${libs.jacoco} + @@ -118,21 +124,34 @@ + + org.jacoco + jacoco-maven-plugin + ${libs.jacoco} + + + default-prepare-agent + + prepare-agent + + + + org.apache.maven.plugins maven-surefire-plugin - 2.18 + 3.0.0-M3 - -Xmx1024m -Djava.net.preferIpv4Stack=true + @{argLine} -Xmx1024m -Djava.net.preferIpv4Stack=true 1 false - + true org.apache.maven.plugins maven-compiler-plugin - 3.3 + 3.8.0 ${project.build.sourceEncoding} @@ -168,7 +187,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18 + 3.0.0-M3 -Xmx1024m -Djava.net.preferIpv4Stack=true 1 @@ -178,7 +197,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 + 3.8.0 ${project.build.sourceEncoding} @@ -186,7 +205,7 @@ org.apache.maven.plugins maven-resources-plugin - 2.7 + 3.1.0 ${project.build.sourceEncoding} @@ -194,7 +213,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.6 + 1.6.8 true ossrh @@ -205,7 +224,7 @@ org.apache.maven.plugins maven-source-plugin - 2.4 + 3.0.1 attach-sources @@ -219,7 +238,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.3 + 3.0.1 attach-javadocs From b6957bdee033078489ede12ac2610756f5e4140c Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Tue, 1 Jan 2019 21:30:37 +0100 Subject: [PATCH 2/4] more debug --- .../java/blazingcache/client/ManagementStatusMXBeanTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/blazingcache-core/src/test/java/blazingcache/client/ManagementStatusMXBeanTest.java b/blazingcache-core/src/test/java/blazingcache/client/ManagementStatusMXBeanTest.java index eeafdbe..6210d93 100644 --- a/blazingcache-core/src/test/java/blazingcache/client/ManagementStatusMXBeanTest.java +++ b/blazingcache-core/src/test/java/blazingcache/client/ManagementStatusMXBeanTest.java @@ -150,6 +150,8 @@ public void statusMBeanEnabled() throws Exception { usedMemory = (Long) JMXUtils.getMBeanServer().getAttribute(statusBeanName, "CacheUsedMemory"); assertEquals(TEST_DATA.length * MAX_NO_OF_ENTRIES_BEFORE_EVICTION, usedMemory); + assertEquals(MAX_NO_OF_ENTRIES_BEFORE_EVICTION, cacheServer.getCacheStatus().getTotalEntryCount()); + numberOfkeys = (Integer) JMXUtils.getMBeanServer().getAttribute(statusBeanName, "CacheSize"); assertEquals(MAX_NO_OF_ENTRIES_BEFORE_EVICTION, numberOfkeys); From 2e9f1fd4e2ebaaec7e22df3a313c898febadc638 Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Wed, 2 Jan 2019 15:32:15 +0100 Subject: [PATCH 3/4] Add Coveralls.io --- .travis.yml | 2 +- pom.xml | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index af911cd..ce5a6ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ jobs: include: - stage: test jdk: openjdk11 - script: mvn verify -Dmaven.test.redirectTestOutputToFile=true + script: mvn verify -Dmaven.test.redirectTestOutputToFile=true jacoco:report coveralls:report branches: only: diff --git a/pom.xml b/pom.xml index cd32618..fafbb23 100644 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ org.jacoco jacoco-maven-plugin ${libs.jacoco} - + @@ -164,6 +164,11 @@ ${project.build.sourceEncoding} + + org.eluder.coveralls + coveralls-maven-plugin + 4.3.0 + From 08fdb86faeb9698cfad63d1ba8a345cad38401d7 Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Wed, 2 Jan 2019 15:44:44 +0100 Subject: [PATCH 4/4] Make Coveralls work on jdk11 --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index fafbb23..0cc9005 100644 --- a/pom.xml +++ b/pom.xml @@ -168,6 +168,13 @@ org.eluder.coveralls coveralls-maven-plugin 4.3.0 + + + javax.xml.bind + jaxb-api + 2.3.1 + +