Skip to content

Commit f761f32

Browse files
Exclude TSS from JaCoCo, resolve merge conflict
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent e914e16 commit f761f32

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

  • bundles/org.openhab.binding.knx

bundles/org.openhab.binding.knx/pom.xml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,6 @@
6565
</dependencies>
6666

6767
<build>
68-
<plugins>
69-
<plugin>
70-
<groupId>org.apache.maven.plugins</groupId>
71-
<artifactId>maven-antrun-plugin</artifactId>
72-
<version>3.1.0</version>
73-
</plugin>
74-
</plugins>
7568
<pluginManagement>
7669
<plugins>
7770
<plugin>
@@ -149,6 +142,11 @@ SPI-Consumer: java.util.ServiceLoader#load(java.lang.Class[tuwien.auto.calimero.
149142
</plugins>
150143
</pluginManagement>
151144
<plugins>
145+
<plugin>
146+
<groupId>org.apache.maven.plugins</groupId>
147+
<artifactId>maven-antrun-plugin</artifactId>
148+
<version>3.1.0</version>
149+
</plugin>
152150
<plugin>
153151
<groupId>org.apache.maven.plugins</groupId>
154152
<artifactId>maven-surefire-plugin</artifactId>
@@ -164,6 +162,7 @@ SPI-Consumer: java.util.ServiceLoader#load(java.lang.Class[tuwien.auto.calimero.
164162
<version>0.8.11</version>
165163
<configuration>
166164
<excludes>
165+
<exclude>tss/**/*</exclude>
167166
<exclude>tuwien/auto/calimero/**/*</exclude>
168167
<exclude>io/calimero/**/*</exclude>
169168
</excludes>

0 commit comments

Comments
 (0)