Fix dependency convergence related problems in wicket-migration module

Add some dependency exclusions to openrewrite-migrate dependency to simplify the build Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
apache · Oct 15, 2024 · a16c280 · a16c280
1 parent 02d828a
commit a16c280
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -149,9 +149,10 @@
 		<commons-collections4.version>4.4</commons-collections4.version>
 		<commons-fileupload.version>2.0.0-M2</commons-fileupload.version>
 		<commons-io.version>2.17.0</commons-io.version>
-		<commons-lang3.version>3.14.0</commons-lang3.version>
+		<commons-lang3.version>3.17.0</commons-lang3.version>
 		<guice.version>7.0.0</guice.version>
 		<el-impl.version>2.2.1-b05</el-impl.version>
+		<error_prone_annotations.version>2.33.0</error_prone_annotations.version>
 		<forbiddenapis.version>3.8</forbiddenapis.version>
 		<jacoco.version>0.8.12</jacoco.version>
 		<jackson.version>2.14.3</jackson.version>

diff --git a/wicket-guice/pom.xml b/wicket-guice/pom.xml
@@ -39,7 +39,7 @@
 			<dependency>
 				<groupId>com.google.errorprone</groupId>
 				<artifactId>error_prone_annotations</artifactId>
-				<version>2.33.0</version>
+				<version>${error_prone_annotations.version}</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>

diff --git a/wicket-migration/pom.xml b/wicket-migration/pom.xml
@@ -16,10 +16,50 @@
                 <artifactId>jakarta.activation-api</artifactId>
                 <version>2.1.3</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-text</artifactId>
+                <version>1.12.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.openrewrite.recipe</groupId>
+                <artifactId>rewrite-java</artifactId>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.openrewrite.recipe</groupId>
+                        <artifactId>rewrite-xml</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.openrewrite.recipe</groupId>
+                        <artifactId>rewrite-yaml</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.openrewrite.recipe</groupId>
+                <artifactId>rewrite-migrate-java</artifactId>
+                <version>2.26.1</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.openrewrite.recipe</groupId>
+                        <artifactId>rewrite-gradle</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.openrewrite.recipe</groupId>
+                        <artifactId>rewrite-java-8</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>com.google.errorprone</groupId>
                 <artifactId>error_prone_annotations</artifactId>
-                <version>2.33.0</version>
+                <version>${error_prone_annotations.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>io.micrometer</groupId>
+                <artifactId>micrometer-core</artifactId>
+                <version>1.13.5</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -37,7 +77,7 @@
             <dependency>
                 <groupId>org.openrewrite.recipe</groupId>
                 <artifactId>rewrite-recipe-bom</artifactId>
-                <version>2.9.0</version>
+                <version>2.21.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>