Skip to content

Commit

Permalink
#1099 Upgrade from Java EE 7 to Jakarta EE 8
Browse files Browse the repository at this point in the history 
* switch from javaee-api 7.0 to jakarta.jakartaee-api 8.0.0
* update cdi-api from 1.2 to 2.0
* add jakarta.jws-api 2.1.0
* add geronimo-atinject_1.0_spec where missing
  • Loading branch information
@oliverlietz
oliverlietz committed Oct 12, 2023
1 parent 1191991 commit bfaff57
Show file tree
Hide file tree
Showing 31 changed files with 83 additions and 59 deletions.
4 changes: 2 additions & 2 deletions core/pax-exam-cdi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions core/pax-exam-servlet-bridge/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions core/pax-exam-spring/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
1 change: 1 addition & 0 deletions core/pax-exam/src/main/java/org/ops4j/pax/exam/options/WarProbeOption.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public class WarProbeOption implements Option {
"glassfish-embedded-", //
"hk2-api-", //
"javaee-api-", //
"jakartaee-api", //
"jboss-log-", //
"jersey-client-", //
"jersey-common-", //
Expand Down
4 changes: 2 additions & 2 deletions drivers/pax-exam-testng-servlet-bridge/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions drivers/pax-exam-testng/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions itest/cdi/src/it/regression-cdi-invalid/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@
</dependency>

<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions itest/cdi/src/it/regression-cdi-testng/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
</dependency>

<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions itest/cdi/src/it/regression-deltaspike/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@
</dependency>

<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions itest/javaee/src/it/regression-javaee-data/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@
</dependency>

<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions itest/javaee/src/it/regression-javaee-testng/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@
</dependency>

<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions itest/osgi/src/it/regression-testng-perclass/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@
</dependency>

<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions itest/osgi/src/it/regression-testng/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
</dependency>

<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
6 changes: 6 additions & 0 deletions itest/web/src/it/regression-web-spring-userprobe/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@

<dependencies>

<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-invoker-jaxrs2</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions itest/web/src/it/regression-web-spring/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@

<dependencies>

<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-invoker-jaxrs2</artifactId>
Expand Down
14 changes: 10 additions & 4 deletions pom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,9 +424,15 @@
</dependency>

<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>7.0</version>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<version>8.0.0</version>
</dependency>

<dependency>
<groupId>jakarta.jws</groupId>
<artifactId>jakarta.jws-api</artifactId>
<version>2.1.0</version>
</dependency>

<dependency>
Expand All @@ -444,7 +450,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<version>1.2</version>
<version>2.0</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions samples/pax-exam-sample1-model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

<dependencies>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions samples/pax-exam-sample1-repo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions samples/pax-exam-sample1-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions samples/pax-exam-sample1-web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
<artifactId>slf4j-simple</artifactId>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions samples/pax-exam-sample2-model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

<dependencies>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions samples/pax-exam-sample2-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@
</dependency>

<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions samples/pax-exam-sample3-beans/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

<dependencies>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions samples/pax-exam-sample4-model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

<dependencies>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions samples/pax-exam-sample4-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
</dependency>

<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions samples/pax-exam-sample4-web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
</dependency>

<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions samples/pax-exam-sample5-mdb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions samples/pax-exam-sample6-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<artifactId>spring-orm</artifactId>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions samples/pax-exam-sample6-web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
10 changes: 8 additions & 2 deletions samples/pax-exam-sample7-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,14 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.jws</groupId>
<artifactId>jakarta.jws-api</artifactId>

<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
5 changes: 2 additions & 3 deletions samples/pax-exam-sample7-web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@
</dependency>

<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
<version>6.0-4</version>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>

Expand Down

0 comments on commit bfaff57

Please sign in to comment.