Exclude TSS from JaCoCo, resolve merge conflict

Signed-off-by: Holger Friedrich <[email protected]>
openhab · Jul 7, 2024 · c1d4e24 · c1d4e24
1 parent b842c4d
commit c1d4e24
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/bundles/org.openhab.binding.knx/pom.xml b/bundles/org.openhab.binding.knx/pom.xml
@@ -65,13 +65,6 @@
   </dependencies>
 
   <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>3.1.0</version>
-      </plugin>
-    </plugins>
     <pluginManagement>
       <plugins>
         <plugin>
@@ -149,6 +142,11 @@ SPI-Consumer: java.util.ServiceLoader#load(java.lang.Class[tuwien.auto.calimero.
       </plugins>
     </pluginManagement>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>3.1.0</version>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -164,6 +162,7 @@ SPI-Consumer: java.util.ServiceLoader#load(java.lang.Class[tuwien.auto.calimero.
         <version>0.8.11</version>
         <configuration>
           <excludes>
+            <exclude>tss/**/*</exclude>
             <exclude>tuwien/auto/calimero/**/*</exclude>
             <exclude>io/calimero/**/*</exclude>
           </excludes>