as TCK modules does not inherit servlet module, we need to setup some…

… Maven plugins/configuration (jakartaee#676) (jakartaee#677) Signed-off-by: Olivier Lamy <[email protected]>
jetty-project · Jul 15, 2024 · 77c911b · 77c911b
1 parent 04bbfb8
commit 77c911b
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 3 deletions.
diff --git a/tck/pom.xml b/tck/pom.xml
@@ -53,6 +53,52 @@
         <module>tck-dist</module>
     </modules>
 
+    <properties>
+        <maven.compiler.release>11</maven.compiler.release>
+    </properties>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>3.4.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.3.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.13.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.4.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>3.1.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>3.1.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>3.7.1</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
     <dependencyManagement>
         <dependencies>
             <dependency>

diff --git a/tck/tck-dist/pom.xml b/tck/tck-dist/pom.xml
@@ -53,7 +53,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.7.1</version>
                 <executions>
                     <execution>
                         <id>distribution</id>

diff --git a/tck/tck-runtime/pom.xml b/tck/tck-runtime/pom.xml
@@ -35,6 +35,7 @@
     <properties>
         <shrinkwrap-resolver.version>3.3.0</shrinkwrap-resolver.version>
         <servlet.api.version>6.2.0-SNAPSHOT</servlet.api.version>
+        <sigtest.version>2.3</sigtest.version>
     </properties>
 
     <dependencies>
@@ -52,7 +53,7 @@
         <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>sigtest-maven-plugin</artifactId>
-            <version>2.3</version>
+            <version>${sigtest.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap.resolver</groupId>
@@ -119,7 +120,7 @@
             <plugin>
                 <groupId>jakarta.tck</groupId>
                 <artifactId>sigtest-maven-plugin</artifactId>
-                <version>2.3</version>
+                <version>${sigtest.version}</version>
                 <executions>
                     <execution>
                         <goals>