Skip to content

Commit 060b628

Browse files
ehsavoieehsavoie
committed
Merging
2 parents 886540e + d699b1c commit 060b628

File tree

1 file changed

+193
-118
lines changed

1 file changed

+193
-118
lines changed

‎pom.xml

Lines changed: 193 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -239,153 +239,98 @@
239239

240240
<dependencyManagement>
241241
<dependencies>
242+
<!--
243+
dependencies required to compile and run Silverpeas
244+
-->
242245
<dependency>
243-
<groupId>com.sun.jersey</groupId>
244-
<artifactId>jersey-server</artifactId>
245-
<version>${jersey.version}</version>
246-
</dependency>
247-
<dependency>
248-
<groupId>com.sun.jersey</groupId>
249-
<artifactId>jersey-core</artifactId>
250-
<version>${jersey.version}</version>
251-
</dependency>
252-
<dependency>
253-
<groupId>com.sun.jersey.contribs</groupId>
254-
<artifactId>jersey-spring</artifactId>
255-
<version>${jersey.version}</version>
256-
<exclusions>
257-
<exclusion>
258-
<groupId>org.springframework</groupId>
259-
<artifactId>spring-web</artifactId>
260-
</exclusion>
261-
</exclusions>
262-
</dependency>
263-
<dependency>
264-
<groupId>junit</groupId>
265-
<artifactId>junit</artifactId>
266-
<version>4.8.2</version>
267-
<scope>test</scope>
268-
</dependency>
269-
<dependency>
270-
<groupId>org.mockito</groupId>
271-
<artifactId>mockito-all</artifactId>
272-
<version>1.8.5</version>
273-
<scope>test</scope>
274-
</dependency>
275-
<dependency>
276-
<groupId>org.powermock</groupId>
277-
<artifactId>powermock-module-junit4</artifactId>
278-
<version>${powermock.version}</version>
279-
<scope>test</scope>
246+
<groupId>org.springframework</groupId>
247+
<artifactId>spring-core</artifactId>
248+
<version>${spring.version}</version>
280249
</dependency>
281250
<dependency>
282-
<groupId>org.powermock</groupId>
283-
<artifactId>powermock-module-junit4-rule</artifactId>
284-
<version>${powermock.version}</version>
285-
<scope>test</scope>
251+
<groupId>org.springframework</groupId>
252+
<artifactId>spring-beans</artifactId>
253+
<version>${spring.version}</version>
286254
</dependency>
287255
<dependency>
288-
<groupId>org.powermock</groupId>
289-
<artifactId>powermock-api-mockito</artifactId>
290-
<version>${powermock.version}</version>
291-
<scope>test</scope>
256+
<groupId>org.springframework</groupId>
257+
<artifactId>spring-context</artifactId>
258+
<version>${spring.version}</version>
292259
</dependency>
293260
<dependency>
294-
<groupId>com.jayway.awaitility</groupId>
295-
<artifactId>awaitility</artifactId>
296-
<version>1.3</version>
297-
<scope>test</scope>
298-
<exclusions>
299-
<exclusion>
300-
<groupId>org.hamcrest</groupId>
301-
<artifactId>hamcrest-library</artifactId>
302-
</exclusion>
303-
<exclusion>
304-
<groupId>org.hamcrest</groupId>
305-
<artifactId>hamcrest-core</artifactId>
306-
</exclusion>
307-
</exclusions>
261+
<groupId>org.springframework</groupId>
262+
<artifactId>spring-orm</artifactId>
263+
<version>${spring.version}</version>
308264
</dependency>
309265
<dependency>
310-
<groupId>org.dbunit</groupId>
311-
<artifactId>dbunit</artifactId>
312-
<version>2.2.2</version>
313-
<scope>test</scope>
266+
<groupId>org.springframework</groupId>
267+
<artifactId>spring-aop</artifactId>
268+
<version>${spring.version}</version>
314269
</dependency>
315270
<dependency>
316-
<groupId>com.h2database</groupId>
317-
<artifactId>h2</artifactId>
318-
<version>1.2.143</version>
271+
<groupId>org.springframework</groupId>
272+
<artifactId>spring-web</artifactId>
273+
<version>${spring.version}</version>
319274
</dependency>
320275
<dependency>
321-
<groupId>org.jvnet.mock-javamail</groupId>
322-
<artifactId>mock-javamail</artifactId>
323-
<version>1.7</version>
324-
<scope>test</scope>
276+
<groupId>org.springframework</groupId>
277+
<artifactId>spring-webmvc</artifactId>
278+
<version>${spring.version}</version>
325279
</dependency>
326280
<dependency>
327-
<groupId>org.easymock</groupId>
328-
<artifactId>easymock</artifactId>
329-
<version>2.4</version>
330-
<scope>test</scope>
281+
<groupId>org.springframework.ldap</groupId>
282+
<artifactId>spring-ldap-core</artifactId>
283+
<version>1.3.1.RELEASE</version>
331284
</dependency>
332285
<dependency>
333-
<groupId>com.sun.jndi</groupId>
334-
<artifactId>fscontext</artifactId>
335-
<version>1.2</version>
336-
<scope>test</scope>
286+
<groupId>org.codehaus.jackson</groupId>
287+
<artifactId>jackson-mapper-lgpl</artifactId>
288+
<version>1.7.2</version>
337289
</dependency>
338290
<dependency>
339-
<groupId>com.sun.jndi</groupId>
340-
<artifactId>providerutil</artifactId>
341-
<version>1.2</version>
342-
<scope>test</scope>
291+
<groupId>com.sun.jersey</groupId>
292+
<artifactId>jersey-server</artifactId>
293+
<version>${jersey.version}</version>
343294
</dependency>
344295
<dependency>
345-
<groupId>org.easymock</groupId>
346-
<artifactId>easymockclassextension</artifactId>
347-
<version>2.4</version>
348-
<scope>test</scope>
296+
<groupId>com.sun.jersey</groupId>
297+
<artifactId>jersey-core</artifactId>
298+
<version>${jersey.version}</version>
349299
</dependency>
350300
<dependency>
351-
<groupId>com.mockrunner</groupId>
352-
<artifactId>mockrunner-jms</artifactId>
353-
<version>${mockrunner.version}</version>
354-
<classifier>jdk1.6-j2ee1.4</classifier>
355-
<scope>test</scope>
301+
<groupId>com.sun.jersey.contribs</groupId>
302+
<artifactId>jersey-spring</artifactId>
303+
<version>${jersey.version}</version>
356304
</dependency>
357305
<dependency>
358-
<groupId>com.mockrunner</groupId>
359-
<artifactId>mockrunner</artifactId>
360-
<version>${mockrunner.version}</version>
361-
<classifier>jdk1.6-j2ee1.4</classifier>
362-
<scope>test</scope>
306+
<groupId>com.h2database</groupId>
307+
<artifactId>h2</artifactId>
308+
<version>1.2.143</version>
363309
</dependency>
364310
<dependency>
365-
<groupId>com.mockrunner</groupId>
366-
<artifactId>mockrunner-jdbc</artifactId>
367-
<version>${mockrunner.version}</version>
368-
<classifier>jdk1.6-j2ee1.4</classifier>
369-
<scope>test</scope>
311+
<groupId>javax.servlet.jsp</groupId>
312+
<artifactId>jsp-api</artifactId>
313+
<version>2.0</version>
314+
<scope>provided</scope>
370315
</dependency>
371316
<dependency>
372-
<groupId>httpunit</groupId>
373-
<artifactId>httpunit</artifactId>
374-
<version>1.6.2</version>
375-
<scope>test</scope>
317+
<groupId>javax.ejb</groupId>
318+
<artifactId>ejb-api</artifactId>
319+
<version>2.1</version>
320+
<scope>provided</scope>
376321
</dependency>
377322
<dependency>
378-
<groupId>org.hamcrest</groupId>
379-
<artifactId>hamcrest-all</artifactId>
380-
<version>1.2</version>
381-
<scope>test</scope>
323+
<groupId>javax.jms</groupId>
324+
<artifactId>jms-api</artifactId>
325+
<version>1.1</version>
326+
<scope>provided</scope>
382327
</dependency>
383-
<dependency>
328+
<!-- <dependency>
384329
<groupId>org.apache.geronimo.specs</groupId>
385330
<artifactId>geronimo-j2ee_1.4_spec</artifactId>
386331
<version>1.1</version>
387332
<scope>provided</scope>
388-
</dependency>
333+
</dependency>-->
389334
<dependency>
390335
<groupId>javax.servlet</groupId>
391336
<artifactId>jstl</artifactId>
@@ -395,7 +340,7 @@
395340
<dependency>
396341
<groupId>javax.servlet</groupId>
397342
<artifactId>servlet-api</artifactId>
398-
<version>2.4</version>
343+
<version>2.5</version>
399344
<scope>provided</scope>
400345
</dependency>
401346
<dependency>
@@ -748,7 +693,6 @@
748693
<artifactId>spring-context</artifactId>
749694
<version>${spring.version}</version>
750695
</dependency>
751-
752696
<dependency>
753697
<groupId>org.springframework</groupId>
754698
<artifactId>spring-orm</artifactId>
@@ -1124,6 +1068,137 @@
11241068
<artifactId>quartz</artifactId>
11251069
<version>1.8.4</version>
11261070
</dependency>
1071+
1072+
<!--
1073+
dependencies to compile and run tests
1074+
-->
1075+
<dependency>
1076+
<groupId>junit</groupId>
1077+
<artifactId>junit</artifactId>
1078+
<version>4.8.2</version>
1079+
<scope>test</scope>
1080+
</dependency>
1081+
<dependency>
1082+
<groupId>org.springframework</groupId>
1083+
<artifactId>spring-test</artifactId>
1084+
<version>${spring.version}</version>
1085+
<scope>test</scope>
1086+
</dependency>
1087+
<dependency>
1088+
<groupId>com.sun.jersey.jersey-test-framework</groupId>
1089+
<artifactId>jersey-test-framework-grizzly</artifactId>
1090+
<version>${jersey.version}</version>
1091+
<scope>test</scope>
1092+
</dependency>
1093+
<dependency>
1094+
<groupId>org.mockito</groupId>
1095+
<artifactId>mockito-all</artifactId>
1096+
<version>1.8.5</version>
1097+
<scope>test</scope>
1098+
</dependency>
1099+
<dependency>
1100+
<groupId>org.powermock</groupId>
1101+
<artifactId>powermock-module-junit4</artifactId>
1102+
<version>${powermock.version}</version>
1103+
<scope>test</scope>
1104+
</dependency>
1105+
<dependency>
1106+
<groupId>org.powermock</groupId>
1107+
<artifactId>powermock-module-junit4-rule</artifactId>
1108+
<version>${powermock.version}</version>
1109+
<scope>test</scope>
1110+
</dependency>
1111+
<dependency>
1112+
<groupId>org.powermock</groupId>
1113+
<artifactId>powermock-api-mockito</artifactId>
1114+
<version>${powermock.version}</version>
1115+
<scope>test</scope>
1116+
</dependency>
1117+
<dependency>
1118+
<groupId>com.jayway.awaitility</groupId>
1119+
<artifactId>awaitility</artifactId>
1120+
<version>1.3</version>
1121+
<scope>test</scope>
1122+
<exclusions>
1123+
<exclusion>
1124+
<groupId>org.hamcrest</groupId>
1125+
<artifactId>hamcrest-library</artifactId>
1126+
</exclusion>
1127+
<exclusion>
1128+
<groupId>org.hamcrest</groupId>
1129+
<artifactId>hamcrest-core</artifactId>
1130+
</exclusion>
1131+
</exclusions>
1132+
</dependency>
1133+
<dependency>
1134+
<groupId>org.dbunit</groupId>
1135+
<artifactId>dbunit</artifactId>
1136+
<version>2.2.2</version>
1137+
<scope>test</scope>
1138+
</dependency>
1139+
<dependency>
1140+
<groupId>org.jvnet.mock-javamail</groupId>
1141+
<artifactId>mock-javamail</artifactId>
1142+
<version>1.7</version>
1143+
<scope>test</scope>
1144+
</dependency>
1145+
<dependency>
1146+
<groupId>org.easymock</groupId>
1147+
<artifactId>easymock</artifactId>
1148+
<version>2.4</version>
1149+
<scope>test</scope>
1150+
</dependency>
1151+
<dependency>
1152+
<groupId>com.sun.jndi</groupId>
1153+
<artifactId>fscontext</artifactId>
1154+
<version>1.2</version>
1155+
<scope>test</scope>
1156+
</dependency>
1157+
<dependency>
1158+
<groupId>com.sun.jndi</groupId>
1159+
<artifactId>providerutil</artifactId>
1160+
<version>1.2</version>
1161+
<scope>test</scope>
1162+
</dependency>
1163+
<dependency>
1164+
<groupId>org.easymock</groupId>
1165+
<artifactId>easymockclassextension</artifactId>
1166+
<version>2.4</version>
1167+
<scope>test</scope>
1168+
</dependency>
1169+
<dependency>
1170+
<groupId>com.mockrunner</groupId>
1171+
<artifactId>mockrunner-jms</artifactId>
1172+
<version>${mockrunner.version}</version>
1173+
<classifier>jdk1.6-j2ee1.4</classifier>
1174+
<scope>test</scope>
1175+
</dependency>
1176+
<dependency>
1177+
<groupId>com.mockrunner</groupId>
1178+
<artifactId>mockrunner</artifactId>
1179+
<version>${mockrunner.version}</version>
1180+
<classifier>jdk1.6-j2ee1.4</classifier>
1181+
<scope>test</scope>
1182+
</dependency>
1183+
<dependency>
1184+
<groupId>com.mockrunner</groupId>
1185+
<artifactId>mockrunner-jdbc</artifactId>
1186+
<version>${mockrunner.version}</version>
1187+
<classifier>jdk1.6-j2ee1.4</classifier>
1188+
<scope>test</scope>
1189+
</dependency>
1190+
<dependency>
1191+
<groupId>httpunit</groupId>
1192+
<artifactId>httpunit</artifactId>
1193+
<version>1.6.2</version>
1194+
<scope>test</scope>
1195+
</dependency>
1196+
<dependency>
1197+
<groupId>org.hamcrest</groupId>
1198+
<artifactId>hamcrest-all</artifactId>
1199+
<version>1.2</version>
1200+
<scope>test</scope>
1201+
</dependency>
11271202
</dependencies>
11281203
</dependencyManagement>
11291204

@@ -1235,7 +1310,7 @@
12351310
<plugin>
12361311
<groupId>org.apache.maven.plugins</groupId>
12371312
<artifactId>maven-surefire-plugin</artifactId>
1238-
<version>2.7.1</version>
1313+
<version>2.7.2</version>
12391314
</plugin>
12401315
<plugin>
12411316
<groupId>org.apache.maven.plugins</groupId>
@@ -1287,9 +1362,9 @@
12871362
</dependencies>
12881363
</plugin>
12891364
<plugin>
1290-
<groupId>com.kalistick.soa</groupId>
1291-
<artifactId>ks-agent</artifactId>
1292-
<version>2.2.1</version>
1365+
<groupId>com.kalistick.client.connector</groupId>
1366+
<artifactId>kalistick</artifactId>
1367+
<version>3.0.1</version>
12931368
</plugin>
12941369
</plugins>
12951370
</pluginManagement>
@@ -1345,7 +1420,7 @@
13451420
</profiles>
13461421

13471422
<properties>
1348-
<jersey.version>1.6-ea01</jersey.version>
1423+
<jersey.version>1.6-ea02</jersey.version>
13491424
<jackrabbit.version>1.6.4</jackrabbit.version>
13501425
<mockrunner.version>0.4.2</mockrunner.version>
13511426
<wagon.version>1.0-beta-6</wagon.version>

0 commit comments

Comments
 (0)