Use a message based TeamCity formatter

CHANGELOG.md

@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - [Core] Use a message based `RerunFormatter` ([#3075](https://github.com/cucumber/cucumber-jvm/pull/3075) M.P. Korstanje)
+- [Core] Use a message based `TeamCityPlugin` ([#3050](https://github.com/cucumber/cucumber-jvm/pull/3050) M.P. Korstanje)
 - [Core] Update dependency io.cucumber:cucumber-json-formatter to v0.2.0
 - [Core] Update dependency io.cucumber:gherkin to v35.0.0
 - [Core] Update dependency io.cucumber:html-formatter to v21.15.0

cucumber-bom/pom.xml

@@ -15,14 +15,15 @@
     <properties>
         <ci-environment.version>10.0.1</ci-environment.version>
         <cucumber-expressions.version>18.0.1</cucumber-expressions.version>
-        <cucumber-json-formatter.version>0.2.0</cucumber-json-formatter.version>
+        <cucumber-json-formatter.version>0.2.1</cucumber-json-formatter.version>
         <gherkin.version>35.0.0</gherkin.version>
         <html-formatter.version>21.15.1</html-formatter.version>
         <junit-xml-formatter.version>0.9.0</junit-xml-formatter.version>
         <messages.version>29.0.1</messages.version>
         <pretty-formatter.version>2.2.0</pretty-formatter.version>
         <query.version>14.0.1</query.version>
         <tag-expressions.version>6.1.2</tag-expressions.version>
+        <teamcity-formatter.version>0.1.1</teamcity-formatter.version>
         <testng-xml-formatter.version>0.6.0</testng-xml-formatter.version>
     </properties>
 
@@ -79,6 +80,11 @@
                 <artifactId>tag-expressions</artifactId>
                 <version>${tag-expressions.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.cucumber</groupId>
+                <artifactId>teamcity-formatter</artifactId>
+                <version>${teamcity-formatter.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>testng-xml-formatter</artifactId>

cucumber-core/pom.xml

@@ -68,6 +68,10 @@
             <groupId>io.cucumber</groupId>
             <artifactId>pretty-formatter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.cucumber</groupId>
+            <artifactId>teamcity-formatter</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>testng-xml-formatter</artifactId>

cucumber-core/src/main/java/io/cucumber/core/plugin/Plugins.java

@@ -68,7 +68,7 @@ public void addPlugin(Plugin plugin) {
     public void setEventBusOnEventListenerPlugins(EventPublisher eventPublisher) {
         for (Plugin plugin : plugins) {
             if (plugin instanceof ConcurrentEventListener) {
-                ((ConcurrentEventListener) plugin).setEventPublisher(eventPublisher);
+                ((ConcurrentEventListener) plugin).setEventPublisher(eventPublisher, false);
             } else if (plugin instanceof EventListener) {
                 ((EventListener) plugin).setEventPublisher(eventPublisher);
             }
@@ -78,7 +78,7 @@ public void setEventBusOnEventListenerPlugins(EventPublisher eventPublisher) {
     public void setSerialEventBusOnEventListenerPlugins(EventPublisher eventPublisher) {
         for (Plugin plugin : plugins) {
             if (plugin instanceof ConcurrentEventListener) {
-                ((ConcurrentEventListener) plugin).setEventPublisher(eventPublisher);
+                ((ConcurrentEventListener) plugin).setEventPublisher(eventPublisher, true);
             } else if (plugin instanceof EventListener) {
                 EventPublisher orderedEventPublisher = getOrderedEventPublisher(eventPublisher);
                 ((EventListener) plugin).setEventPublisher(orderedEventPublisher);

cucumber-core/src/test/java/io/cucumber/core/plugin/PluginsTest.java

@@ -57,7 +57,17 @@ void shouldSetConcurrentEventListener() {
         ConcurrentEventListener plugin = mock(ConcurrentEventListener.class);
         plugins.addPlugin(plugin);
         plugins.setEventBusOnEventListenerPlugins(rootEventPublisher);
-        verify(plugin, times(1)).setEventPublisher(rootEventPublisher);
+        verify(plugin, times(1)).setEventPublisher(rootEventPublisher, false);
+    }
+
+    @Test
+    void shouldSetSerialEventBusOnConcurrentEventListener() {
+        RuntimeOptions runtimeOptions = RuntimeOptions.defaultOptions();
+        Plugins plugins = new Plugins(pluginFactory, runtimeOptions);
+        ConcurrentEventListener plugin = mock(ConcurrentEventListener.class);
+        plugins.addPlugin(plugin);
+        plugins.setSerialEventBusOnEventListenerPlugins(rootEventPublisher);
+        verify(plugin, times(1)).setEventPublisher(rootEventPublisher, true);
     }
 
     @Test