From a5cb3bda71840d0257c21ba56a7d6abf4a3a5938 Mon Sep 17 00:00:00 2001
From: Florian Zschocke <f.zschocke+git@gmail.com>
Date: Thu, 22 Oct 2020 17:42:01 +0200
Subject: build: Create single XML JaCoCo report

This can be uploaded to coverage services like Coveralls etc.
---
 build.xml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index b4a98eb0..0caa3bd2 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="gitblit" default="compile" xmlns:mx="antlib:org.moxie">
+<project name="gitblit" default="compile" xmlns:mx="antlib:org.moxie" xmlns:jacoco="antlib:org.jacoco.ant">
 
 	<!--
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -160,7 +160,22 @@
 		
 		<!-- Run unit tests -->
 		<mx:test failonerror="true" />
-		
+
+		<!-- Create JaCoCo single XML report file for code coverage service. -->
+		<jacoco:report>
+			<executiondata>
+				<file file="${project.outputDirectory}/jacoco.exec"/>
+			</executiondata>
+			<structure name="${project.name}">
+				<classfiles>
+					<fileset dir="${project.outputDirectory}/classes"/>
+				</classfiles>
+				<sourcefiles encoding="UTF-8">
+					<fileset dir="${project.src.dir}"/>
+				</sourcefiles>
+			</structure>
+			<xml destfile="${project.targetDirectory}/reports/coverage/jacoco.xml"/>
+		</jacoco:report>
 	</target>
 
 
-- 
cgit v1.2.3


From 6d694fd39bc4c794189df2ca773390ed0f5c8ffa Mon Sep 17 00:00:00 2001
From: Florian Zschocke <f.zschocke+git@gmail.com>
Date: Thu, 22 Oct 2020 20:43:45 +0200
Subject: build: Activate JaCoCo explicitly for Ant build

When building with Ant, instead of Moxie, JaCoCo is not included in the
classpath. So explicitly initialise the full `jacocoant.jar` from the
`.moxie` repository.

For this we had to switch the dependency to use the `nodeps` jar which
includes all dependencies.
---
 build.moxie |  2 +-
 build.xml   | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/build.moxie b/build.moxie
index bb0d426e..ab1d79a9 100644
--- a/build.moxie
+++ b/build.moxie
@@ -192,5 +192,5 @@ dependencies:
 - test 'org.mockito:mockito-core:1.10.19'
 # Dependencies with the "build" scope are retrieved
 # and injected into the Ant runtime classpath
-- build 'org.jacoco:org.jacoco.ant:0.8.4'
+- build 'org.jacoco:org.jacoco.ant:0.8.4:nodeps'
 - build 'org.parboiled:parboiled-java:1.3.1'
diff --git a/build.xml b/build.xml
index 0caa3bd2..afe60496 100644
--- a/build.xml
+++ b/build.xml
@@ -12,7 +12,9 @@
 	<property name="moxie.url" value="http://gitblit.github.io/moxie/maven" />
 	<property name="moxie.jar" value="moxie-toolkit-${moxie.version}.jar" />
 	<property name="moxie.dir" value="${user.home}/.moxie" />
-	
+
+	<property name="jacoco.version" value="0.8.4" />
+
 	<!-- Download Moxie from it's Maven repository to user.home -->
 	<mkdir dir="${moxie.dir}" />
 	<get src="${moxie.url}/com/gitblit/moxie/moxie-toolkit/${moxie.version}/${moxie.jar}"
@@ -46,7 +48,12 @@
 		     If it exists, build.properties is automatically loaded.
 		     Explicitly set mxroot allowing CI servers to override the default. -->
 		<mx:init verbose="no" mxroot="${moxie.dir}" />
-				
+
+		<!-- Register JaCoCo tasks -->
+		<taskdef uri="antlib:org.jacoco.ant">
+			<classpath location="${moxie.dir}/remote/repo1.maven.org_maven2/org/jacoco/org.jacoco.ant/${jacoco.version}/org.jacoco.ant-${jacoco.version}-nodeps.jar" />
+		</taskdef>
+
 		<!-- Set Ant project properties -->
 		<property name="release.tag" value="v${project.version}" />
 		<property name="currentRelease.tag" value="v${project.releaseVersion}" />
-- 
cgit v1.2.3


From af1fd8927d0ef0dcbb2c4cfe621409eedabb65c7 Mon Sep 17 00:00:00 2001
From: Florian Zschocke <f.zschocke+git@gmail.com>
Date: Thu, 22 Oct 2020 21:59:47 +0200
Subject: ci: Enable upload to Codecov.io in CircleCI J8 build.

---
 .circleci/config.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2da8c68a..fbe29d19 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,7 +21,7 @@ gbsteps: &gbsteps
         path:  build/target/reports
 
 
-version: 2
+version: 2.1
 
 jobs:
   buildJ8:
@@ -46,6 +46,10 @@ workflows:
   version: 2
   build:
     jobs:
-      - "buildJ8"
+      - "buildJ8":
+          post-steps:
+            - run:
+                name: Upload coverage to Codecov
+                command: bash <(curl -s https://codecov.io/bash)
       - "buildJ9"
       - "buildJ11"
-- 
cgit v1.2.3