[Build] Explicitly include Gherkin as a dependency for shading (#2518)

With Maven 3.8.5 as used in CI only direct dependencies can be shaded. So to
build correctly Gherkin has to be included as a direct dependency. This however
confuses revapi because it does not seem to account for shading. And has been
disabled for now.

Author: mpkorstanje

core/pom.xml

@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -45,6 +46,10 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>io.cucumber</groupId>
+            <artifactId>gherkin</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-gherkin</artifactId>
@@ -228,7 +233,7 @@
                         <id>enforce-dependency-convergence</id>
                         <configuration>
                             <rules>
-                                <dependencyConvergence />
+                                <dependencyConvergence/>
                             </rules>
                         </configuration>
                         <goals>
@@ -265,12 +270,13 @@
                                     <include>io.cucumber:gherkin</include>
                                 </includes>
                             </artifactSet>
-                            <relocations>
-                                <relocation>
-                                    <pattern>gherkin</pattern>
-                                    <shadedPattern>io.cucumber.core.internal.gherkin</shadedPattern>
-                                </relocation>
-                            </relocations>
+                            <!-- Do not enable relocation. Stuck with it until the next major. -->
+                            <!--<relocations>-->
+                            <!--    <relocation>-->
+                            <!--        <pattern>io.cucumber.gherkin</pattern>-->
+                            <!--        <shadedPattern>io.cucumber.core.internal.gherkin</shadedPattern>-->
+                            <!--    </relocation>-->
+                            <!--</relocations>-->
                             <filters>
                                 <filter>
                                     <artifact>io.cucumber:gherkin</artifact>

gherkin-messages/pom.xml

@@ -57,6 +57,15 @@
 
     <build>
         <plugins>
+            <!-- Not quite compatible with the transition to Maven 3.8.3 #2518 -->
+            <plugin>
+                <groupId>org.revapi</groupId>
+                <artifactId>revapi-maven-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

java/pom.xml

@@ -90,6 +90,13 @@
             <plugin>
                 <groupId>org.codehaus.gmaven</groupId>
                 <artifactId>groovy-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>io.cucumber</groupId>
+                        <artifactId>gherkin</artifactId>
+                        <version>${gherkin.version}</version>
+                    </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <id>generate-i18n-sources</id>

java8/pom.xml

@@ -91,6 +91,13 @@
             <plugin>
                 <groupId>org.codehaus.gmaven</groupId>
                 <artifactId>groovy-maven-plugin</artifactId>
+                <dependencies>
+                    <dependency>
+                        <groupId>io.cucumber</groupId>
+                        <artifactId>gherkin</artifactId>
+                        <version>${gherkin.version}</version>
+                    </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <id>generate-i18n-sources</id>