Project

General

Profile

« Previous | Next » 

Revision ab7b3cd1

Added by Andreas Kohlbecker over 7 years ago

fixing dependency management problems

  • letting versions be managed through cdmlib-parent
  • depending project on cdmlib-remote
  • removing classes cloned from cdmlib-remote
  • removing obsolete version definitions and dependency overrides

View differences:

pom.xml
13 13
    <vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
14 14
    <cdmlib.version>4.4.0-SNAPSHOT</cdmlib.version>
15 15
    <unitils.version>3.4.2</unitils.version>
16
    <spring.version>4.2.4.RELEASE</spring.version>
17 16
    <!-- 
18 17
        lucene.version must match the version as defined in cdmlib
19 18
    -->
......
71 70
      </snapshots>
72 71
    </pluginRepository>
73 72
  </pluginRepositories>
74
  
73

  
75 74
  <dependencyManagement>
76
        <dependencies>
77
            <dependency>
78
                <groupId>com.vaadin</groupId>
79
                <artifactId>vaadin-bom</artifactId>
80
                <version>${vaadin.version}</version>
81
                <type>pom</type>
82
                <scope>import</scope>
83
            </dependency>
84
        </dependencies>
85
    </dependencyManagement>
75
    <dependencies>
76
      <dependency>
77
        <groupId>com.vaadin</groupId>
78
        <artifactId>vaadin-bom</artifactId>
79
        <version>${vaadin.version}</version>
80
        <type>pom</type>
81
        <scope>import</scope>
82
      </dependency>
83
      <dependency>
84
        <groupId>eu.etaxonomy</groupId>
85
        <artifactId>cdmlib-parent</artifactId>
86
        <version>${cdmlib.version}</version>
87
        <type>pom</type>
88
        <scope>import</scope>
89
      </dependency>
90
    </dependencies>
91
  </dependencyManagement>
86 92
  
87 93
  <distributionManagement>
88 94
    <repository>
......
93 99
      <layout>default</layout>
94 100
    </repository>
95 101
  </distributionManagement>
102
  
96 103
  <profiles>
97 104
    <profile>
98 105
      <activation>
......
125 132
      </build>
126 133
    </profile>
127 134
  </profiles>
135
  
128 136
  <build>
129 137
    <resources>
130 138
      <resource>
......
373 381
      </plugins>
374 382
    </pluginManagement>
375 383
  </build>
384
  
376 385
  <dependencies>
386
   <!-- ============ Vaadin ============ -->
377 387
    <dependency>
378 388
      <groupId>com.vaadin</groupId>
379 389
      <artifactId>vaadin-server</artifactId>
380
      <version>${vaadin.version}</version>
381 390
    </dependency>
382 391
    <dependency>
383 392
      <groupId>com.vaadin</groupId>
384 393
      <artifactId>vaadin-client-compiled</artifactId>
385
      <version>${vaadin.version}</version>
386 394
    </dependency>
387 395
    <!-- Needed when using the widgetset optimizer (custom ConnectorBundleLoaderFactory). 
388 396
      For widgetset compilation, vaadin-client-compiler is automatically added 
......
393 401
    <dependency>
394 402
      <groupId>com.vaadin</groupId>
395 403
      <artifactId>vaadin-client</artifactId>
396
      <version>${vaadin.version}</version>
397 404
      <scope>test</scope>
398 405
    </dependency>
399 406
    <!-- disabling push for the moment because it does not work with run-jetty-run 
......
409 416
    <dependency>
410 417
      <groupId>com.vaadin</groupId>
411 418
      <artifactId>vaadin-themes</artifactId>
412
      <version>${vaadin.version}</version>
413
    </dependency>
414
    <dependency>
415
      <groupId>javax.servlet</groupId>
416
      <artifactId>javax.servlet-api</artifactId>
417
      <version>3.1.0</version>
418
      <scope>provided</scope>
419 419
    </dependency>
420 420
    <dependency>
421 421
      <groupId>com.vaadin</groupId>
......
423 423
      <version>RELEASE</version>
424 424
      <scope>test</scope>
425 425
    </dependency>
426
    <!-- vaadin addons / extensions -->
427
    <dependency>
428
      <groupId>org.vaadin.addons</groupId>
429
      <artifactId>contextmenu</artifactId>
430
      <version>4.5</version>
431
    </dependency>
432
    <!-- ============ cdmlib ============ -->
426 433
    <dependency>
427 434
      <groupId>eu.etaxonomy</groupId>
428
      <artifactId>cdmlib-services</artifactId>
429
      <version>${cdmlib.version}</version>
435
      <artifactId>cdmlib-remote</artifactId>
430 436
      <scope>compile</scope>
431 437
    </dependency>    
432 438
    <dependency>
433 439
      <groupId>eu.etaxonomy</groupId>
434 440
      <artifactId>cdmlib-test</artifactId>
435
      <version>${cdmlib.version}</version>
436 441
      <scope>test</scope>
437 442
    </dependency>
438 443
    <dependency>
......
441 446
      <version>${cdmlib.version}</version>
442 447
      <scope>test</scope>
443 448
    </dependency>
444
    <dependency>
445
      <!-- adding itextpdf is required to fix dependency problems: itextpdf 
446
        is an managed transitive dependency of cdmlib-io without adding it here mvn 
447
        fails. Ev. this should be fixed by changing its scope in cdmlib-io to the 
448
        default scope -->
449
      <groupId>com.itextpdf</groupId>
450
      <artifactId>itextpdf</artifactId>
451
      <version>5.5.8</version>
452
      <scope>test</scope>
453
    </dependency>
454
    <!-- to override version number coming with vaadin client -->
449
    <!-- ============ Other ============ -->
450
    <!-- 
451
        to override version number coming with vaadin client 
452
        version is managed in cdmlib-parent
453
    -->
455 454
    <dependency>
456 455
      <groupId>javax.validation</groupId>
457 456
      <artifactId>validation-api</artifactId>
458
      <version>1.1.0.Final</version>
459 457
    </dependency>
460 458
    <dependency>
461 459
      <groupId>org.springmodules</groupId>
......
473 471
      </exclusions>
474 472
      <scope>test</scope>
475 473
    </dependency>
476
    <dependency>
477
      <groupId>com.thoughtworks.xstream</groupId>
478
      <artifactId>xstream</artifactId>
479
      <version>1.4.7</version>
480
      <scope>test</scope>
481
    </dependency>
482
    <dependency>
483
        <!-- 
484
            provides the spring-tx-4.0.xsd which is otherwise missing and 
485
            breaking the dev environment when offline 
486
        -->
487
        <groupId>org.springframework</groupId>
488
        <artifactId>spring-tx</artifactId>
489
        <version>${spring.version}</version>
490
        <scope>test</scope>
491
    </dependency>
492 474
    <dependency>
493 475
      <groupId>org.springframework</groupId>
494 476
      <artifactId>spring-mock</artifactId>
......
496 478
      <scope>test</scope>
497 479
    </dependency>
498 480
    <dependency>
499
      <groupId>org.springframework</groupId>
500
      <artifactId>spring-context-support</artifactId>
501
      <version>${spring.version}</version>
502
      <scope>test</scope>
503
    </dependency>
504
    <dependency>
505
      <groupId>org.springframework</groupId>
506
      <artifactId>spring-web</artifactId>
507
      <version>${spring.version}</version>
508
    </dependency>
509
    <dependency>
510
      <groupId>org.springframework</groupId>
511
      <artifactId>spring-webmvc</artifactId>
512
      <version>${spring.version}</version>
513
    </dependency>
514
    <!-- vaadin addons / extensions -->
515
    <dependency>
516
      <groupId>org.vaadin.addons</groupId>
517
      <artifactId>contextmenu</artifactId>
518
      <version>4.5</version>
519
    </dependency>
520
    <dependency>
521
      <groupId>org.slf4j</groupId>
522
      <artifactId>slf4j-log4j12</artifactId>
523
      <version>1.7.2</version>
524
      <scope>test</scope>
525
    </dependency>
526
    <dependency>
527
      <groupId>org.slf4j</groupId>
528
      <artifactId>slf4j-api</artifactId>
529
      <version>1.7.2</version>
530
      <scope>test</scope>
531
    </dependency>
532
    <dependency>
481
      <!-- Try updating in cdmlib to 20090211 -->
533 482
      <groupId>org.json</groupId>
534 483
      <artifactId>json</artifactId>
535 484
      <version>20151123</version>
536 485
    </dependency>
537
    <!-- 
538
        Need to manage the versions of these lucene artifacts
539
        as hibernate-search otherwise brings incompatible versions
540
    -->
541
    <dependency>
542
      <groupId>org.apache.lucene</groupId>
543
      <artifactId>lucene-backward-codecs</artifactId>
544
      <version>${lucene.version}</version>
545
    </dependency>
546 486
    <dependency>
547
      <groupId>org.apache.lucene</groupId>
548
      <artifactId>lucene-facet</artifactId>
549
      <version>${lucene.version}</version>
487
      <groupId>javax.servlet</groupId>
488
      <artifactId>javax.servlet-api</artifactId>
489
      <scope>provided</scope>
550 490
    </dependency>
551 491
  </dependencies>
552 492
</project>

Also available in: Unified diff