Skip to content

Commit 6a78d2f

Browse files
committed
Replace Java EE 8 dependencies with Jakarta EE 9.
Remove unnecessary dependencies (e.g. jakarta.interceptor:jakarta.interceptor-api & jakarta.el:jakarta.el-api). Resolves spring-projectsgh-539.
1 parent 05f76d3 commit 6a78d2f

File tree

1 file changed

+21
-24
lines changed

1 file changed

+21
-24
lines changed

Diff for: spring-data-geode/pom.xml

+21-24
Original file line numberDiff line numberDiff line change
@@ -153,31 +153,16 @@
153153

154154
<!-- Test -->
155155
<!-- CDI -->
156-
<!-- Dependency order required to build against CDI 1.0 and test with CDI 2.0 -->
157156
<dependency>
158-
<groupId>org.apache.geronimo.specs</groupId>
159-
<artifactId>geronimo-jcdi_2.0_spec</artifactId>
160-
<version>1.0.1</version>
161-
<scope>provided</scope>
162-
</dependency>
163-
164-
<dependency>
165-
<groupId>javax.interceptor</groupId>
166-
<artifactId>javax.interceptor-api</artifactId>
167-
<version>1.2.2</version>
157+
<groupId>jakarta.annotation</groupId>
158+
<artifactId>jakarta.annotation-api</artifactId>
159+
<version>${jakarta-annotation-api}</version>
168160
<scope>test</scope>
169161
</dependency>
170162

171163
<dependency>
172-
<groupId>javax.el</groupId>
173-
<artifactId>el-api</artifactId>
174-
<version>2.2</version>
175-
<scope>test</scope>
176-
</dependency>
177-
178-
<dependency>
179-
<groupId>javax.enterprise</groupId>
180-
<artifactId>cdi-api</artifactId>
164+
<groupId>jakarta.enterprise</groupId>
165+
<artifactId>jakarta.enterprise.cdi-api</artifactId>
181166
<version>${cdi}</version>
182167
<optional>true</optional>
183168
<scope>provided</scope>
@@ -190,25 +175,37 @@
190175
</dependency>
191176

192177
<dependency>
193-
<groupId>javax.annotation</groupId>
194-
<artifactId>javax.annotation-api</artifactId>
195-
<version>${javax-annotation-api}</version>
178+
<groupId>org.apache.openwebbeans</groupId>
179+
<artifactId>openwebbeans-se</artifactId>
180+
<classifier>jakarta</classifier>
181+
<version>${webbeans}</version>
182+
<scope>test</scope>
183+
</dependency>
184+
185+
<dependency>
186+
<groupId>org.apache.openwebbeans</groupId>
187+
<artifactId>openwebbeans-spi</artifactId>
188+
<classifier>jakarta</classifier>
189+
<version>${webbeans}</version>
196190
<scope>test</scope>
197191
</dependency>
198192

199193
<dependency>
200194
<groupId>org.apache.openwebbeans</groupId>
201-
<artifactId>openwebbeans-se</artifactId>
195+
<artifactId>openwebbeans-impl</artifactId>
196+
<classifier>jakarta</classifier>
202197
<version>${webbeans}</version>
203198
<scope>test</scope>
204199
</dependency>
205200

201+
<!--
206202
<dependency>
207203
<groupId>org.apache.xbean</groupId>
208204
<artifactId>xbean-asm9-shaded</artifactId>
209205
<version>${webbeans.xbean}</version>
210206
<scope>test</scope>
211207
</dependency>
208+
-->
212209

213210
<dependency>
214211
<groupId>org.apache.derby</groupId>

0 commit comments

Comments
 (0)