Project

General

Profile

« Previous | Next » 

Revision c442b312

Added by Katja Luther about 8 years ago

fix project for version 4.0

View differences:

pom.xml
72 72
      <layout>default</layout>
73 73
    </repository>
74 74
  </distributionManagement>
75
  <dependencies>
76
    <dependency>
77
      <groupId>com.vaadin</groupId>
78
      <artifactId>vaadin-server</artifactId>
79
      <version>${vaadin.version}</version>
80
    </dependency>
81
    <dependency>
82
      <groupId>com.vaadin</groupId>
83
      <artifactId>vaadin-client-compiled</artifactId>
84
      <version>${vaadin.version}</version>
85
    </dependency>
86
    <!-- Needed when using the widgetset optimizer (custom ConnectorBundleLoaderFactory). 
87
      For widgetset compilation, vaadin-client-compiler is automatically added 
88
      on the compilation classpath by vaadin-maven-plugin so normally there is 
89
      no need for an explicit dependency. -->
90
    <!-- <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-client-compiler</artifactId> 
91
      <version>${vaadin.version}</version> <scope>provided</scope> </dependency> -->
92
    <dependency>
93
      <groupId>com.vaadin</groupId>
94
      <artifactId>vaadin-client</artifactId>
95
      <version>${vaadin.version}</version>
96
      <scope>provided</scope>
97
    </dependency>
98
    <!-- disabling push for the moment because it does not work with run-jetty-run 
99
      due to the fact that the latest (even nightly) version of run-jetty-run uses 
100
      9.0.0 M3 which is incompatible with atmoshpere. this does work with the jetty 
101
      included in this pom which is 9.2.5.xx, implying that enabling the dependency 
102
      and running the web app via 'mvn jetty:run' works fine. -->
103
    <!-- <dependency> -->
104
    <!-- <groupId>com.vaadin</groupId> -->
105
    <!-- <artifactId>vaadin-push</artifactId> -->
106
    <!-- <version>${vaadin.version}</version> -->
107
    <!-- </dependency> -->
108
    <dependency>
109
      <groupId>com.vaadin</groupId>
110
      <artifactId>vaadin-themes</artifactId>
111
      <version>${vaadin.version}</version>
112
    </dependency>
113
    <dependency>
114
      <groupId>javax.servlet</groupId>
115
      <artifactId>javax.servlet-api</artifactId>
116
      <version>3.1.0</version>
117
      <scope>provided</scope>
118
    </dependency>
119
    <dependency>
120
      <groupId>com.vaadin</groupId>
121
      <artifactId>vaadin-testbench-api</artifactId>
122
      <version>RELEASE</version>
123
      <scope>test</scope>
124
    </dependency>
125
    <dependency>
126
      <groupId>eu.etaxonomy</groupId>
127
      <artifactId>cdmlib-services</artifactId>
128
      <version>${cdmlib.version}</version>
129
      <scope>provided</scope>
130
    </dependency>
131
    <dependency>
132
      <groupId>eu.etaxonomy</groupId>
133
      <artifactId>cdmlib-model</artifactId>
134
      <version>${cdmlib.version}</version>
135
      <scope>provided</scope>
136
    </dependency>
137
    <dependency>
138
      <groupId>eu.etaxonomy</groupId>
139
      <artifactId>cdmlib-persistence</artifactId>
140
      <type>test-jar</type>
141
      <scope>test</scope>
142
      <version>${cdmlib.version}</version>
143
    </dependency>
144
    <dependency>
145
      <groupId>org.springmodules</groupId>
146
      <artifactId>spring-modules-cache</artifactId>
147
      <version>0.7</version>
148
      <exclusions>
149
        <exclusion>
150
          <groupId>org.springframework</groupId>
151
          <artifactId>spring</artifactId>
152
        </exclusion>
153
        <exclusion>
154
          <groupId>org.springframework</groupId>
155
          <artifactId>spring-mock</artifactId>
156
        </exclusion>
157
      </exclusions>
158
      <scope>provided</scope>
159
    </dependency>
160
    <dependency>
161
      <groupId>com.thoughtworks.xstream</groupId>
162
      <artifactId>xstream</artifactId>
163
      <version>1.4.4</version>
164
      <scope>provided</scope>
165
    </dependency>
166
    <dependency>
167
      <groupId>org.springframework</groupId>
168
      <artifactId>spring-mock</artifactId>
169
      <version>2.0.8</version>
170
      <scope>provided</scope>
171
    </dependency>
172
    <dependency>
173
      <groupId>org.springframework</groupId>
174
      <artifactId>spring-context-support</artifactId>
175
      <version>${spring.version}</version>
176
      <scope>provided</scope>
177
    </dependency>
178
     <dependency>
179
        <groupId>org.springframework</groupId>
180
        <artifactId>spring-web</artifactId>
181
        <version>${spring.version}</version>
182
      </dependency>
183
   <dependency>
184
      	<groupId>org.springframework</groupId>
185
        <artifactId>spring-webmvc</artifactId>
186
        <version>${spring.version}</version>
187
      </dependency>
188
    <dependency>
189
      <groupId>junit</groupId>
190
      <artifactId>junit</artifactId>
191
      <version>4.11</version>
192
      <scope>test</scope>
193
    </dependency>
194
    <!-- vaadin addons / extensions -->
195
    <dependency>
196
      <groupId>org.vaadin.addons</groupId>
197
      <artifactId>contextmenu</artifactId>
198
      <version>4.5</version>
199
    </dependency>
200
    <!-- unitils dependencies - start -->
201
    <dependency>
202
      <groupId>org.unitils</groupId>
203
      <artifactId>unitils-core</artifactId>
204
      <version>${unitils.version}</version>
205
      <scope>test</scope>
206
    </dependency>
207
    <dependency>
208
      <groupId>org.unitils</groupId>
209
      <artifactId>unitils-database</artifactId>
210
      <version>${unitils.version}</version>
211
      <scope>test</scope>
212
      <exclusions>
213
        <exclusion>
214
          <groupId>org.springframework</groupId>
215
          <artifactId>spring-jdbc</artifactId>
216
        </exclusion>
217
      </exclusions>
218
    </dependency>
219
    <dependency>
220
      <groupId>org.unitils</groupId>
221
      <artifactId>unitils-dbmaintainer</artifactId>
222
      <version>${unitils.version}</version>
223
      <scope>test</scope>
224
      <exclusions>
225
        <exclusion>
226
          <groupId>org.hibernate</groupId>
227
          <artifactId>hibernate</artifactId>
228
        </exclusion>
229
      </exclusions>
230
    </dependency>
231
    <dependency>
232
      <groupId>org.unitils</groupId>
233
      <artifactId>unitils-dbunit</artifactId>
234
      <version>${unitils.version}</version>
235
      <scope>test</scope>
236
      <exclusions>
237
        <exclusion>
238
          <groupId>org.springframework</groupId>
239
          <artifactId>spring-core</artifactId>
240
        </exclusion>
241
        <exclusion>
242
          <groupId>org.springframework</groupId>
243
          <artifactId>spring-jdbc</artifactId>
244
        </exclusion>
245
        <exclusion>
246
          <groupId>org.springframework</groupId>
247
          <artifactId>spring-beans</artifactId>
248
        </exclusion>
249
      </exclusions>
250
    </dependency>
251
    <dependency>
252
      <groupId>org.unitils</groupId>
253
      <artifactId>unitils-easymock</artifactId>
254
      <version>${unitils.version}</version>
255
      <scope>test</scope>
256
    </dependency>
257
    <dependency>
258
      <groupId>org.unitils</groupId>
259
      <artifactId>unitils-mock</artifactId>
260
      <version>${unitils.version}</version>
261
      <scope>test</scope>
262
    </dependency>
263
    <dependency>
264
      <groupId>org.unitils</groupId>
265
      <artifactId>unitils-inject</artifactId>
266
      <version>${unitils.version}</version>
267
      <scope>test</scope>
268
    </dependency>
269
    <dependency>
270
      <groupId>org.unitils</groupId>
271
      <artifactId>unitils-orm</artifactId>
272
      <version>${unitils.version}</version>
273
      <scope>test</scope>
274
      <exclusions>
275
        <exclusion>
276
          <groupId>org.springframework</groupId>
277
          <artifactId>spring-context</artifactId>
278
        </exclusion>
279
        <exclusion>
280
          <groupId>org.springframework</groupId>
281
          <artifactId>spring-orm</artifactId>
282
        </exclusion>
283
        <exclusion>
284
          <groupId>javax.persistence</groupId>
285
          <artifactId>persistence-api</artifactId>
286
        </exclusion>
287
      </exclusions>
288
    </dependency>
289
    <dependency>
290
      <groupId>org.unitils</groupId>
291
      <artifactId>unitils-spring</artifactId>
292
      <version>${unitils.version}</version>
293
      <scope>test</scope>
294
      <exclusions>
295
        <exclusion>
296
          <groupId>org.springframework</groupId>
297
          <artifactId>spring-core</artifactId>
298
        </exclusion>
299
        <exclusion>
300
          <groupId>org.springframework</groupId>
301
          <artifactId>spring-context</artifactId>
302
        </exclusion>
303
        <exclusion>
304
          <groupId>org.springframework</groupId>
305
          <artifactId>spring-beans</artifactId>
306
        </exclusion>
307
        <exclusion>
308
          <groupId>org.springframework</groupId>
309
          <artifactId>spring-test</artifactId>
310
        </exclusion>
311
        <exclusion>
312
          <groupId>org.springframework</groupId>
313
          <artifactId>spring-tx</artifactId>
314
        </exclusion>
315
      </exclusions>
316
    </dependency>
317
    <dependency>
318
      <groupId>org.easymock</groupId>
319
      <artifactId>easymock</artifactId>
320
      <version>3.1</version>
321
      <scope>test</scope>
322
    </dependency>
323
    <dependency>
324
      <groupId>xmlunit</groupId>
325
      <artifactId>xmlunit</artifactId>
326
      <version>1.4</version>
327
      <scope>test</scope>
328
    </dependency>
329
    <dependency>
330
      <groupId>org.dbunit</groupId>
331
      <artifactId>dbunit</artifactId>
332
      <version>2.4.9</version>
333
      <scope>test</scope>
334
    </dependency>
335
    <dependency>
336
      <groupId>commons-dbcp</groupId>
337
      <artifactId>commons-dbcp</artifactId>
338
      <version>1.4</version>
339
      <scope>test</scope>
340
    </dependency>
341
    <!-- unitils dependencies - end -->
342
    <dependency>
343
      <groupId>org.slf4j</groupId>
344
      <artifactId>slf4j-log4j12</artifactId>
345
      <version>1.7.2</version>
346
      <scope>provided</scope>
347
    </dependency>
348
    <dependency>
349
      <groupId>org.slf4j</groupId>
350
      <artifactId>slf4j-api</artifactId>
351
      <version>1.7.2</version>
352
      <scope>provided</scope>
353
    </dependency>
354
    <dependency>
355
      <groupId>p6spy</groupId>
356
      <artifactId>p6spy</artifactId>
357
      <version>2.1.3</version>
358
      <scope>test</scope>
359
    </dependency>
360
    <dependency>
361
		<groupId>org.json</groupId>
362
		<artifactId>json</artifactId>
363
		<version>20151123</version>
364
	</dependency>
365
    
366
  </dependencies>
75

  
367 76
  <profiles>
368 77
    <profile>
369 78
      <activation>
......
608 317
      </plugins>
609 318
    </pluginManagement>
610 319
  </build>
320
    <dependencies>
321
    <dependency>
322
      <groupId>com.vaadin</groupId>
323
      <artifactId>vaadin-server</artifactId>
324
      <version>${vaadin.version}</version>
325
    </dependency>
326
    <dependency>
327
      <groupId>com.vaadin</groupId>
328
      <artifactId>vaadin-client-compiled</artifactId>
329
      <version>${vaadin.version}</version>
330
    </dependency>
331
    <!-- Needed when using the widgetset optimizer (custom ConnectorBundleLoaderFactory). 
332
      For widgetset compilation, vaadin-client-compiler is automatically added 
333
      on the compilation classpath by vaadin-maven-plugin so normally there is 
334
      no need for an explicit dependency. -->
335
    <!-- <dependency> <groupId>com.vaadin</groupId> <artifactId>vaadin-client-compiler</artifactId> 
336
      <version>${vaadin.version}</version> <scope>provided</scope> </dependency> -->
337
    <dependency>
338
      <groupId>com.vaadin</groupId>
339
      <artifactId>vaadin-client</artifactId>
340
      <version>${vaadin.version}</version>
341
      <scope>provided</scope>
342
    </dependency>
343
    <!-- disabling push for the moment because it does not work with run-jetty-run 
344
      due to the fact that the latest (even nightly) version of run-jetty-run uses 
345
      9.0.0 M3 which is incompatible with atmoshpere. this does work with the jetty 
346
      included in this pom which is 9.2.5.xx, implying that enabling the dependency 
347
      and running the web app via 'mvn jetty:run' works fine. -->
348
    <!-- <dependency> -->
349
    <!-- <groupId>com.vaadin</groupId> -->
350
    <!-- <artifactId>vaadin-push</artifactId> -->
351
    <!-- <version>${vaadin.version}</version> -->
352
    <!-- </dependency> -->
353
    <dependency>
354
      <groupId>com.vaadin</groupId>
355
      <artifactId>vaadin-themes</artifactId>
356
      <version>${vaadin.version}</version>
357
    </dependency>
358
    <dependency>
359
      <groupId>javax.servlet</groupId>
360
      <artifactId>javax.servlet-api</artifactId>
361
      <version>3.1.0</version>
362
      <scope>provided</scope>
363
    </dependency>
364
    <dependency>
365
      <groupId>com.vaadin</groupId>
366
      <artifactId>vaadin-testbench-api</artifactId>
367
      <version>RELEASE</version>
368
      <scope>test</scope>
369
    </dependency>
370
    <dependency>
371
      <groupId>eu.etaxonomy</groupId>
372
      <artifactId>cdmlib-services</artifactId>
373
      <version>${cdmlib.version}</version>
374
<!--       <scope>provided</scope> -->
375
    </dependency>
376
    <dependency>
377
      <groupId>eu.etaxonomy</groupId>
378
      <artifactId>cdmlib-test</artifactId>
379
      <version>${cdmlib.version}</version>
380
      <scope>test</scope>
381
    </dependency>
382
    <!-- to override version number coming with vaadin client -->
383
    <dependency>
384
       <groupId>javax.validation</groupId>
385
       <artifactId>validation-api</artifactId>
386
       <version>1.1.0.Final</version>
387
     </dependency>
388
      
389
      
390
    
391
    <dependency>
392
      <groupId>org.springmodules</groupId>
393
      <artifactId>spring-modules-cache</artifactId>
394
      <version>0.7</version>
395
      <exclusions>
396
        <exclusion>
397
          <groupId>org.springframework</groupId>
398
          <artifactId>spring</artifactId>
399
        </exclusion>
400
        <exclusion>
401
          <groupId>org.springframework</groupId>
402
          <artifactId>spring-mock</artifactId>
403
        </exclusion>
404
      </exclusions>
405
      <scope>provided</scope>
406
    </dependency>
407
    <dependency>
408
      <groupId>com.thoughtworks.xstream</groupId>
409
      <artifactId>xstream</artifactId>
410
      <version>1.4.7</version>
411
      <scope>provided</scope>
412
    </dependency>
413
    <dependency>
414
      <groupId>org.springframework</groupId>
415
      <artifactId>spring-mock</artifactId>
416
      <version>2.0.8</version>
417
      <scope>provided</scope>
418
    </dependency>
419
    <dependency>
420
      <groupId>org.springframework</groupId>
421
      <artifactId>spring-context-support</artifactId>
422
      <version>${spring.version}</version>
423
      <scope>provided</scope>
424
    </dependency>
425
     <dependency>
426
        <groupId>org.springframework</groupId>
427
        <artifactId>spring-web</artifactId>
428
        <version>${spring.version}</version>
429
      </dependency>
430
   <dependency>
431
      	<groupId>org.springframework</groupId>
432
        <artifactId>spring-webmvc</artifactId>
433
        <version>${spring.version}</version>
434
      </dependency>
435

  
436
    <!-- vaadin addons / extensions -->
437
    <dependency>
438
      <groupId>org.vaadin.addons</groupId>
439
      <artifactId>contextmenu</artifactId>
440
      <version>4.5</version>
441
    </dependency>
442
    
443
    <dependency>
444
      <groupId>junit</groupId>
445
      <artifactId>junit</artifactId>
446
      <version>4.11</version>
447
      <scope>test</scope>
448
    </dependency>
449
    <!-- unitils dependencies - start -->
450
<!--     <dependency> -->
451
<!--       <groupId>org.unitils</groupId> -->
452
<!--       <artifactId>unitils-core</artifactId> -->
453
<!--       <version>${unitils.version}</version> -->
454
<!--       <scope>test</scope> -->
455
<!--     </dependency> -->
456
<!--     <dependency> -->
457
<!--       <groupId>org.unitils</groupId> -->
458
<!--       <artifactId>unitils-database</artifactId> -->
459
<!--       <version>${unitils.version}</version> -->
460
<!--       <scope>test</scope> -->
461
<!--       <exclusions> -->
462
<!--         <exclusion> -->
463
<!--           <groupId>org.springframework</groupId> -->
464
<!--           <artifactId>spring-jdbc</artifactId> -->
465
<!--         </exclusion> -->
466
<!--       </exclusions> -->
467
<!--     </dependency> -->
468
<!--     <dependency> -->
469
<!--       <groupId>org.unitils</groupId> -->
470
<!--       <artifactId>unitils-dbmaintainer</artifactId> -->
471
<!--       <version>${unitils.version}</version> -->
472
<!--       <scope>test</scope> -->
473
<!--       <exclusions> -->
474
<!--         <exclusion> -->
475
<!--           <groupId>org.hibernate</groupId> -->
476
<!--           <artifactId>hibernate</artifactId> -->
477
<!--         </exclusion> -->
478
<!--       </exclusions> -->
479
<!--     </dependency> -->
480
<!--     <dependency> -->
481
<!--       <groupId>org.unitils</groupId> -->
482
<!--       <artifactId>unitils-dbunit</artifactId> -->
483
<!--       <version>${unitils.version}</version> -->
484
<!--       <scope>test</scope> -->
485
<!--       <exclusions> -->
486
<!--         <exclusion> -->
487
<!--           <groupId>org.springframework</groupId> -->
488
<!--           <artifactId>spring-core</artifactId> -->
489
<!--         </exclusion> -->
490
<!--         <exclusion> -->
491
<!--           <groupId>org.springframework</groupId> -->
492
<!--           <artifactId>spring-jdbc</artifactId> -->
493
<!--         </exclusion> -->
494
<!--         <exclusion> -->
495
<!--           <groupId>org.springframework</groupId> -->
496
<!--           <artifactId>spring-beans</artifactId> -->
497
<!--         </exclusion> -->
498
<!--       </exclusions> -->
499
<!--     </dependency> -->
500
<!--     <dependency> -->
501
<!--       <groupId>org.unitils</groupId> -->
502
<!--       <artifactId>unitils-easymock</artifactId> -->
503
<!--       <version>${unitils.version}</version> -->
504
<!--       <scope>test</scope> -->
505
<!--     </dependency> -->
506
<!--     <dependency> -->
507
<!--       <groupId>org.unitils</groupId> -->
508
<!--       <artifactId>unitils-mock</artifactId> -->
509
<!--       <version>${unitils.version}</version> -->
510
<!--       <scope>test</scope> -->
511
<!--     </dependency> -->
512
<!--     <dependency> -->
513
<!--       <groupId>org.unitils</groupId> -->
514
<!--       <artifactId>unitils-inject</artifactId> -->
515
<!--       <version>${unitils.version}</version> -->
516
<!--       <scope>test</scope> -->
517
<!--     </dependency> -->
518
<!--     <dependency> -->
519
<!--       <groupId>org.unitils</groupId> -->
520
<!--       <artifactId>unitils-orm</artifactId> -->
521
<!--       <version>${unitils.version}</version> -->
522
<!--        <scope>test</scope> -->
523
<!--       <exclusions> -->
524
<!--      <exclusion> -->
525
<!--        <artifactId>*</artifactId> -->
526
<!--        <groupId>org.springframework</groupId> -->
527
<!--      </exclusion> -->
528
<!--      <exclusion> -->
529
<!--        <artifactId>persistence-api</artifactId> -->
530
<!--        <groupId>javax.persistence</groupId> -->
531
<!--      </exclusion> -->
532
<!--      <exclusion> -->
533
<!--        <artifactId>hibernate</artifactId> -->
534
<!--        <groupId>org.hibernate</groupId> -->
535
<!--      </exclusion> -->
536
<!--    </exclusions> -->
537
<!--     </dependency>  -->
538
<!--     <dependency> -->
539
<!--       <groupId>org.unitils</groupId> -->
540
<!--       <artifactId>unitils-spring</artifactId> -->
541
<!--       <version>${unitils.version}</version> -->
542
<!--       <scope>test</scope> -->
543
<!--       <exclusions> -->
544
<!--         <exclusion> -->
545
<!--           <groupId>org.springframework</groupId> -->
546
<!--           <artifactId>spring-core</artifactId> -->
547
<!--         </exclusion> -->
548
<!--         <exclusion> -->
549
<!--           <groupId>org.springframework</groupId> -->
550
<!--           <artifactId>spring-context</artifactId> -->
551
<!--         </exclusion> -->
552
<!--         <exclusion> -->
553
<!--           <groupId>org.springframework</groupId> -->
554
<!--           <artifactId>spring-beans</artifactId> -->
555
<!--         </exclusion> -->
556
<!--         <exclusion> -->
557
<!--           <groupId>org.springframework</groupId> -->
558
<!--           <artifactId>spring-test</artifactId> -->
559
<!--         </exclusion> -->
560
<!--         <exclusion> -->
561
<!--           <groupId>org.springframework</groupId> -->
562
<!--           <artifactId>spring-tx</artifactId> -->
563
<!--         </exclusion> -->
564
<!--       </exclusions> -->
565
<!--     </dependency> -->
566
<!--     <dependency> -->
567
<!--       <groupId>org.easymock</groupId> -->
568
<!--       <artifactId>easymock</artifactId> -->
569
<!--       <version>3.1</version> -->
570
<!--       <scope>test</scope> -->
571
<!--     </dependency> -->
572
<!--     <dependency> -->
573
<!--       <groupId>xmlunit</groupId> -->
574
<!--       <artifactId>xmlunit</artifactId> -->
575
<!--       <version>1.4</version> -->
576
<!--       <scope>test</scope> -->
577
<!--     </dependency> -->
578
<!--     <dependency> -->
579
<!--       <groupId>org.dbunit</groupId> -->
580
<!--       <artifactId>dbunit</artifactId> -->
581
<!--       <version>2.4.9</version> -->
582
<!--       <scope>test</scope> -->
583
<!--     </dependency> -->
584
<!--     <dependency> -->
585
<!--       <groupId>commons-dbcp</groupId> -->
586
<!--       <artifactId>commons-dbcp</artifactId> -->
587
<!--       <version>1.4</version> -->
588
<!--       <scope>test</scope> -->
589
<!--     </dependency> -->
590
    <!-- unitils dependencies - end -->
591
    <dependency>
592
      <groupId>org.slf4j</groupId>
593
      <artifactId>slf4j-log4j12</artifactId>
594
      <version>1.7.2</version>
595
      <scope>provided</scope>
596
    </dependency>
597
    <dependency>
598
      <groupId>org.slf4j</groupId>
599
      <artifactId>slf4j-api</artifactId>
600
      <version>1.7.2</version>
601
      <scope>provided</scope>
602
    </dependency>
603
    <dependency>
604
		<groupId>org.json</groupId>
605
		<artifactId>json</artifactId>
606
		<version>20151123</version>
607
	</dependency>
608
    
609
  </dependencies>
611 610
</project>

Also available in: Unified diff