From 917b4db6c381b0e77462e4cc810c22151ae8b8d5 Mon Sep 17 00:00:00 2001
From: Bertrand Renuart <bertrand.renuart@itma.lu>
Date: Tue, 14 Sep 2021 21:32:43 +0200
Subject: [PATCH 1/6] Produce test coverage data using Jacoco and upload report
 to Codecov

---
 .github/workflows/build.yml |  5 ++++
 pom.xml                     | 46 +++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d4427903..cbdea355 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -46,6 +46,11 @@ jobs:
           path: '**/target/surefire-reports/**'
           if-no-files-found: ignore
 
+      - name: Upload Test Coverage
+        uses: codecov/codecov-action@v2
+        with:
+          files: target/site/jacoco/jacoco.xml
+
   release:
     name: release
     runs-on: ubuntu-20.04
diff --git a/pom.xml b/pom.xml
index 91c7a80a..b661733e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -413,6 +413,29 @@
                     </execution>
                 </executions>
             </plugin>
+            
+			<!-- Install JaCoCo agent and produce reports at the end of the build.
+			-->
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>jacoco-prepare-agent</id>
+						<phase>process-test-classes</phase> <!-- must be ready for the `test` phase, default is "initialize" -->
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>jacoco-report</id>
+						<phase>verify</phase> <!-- this is the default -->
+						<goals>
+							<goal>report</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
         </plugins>
         <pluginManagement>
             <plugins>
@@ -544,6 +567,29 @@
                     <artifactId>maven-resources-plugin</artifactId>
                     <version>${maven-resources-plugin.version}</version>
                 </plugin>
+                
+				<!-- Java Code Coverage (JaCoCo)
+				 -->
+				<plugin>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<version>0.8.7</version>
+					<configuration>
+						<!-- Only instrument "net.logstash.**" by default
+						 -->
+						<includes>
+							<include>net/logstash/**</include>
+						</includes>
+						
+						<!-- Produce XML report for Codecov, and HTML for local builds if user wants to
+                             have a look at it...	
+						 -->
+						<formats>
+							<format>XML</format>
+							<format>HTML</format>
+						</formats>
+					</configuration>
+				</plugin>
             </plugins>
         </pluginManagement>
     </build>

From 149b81b1c5ce09067bdb69188237fd7affea1431 Mon Sep 17 00:00:00 2001
From: Bertrand Renuart <brenuart@gmail.com>
Date: Wed, 17 Nov 2021 20:24:39 +0100
Subject: [PATCH 2/6] Add CODECOV_TOKEN

---
 .github/workflows/build.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cbdea355..9f04b6af 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Test Jackson 2.12
         run: ./mvnw --batch-mode --no-transfer-progress --show-version --settings .github/maven/settings.xml -Djackson.version=2.12.5 surefire:test
 
-      - name: Upload Test Reports
+      - name: Upload Test Reports to Github
         uses: actions/upload-artifact@v2
         if: ${{ always() }}
         with:
@@ -46,10 +46,12 @@ jobs:
           path: '**/target/surefire-reports/**'
           if-no-files-found: ignore
 
-      - name: Upload Test Coverage
+      - name: Upload Test Coverage to Codecov
         uses: codecov/codecov-action@v2
         with:
           files: target/site/jacoco/jacoco.xml
+        env:
+          CODECOV_TOKEN: db650146-b71e-4afd-879d-88bc3b64e111
 
   release:
     name: release

From 5f115882ae982aa91371e910dfe75cf07c62ab40 Mon Sep 17 00:00:00 2001
From: Bertrand Renuart <brenuart@gmail.com>
Date: Wed, 17 Nov 2021 20:39:10 +0100
Subject: [PATCH 3/6] Replace TABs by Spaces

---
 pom.xml | 134 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 67 insertions(+), 67 deletions(-)

diff --git a/pom.xml b/pom.xml
index b661733e..c6b70e0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -414,28 +414,28 @@
                 </executions>
             </plugin>
             
-			<!-- Install JaCoCo agent and produce reports at the end of the build.
-			-->
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>jacoco-prepare-agent</id>
-						<phase>process-test-classes</phase> <!-- must be ready for the `test` phase, default is "initialize" -->
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>jacoco-report</id>
-						<phase>verify</phase> <!-- this is the default -->
-						<goals>
-							<goal>report</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
+            <!-- Install JaCoCo agent and produce reports at the end of the build.
+            -->
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>jacoco-prepare-agent</id>
+                        <phase>process-test-classes</phase> <!-- must be ready for the `test` phase, default is "initialize" -->
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>jacoco-report</id>
+                        <phase>verify</phase> <!-- this is the default -->
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
@@ -568,28 +568,28 @@
                     <version>${maven-resources-plugin.version}</version>
                 </plugin>
                 
-				<!-- Java Code Coverage (JaCoCo)
-				 -->
-				<plugin>
-					<groupId>org.jacoco</groupId>
-					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>0.8.7</version>
-					<configuration>
-						<!-- Only instrument "net.logstash.**" by default
-						 -->
-						<includes>
-							<include>net/logstash/**</include>
-						</includes>
-						
-						<!-- Produce XML report for Codecov, and HTML for local builds if user wants to
-                             have a look at it...	
-						 -->
-						<formats>
-							<format>XML</format>
-							<format>HTML</format>
-						</formats>
-					</configuration>
-				</plugin>
+                <!-- Java Code Coverage (JaCoCo)
+                 -->
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <version>0.8.7</version>
+                    <configuration>
+                        <!-- Only instrument "net.logstash.**" by default
+                         -->
+                        <includes>
+                            <include>net/logstash/**</include>
+                        </includes>
+                        
+                        <!-- Produce XML report for Codecov, and HTML for local builds if user wants to
+                             have a look at it...    
+                         -->
+                        <formats>
+                            <format>XML</format>
+                            <format>HTML</format>
+                        </formats>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
@@ -651,30 +651,30 @@
             </properties>
         </profile>
         
-		<!--
-			Profile used by the Eclipse Maven plugin (m2eclipse).
-	   
-			Activation:
-				Profile is activated if the property "m2e.version" is found.
-				The Eclipse plugin automatically exports this property which in turn causes the profile
-				to be automatically activated under Eclipse.
-		 -->
-		<profile>
-			<id>m2e</id>
-			<activation>
-				<property>
-					<name>m2e.version</name>
-				</property>
-			</activation>
+        <!--
+            Profile used by the Eclipse Maven plugin (m2eclipse).
+       
+            Activation:
+                Profile is activated if the property "m2e.version" is found.
+                The Eclipse plugin automatically exports this property which in turn causes the profile
+                to be automatically activated under Eclipse.
+         -->
+        <profile>
+            <id>m2e</id>
+            <activation>
+                <property>
+                    <name>m2e.version</name>
+                </property>
+            </activation>
 
-			<build>
-				<!--
-					Tell eclipse to use another directory for its generated classes than the one
-					used by the command line Maven.
-				 -->
-				<directory>target-eclipse</directory>
-			</build>
-		</profile>
+            <build>
+                <!--
+                    Tell eclipse to use another directory for its generated classes than the one
+                    used by the command line Maven.
+                 -->
+                <directory>target-eclipse</directory>
+            </build>
+        </profile>
         
         <!-- 
             "Fast" profile that can be used during local development to disable most of the "heavy"

From 548aedf4d8cc393d337d2f928d9e068e8d85cde7 Mon Sep 17 00:00:00 2001
From: Bertrand Renuart <brenuart@gmail.com>
Date: Wed, 17 Nov 2021 20:47:38 +0100
Subject: [PATCH 4/6] Get CODECOV_TOKEN from github secrets

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9f04b6af..4d59408a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -51,7 +51,7 @@ jobs:
         with:
           files: target/site/jacoco/jacoco.xml
         env:
-          CODECOV_TOKEN: db650146-b71e-4afd-879d-88bc3b64e111
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   release:
     name: release

From 4eb13c2677656f9b0fa0f299070df77de4cfad3c Mon Sep 17 00:00:00 2001
From: Bertrand Renuart <brenuart@gmail.com>
Date: Wed, 17 Nov 2021 20:52:31 +0100
Subject: [PATCH 5/6] CODECOV_TOKEN is not required for public repositories

---
 .github/workflows/build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4d59408a..50bf9e12 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,8 +50,7 @@ jobs:
         uses: codecov/codecov-action@v2
         with:
           files: target/site/jacoco/jacoco.xml
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
 
   release:
     name: release

From 9cd73bb81d0d04ab9336ae82b51709db8a44cd7e Mon Sep 17 00:00:00 2001
From: Bertrand Renuart <brenuart@gmail.com>
Date: Wed, 17 Nov 2021 21:17:31 +0100
Subject: [PATCH 6/6] Upload code coverage report only for the Java 8 build

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 50bf9e12..d345ce1c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,6 +48,7 @@ jobs:
 
       - name: Upload Test Coverage to Codecov
         uses: codecov/codecov-action@v2
+        if: matrix.java == '8'
         with:
           files: target/site/jacoco/jacoco.xml