Merge pull request #27667 from gsmet/jakarta-apicurio

Jakarta - Remove integration-tests/kafka-avro when migrating
quarkusio · Sep 2, 2022 · 8c84b02 · 8c84b02
2 parents e929b57 + 6cca92d
commit 8c84b02
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/integration-tests/kafka-avro-apicurio2/pom.xml b/integration-tests/kafka-avro-apicurio2/pom.xml
@@ -57,12 +57,8 @@
         <dependency>
             <groupId>io.confluent</groupId>
             <artifactId>kafka-avro-serializer</artifactId>
-            <version>7.0.0</version>
+            <version>7.2.1</version>
             <exclusions>
-                <exclusion>
-                    <groupId>jakarta.ws.rs</groupId>
-                    <artifactId>jakarta.ws.rs-api</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.checkerframework</groupId>
                     <artifactId>checker-qual</artifactId>
@@ -275,4 +271,4 @@
         </profile>
     </profiles>
 
-</project>
+</project>
diff --git a/jakarta/rewrite.yml b/jakarta/rewrite.yml
@@ -578,10 +578,8 @@ recipeList:
   - org.openrewrite.maven.ChangePropertyValue:
       key: testng.version
       newValue: 7.4.0
-# In progress, these ones need a change:
+# TODO, these ones probably still need a change:
 #        <microprofile-reactive-streams-operators.version>1.0.1</microprofile-reactive-streams-operators.version>
-#        <microprofile-lra.version>1.0</microprofile-lra.version>
-#        <smallrye-graphql.version>1.4.3</smallrye-graphql.version>
 #        <smallrye-reactive-streams-operators.version>1.0.13</smallrye-reactive-streams-operators.version>
 #        <smallrye-reactive-types-converter.version>2.6.0</smallrye-reactive-types-converter.version>
 #        <smallrye-mutiny-vertx-binding.version>2.19.0</smallrye-mutiny-vertx-binding.version>

diff --git a/jakarta/transform.sh b/jakarta/transform.sh
@@ -332,12 +332,18 @@ git checkout -- extensions/kubernetes-service-binding/runtime/src/test/resources
 
 # Disable non-compilable ITs
 # - Confluent registry client doesn't have a version supporting Jakarta packages
-sed -i 's@<module>kafka-avro</module>@<!-- <module>kafka-avro</module> -->@g' integration-tests/pom.xml
 
 # Commit what we have before cherry-picking stuff
 git add .
 git commit -m 'Transform sources to Jakarta'
 
+# Remove integration-tests/kafka-avro as it's testing old versions
+# We have a new module for newer versions that work with Jakarta
+sed -i '/<module>kafka-avro<\/module>/d' integration-tests/pom.xml
+rm -rf integration-tests/kafka-avro
+git add .
+git commit -m 'Remove integration-tests/kafka-avro - see kafka-avro-apicurio2 instead'
+
 # Apply EE 10 updates
 
 ## CDI/ArC