Skip to content

Commit cd2a8ce

Browse files
jxblumjxblum
committed
Polish the spring-data-geode Maven POM.
Declare the org.apache.xbean:xbean-asm9-shaded dependency required to get CDI tests to pass. Resolves spring-projectsgh-538.
1 parent 7f84b71 commit cd2a8ce

File tree

1 file changed

+51
-68
lines changed

1 file changed

+51
-68
lines changed

‎spring-data-geode/pom.xml

+51-68
Original file line numberDiff line numberDiff line change
@@ -82,43 +82,6 @@
8282
<optional>true</optional>
8383
</dependency>
8484

85-
<!-- CDI -->
86-
<!-- Dependency order required to build against CDI 1.0 and test with CDI 2.0 -->
87-
<dependency>
88-
<groupId>org.apache.geronimo.specs</groupId>
89-
<artifactId>geronimo-jcdi_2.0_spec</artifactId>
90-
<version>1.0.1</version>
91-
<scope>test</scope>
92-
</dependency>
93-
94-
<dependency>
95-
<groupId>javax.interceptor</groupId>
96-
<artifactId>javax.interceptor-api</artifactId>
97-
<version>1.2.1</version>
98-
<scope>test</scope>
99-
</dependency>
100-
101-
<dependency>
102-
<groupId>javax.el</groupId>
103-
<artifactId>el-api</artifactId>
104-
<version>2.2</version>
105-
<scope>test</scope>
106-
</dependency>
107-
108-
<dependency>
109-
<groupId>javax.enterprise</groupId>
110-
<artifactId>cdi-api</artifactId>
111-
<version>${cdi}</version>
112-
<optional>true</optional>
113-
<scope>provided</scope>
114-
<exclusions>
115-
<exclusion>
116-
<groupId>javax.annotation</groupId>
117-
<artifactId>jsr250-api</artifactId>
118-
</exclusion>
119-
</exclusions>
120-
</dependency>
121-
12285
<!-- Spring Framework -->
12386
<dependency>
12487
<groupId>org.springframework</groupId>
@@ -189,17 +152,47 @@
189152
</dependency>
190153

191154
<!-- Test -->
155+
<!-- CDI -->
156+
<!-- Dependency order required to build against CDI 1.0 and test with CDI 2.0 -->
192157
<dependency>
193-
<groupId>javax.annotation</groupId>
194-
<artifactId>javax.annotation-api</artifactId>
195-
<version>${javax-annotation-api}</version>
158+
<groupId>org.apache.geronimo.specs</groupId>
159+
<artifactId>geronimo-jcdi_2.0_spec</artifactId>
160+
<version>1.0.1</version>
196161
<scope>test</scope>
197162
</dependency>
198163

199164
<dependency>
200-
<groupId>org.apache.derby</groupId>
201-
<artifactId>derbyLocale_zh_TW</artifactId>
202-
<version>10.9.1.0</version>
165+
<groupId>javax.interceptor</groupId>
166+
<artifactId>javax.interceptor-api</artifactId>
167+
<version>1.2.2</version>
168+
<scope>test</scope>
169+
</dependency>
170+
171+
<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>
181+
<version>${cdi}</version>
182+
<optional>true</optional>
183+
<scope>provided</scope>
184+
<exclusions>
185+
<exclusion>
186+
<groupId>javax.annotation</groupId>
187+
<artifactId>jsr250-api</artifactId>
188+
</exclusion>
189+
</exclusions>
190+
</dependency>
191+
192+
<dependency>
193+
<groupId>javax.annotation</groupId>
194+
<artifactId>javax.annotation-api</artifactId>
195+
<version>${javax-annotation-api}</version>
203196
<scope>test</scope>
204197
</dependency>
205198

@@ -210,6 +203,20 @@
210203
<scope>test</scope>
211204
</dependency>
212205

206+
<dependency>
207+
<groupId>org.apache.xbean</groupId>
208+
<artifactId>xbean-asm9-shaded</artifactId>
209+
<version>${webbeans.xbean}</version>
210+
<scope>test</scope>
211+
</dependency>
212+
213+
<dependency>
214+
<groupId>org.apache.derby</groupId>
215+
<artifactId>derbyLocale_zh_TW</artifactId>
216+
<version>10.9.1.0</version>
217+
<scope>test</scope>
218+
</dependency>
219+
213220
<dependency>
214221
<groupId>org.assertj</groupId>
215222
<artifactId>assertj-core</artifactId>
@@ -265,6 +272,7 @@
265272
<groupId>org.apache.maven.plugins</groupId>
266273
<artifactId>maven-surefire-plugin</artifactId>
267274
<configuration>
275+
<argLine>--add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED</argLine>
268276
<includes>
269277
<include>**/*Tests.java</include>
270278
<include>**/*Test.java</include>
@@ -331,31 +339,6 @@
331339
</plugins>
332340
</build>
333341
</profile>
334-
<profile>
335-
<id>remote-java17</id>
336-
<build>
337-
<plugins>
338-
<plugin>
339-
<groupId>org.apache.maven.plugins</groupId>
340-
<artifactId>maven-surefire-plugin</artifactId>
341-
<configuration>
342-
<argLine>--add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED</argLine>
343-
<includes>
344-
<include>**/*Tests.java</include>
345-
<include>**/*Test.java</include>
346-
</includes>
347-
<reuseForks>false</reuseForks>
348-
<systemProperties>
349-
<java.util.logging.config.file>${basedir}/src/test/resources/java-util-logging.properties</java.util.logging.config.file>
350-
<gemfire.disableShutdownHook>true</gemfire.disableShutdownHook>
351-
<logback.log.level>error</logback.log.level>
352-
<spring.profiles.active>apache-geode</spring.profiles.active>
353-
</systemProperties>
354-
</configuration>
355-
</plugin>
356-
</plugins>
357-
</build>
358-
</profile>
359342
</profiles>
360343

361344
</project>

0 commit comments

Comments
 (0)