From 941573af4990d354dbb917627deb973e96821694 Mon Sep 17 00:00:00 2001
From: Liam Newman <bitwiseman@gmail.com>
Date: Mon, 12 Apr 2021 14:00:18 -0700
Subject: [PATCH] One more attempt to ignore obsolete code

---
 codecov.yml |  2 +-
 pom.xml     | 26 +++++++++++++++-----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/codecov.yml b/codecov.yml
index d47c1ca41..448995289 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -1,3 +1,3 @@
 ignore:
-  - "**/extras/okhtp3/ObsoleteUrlFactory.*"
+  - "**ObsoleteUrlFactory**"
   
diff --git a/pom.xml b/pom.xml
index f5f9f061f..f54937d3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,6 +103,20 @@
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
           <version>0.8.6</version>
+          <configuration>
+            <excludes>
+              <!-- Code implemented externally -->
+              <exclude>**/extras/okhtp3/ObsoleteUrlFactory.*</exclude>
+              <exclude>**/extras/okhtp3/ObsoleteUrlFactory*</exclude>
+              <!-- Sample only -->
+              <exclude>**/example/**</exclude>
+              <!-- Deprecated -->
+              <exclude>org/kohsuke/github/extras/OkHttpConnector.*</exclude>
+              <exclude>org/kohsuke/github/extras/OkHttp3Connector.*</exclude>
+              <exclude>org/kohsuke/github/EnforcementLevel.*</exclude>
+              <exclude>org/kohsuke/github/GHPerson$1.*</exclude>
+            </excludes>
+          </configuration>
           <executions>
             <execution>
               <goals>
@@ -110,17 +124,6 @@
               </goals>
               <configuration>
                 <propertyName>jacoco.surefire.argLine</propertyName>
-                <excludes>
-                  <!-- Code implemented externally -->
-                  <exclude>org/kohsuke/github/extras/okhtp3/ObsoleteUrlFactory.*</exclude>
-                  <exclude>org/kohsuke/github/extras/okhtp3/ObsoleteUrlFactory$*.*</exclude>
-                  <!-- Sample only -->
-                  <exclude>org/kohsuke/github/example/**</exclude>
-                  <!-- Deprecated -->
-                  <exclude>org/kohsuke/github/extras/OkHttp3Connector.*</exclude>
-                  <exclude>org/kohsuke/github/EnforcementLevel.*</exclude>
-                  <exclude>org/kohsuke/github/GHPerson$1.*</exclude>
-                </excludes>  
               </configuration>
             </execution>
             <!-- attached to Maven test phase -->
@@ -171,6 +174,7 @@
 
 
                       <!-- Deprecated -->
+                      <exclude>org.kohsuke.github.extras.OkHttpConnector</exclude>
                       <exclude>org.kohsuke.github.extras.OkHttp3Connector</exclude>
                       <exclude>org.kohsuke.github.EnforcementLevel</exclude>
                       <exclude>org.kohsuke.github.GHPerson.1</exclude>