Fixed dependency scopes and versions

eclipse-ee4j · May 16, 2021 · 326d39c · 326d39c
1 parent 21de5ec
commit 326d39c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 20 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -117,50 +117,39 @@
             <groupId>jakarta.mvc</groupId>
             <artifactId>jakarta.mvc-api</artifactId>
             <version>${spec.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>
             <version>3.0.0</version>
-<!--            <type>bundle</type>-->
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
             <version>5.0.0</version>
-<!--            <scope>provided</scope>-->
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <version>3.0.0</version>
-<!--            <scope>provided</scope>-->
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
             <version>3.0.0</version>
-<!--            <scope>provided</scope>-->
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
             <version>2.0.0</version>
-<!--            <scope>provided</scope>-->
+            <scope>provided</scope>
         </dependency>
 
-        <!-- TODO remove -->
-<!--        <dependency>-->
-<!--            <groupId>jakarta.el</groupId>-->
-<!--            <artifactId>jakarta.el-api</artifactId>-->
-<!--            <version>4.0.0-RC2</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>jakarta.interceptor</groupId>-->
-<!--            <artifactId>jakarta.interceptor-api</artifactId>-->
-<!--            <version>2.0.0-RC2</version>-->
-<!--        </dependency>-->
         <!-- Test scope -->
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>

diff --git a/ext/pom.xml b/ext/pom.xml
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>jakarta.platform</groupId>
             <artifactId>jakarta.jakartaee-api</artifactId>
-            <version>8.0.0</version>
+            <version>9.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/resteasy/pom.xml b/resteasy/pom.xml
@@ -79,7 +79,19 @@
             <groupId>jakarta.mvc</groupId>
             <artifactId>jakarta.mvc-api</artifactId>
             <version>${spec.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <version>3.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>2.0.0</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Krazo Core -->

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -120,7 +120,7 @@
         <dependency>
             <groupId>jakarta.platform</groupId>
             <artifactId>jakarta.jakartaee-api</artifactId>
-            <version>8.0.0</version>
+            <version>9.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>