Fix compatibility with Quarkus 3 (#9)

quarkiverse · Oct 24, 2023 · cbf3bf8 · cbf3bf8
1 parent 966eadb
commit cbf3bf8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/...yment/src/main/java/io/quarkiverse/scala/scala3/deployment/Scala3CompilationProvider.java b/...yment/src/main/java/io/quarkiverse/scala/scala3/deployment/Scala3CompilationProvider.java
@@ -18,8 +18,8 @@
 import dotty.tools.dotc.interfaces.Diagnostic;
 import dotty.tools.dotc.interfaces.SimpleReporter;
 import dotty.tools.dotc.interfaces.SourceFile;
-import io.quarkus.bootstrap.model.PathsCollection;
 import io.quarkus.deployment.dev.CompilationProvider;
+import io.quarkus.paths.PathCollection;
 
 /**
  * Main.process() documentation for "dotty-interface" overload used here.
@@ -170,4 +170,4 @@ public void onSourceCompiled(SourceFile source) {
             CompilerCallback.super.onSourceCompiled(source);
         }
     }
-}
+}
diff --git a/integration-tests/src/main/java/io/quarkiverse/scala/scala3/it/Scala3Resource.java b/integration-tests/src/main/java/io/quarkiverse/scala/scala3/it/Scala3Resource.java
@@ -16,9 +16,9 @@
 */
 package io.quarkiverse.scala.scala3.it;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
 
 @Path("/scala3")
 @ApplicationScoped

diff --git a/integration-tests/src/test/java/io/quarkiverse/scala/scala3/it/NativeScala3ResourceIT.java b/integration-tests/src/test/java/io/quarkiverse/scala/scala3/it/NativeScala3ResourceIT.java
@@ -1,7 +1,7 @@
 package io.quarkiverse.scala.scala3.it;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class NativeScala3ResourceIT extends Scala3ResourceTest {
 }
diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
     <module>runtime</module>
   </modules>
   <properties>
-    <compiler-plugin.version>3.8.1</compiler-plugin.version>
+    <compiler-plugin.version>3.11.0</compiler-plugin.version>
 
     <maven.compiler.parameters>true</maven.compiler.parameters>
     <maven.compiler.source>11</maven.compiler.source>
@@ -25,7 +25,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <quarkus.version>2.1.0.Final</quarkus.version>
+    <quarkus.version>3.5.0</quarkus.version>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -67,4 +67,4 @@
       </modules>
     </profile>
   </profiles>
-</project>
+</project>
diff --git a/runtime/pom.xml b/runtime/pom.xml
@@ -18,7 +18,7 @@
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${quarkus.version}</version>
         <executions>
           <execution>