Project

General

Profile

« Previous | Next » 

Revision 9306fdac

Added by Andreas Müller over 3 years ago

ref #4866, ref #9228 preliminary revert moving h2, postgresql and mysql from cdmlib to local and include mchange-commons-java in cdmlib

View differences:

eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
577 577
 lib/commons-pool-1.6.jar,
578 578
 lib/ehcache-2.10.6.jar,
579 579
 lib/ezmorph-1.0.6.jar,
580
 lib/h2-1.4.190.jar,
580 581
 lib/hamcrest-core-1.3.jar,
581 582
 lib/hibernate-commons-annotations-5.1.0.Final.jar,
582 583
 lib/hibernate-core-5.1.17.Final.jar,
......
635 636
 lib/poi-4.1.2.jar,
636 637
 lib/poi-ooxml-4.1.2.jar,
637 638
 lib/poi-ooxml-schemas-4.1.2.jar,
638
  lib/lucene-core-5.4.1.jar,
639
 lib/postgresql-42.2.18.jar,
640
 lib/lucene-core-5.4.1.jar,
639 641
 lib/lucene-queryparser-5.4.1.jar,
640 642
 lib/lucene-analyzers-3.6.2.jar,
641 643
 lib/lucene-analyzers-common-5.4.1.jar,
......
650 652
 lib/JavaAPIforKml-2.2.1.jar,
651 653
 lib/c3p0-0.9.5.2.jar,
652 654
 lib/iiif-apis-0.3.7.jar,
653
 lib/jboss-transaction-api_1.2_spec-1.1.1.Final.jar
655
 lib/jboss-transaction-api_1.2_spec-1.1.1.Final.jar,
656
 lib/mysql-connector-java-8.0.21.jar
654 657
Comment: currently excluded - 
655 658
 lib/activation-1.1.1.jar,
656 659
 lib/avro-1.6.3.jar,
eu.etaxonomy.taxeditor.cdmlib/build.properties
21 21
               lib/commons-pool-1.6.jar,\
22 22
               lib/ehcache-2.10.6.jar,\
23 23
               lib/ezmorph-1.0.6.jar,\
24
               lib/h2-1.4.190.jar,\
24 25
               lib/hibernate-commons-annotations-5.1.0.Final.jar,\
25 26
               lib/hibernate-core-5.1.17.Final.jar,\
26 27
               lib/hibernate-entitymanager-5.1.17.Final.jar,\
......
81 82
               lib/poi-4.1.2.jar,\
82 83
               lib/poi-ooxml-4.1.2.jar,\
83 84
               lib/poi-ooxml-schemas-4.1.2.jar,\
85
               lib/postgresql-42.2.18.jar,\
84 86
               lib/lucene-core-5.4.1.jar,\
85 87
               lib/lucene-queryparser-5.4.1.jar,\
86 88
               lib/lucene-analyzers-3.6.2.jar,\
......
91 93
               lib/org.swtchart_0.10.0.v20160212.jar,\
92 94
               lib/commons-collections4-4.4.jar,\
93 95
               lib/commons-math3-3.6.1.jar,\
96
               lib/mysql-connector-java-8.0.21.jar,\
94 97
               lib/JavaAPIforKml-2.2.1.jar,\
95 98
               lib/iiif-apis-0.3.7.jar,\
96 99
               lib/c3p0-0.9.5.2.jar,\
eu.etaxonomy.taxeditor.cdmlib/pom.xml
74 74
                poi,poi-ooxml,poi-ooxml-schemas,xmlbeans,commons-collections4,commons-math3,
75 75
                c3p0,opencsv,joda-time,usertype.jodatime,usertype.spi,
76 76
                apache-log4j-extras,
77
                h2,mysql-connector-java,postgresql,
77 78
                junit,hamcrest-core,commons-dbcp,commons-pool,
78 79
                jboss-transaction-api_1.2_spec
79 80
              </includeArtifactIds>
......
424 425
        <artifactId>commons-lang</artifactId>
425 426
        <version>2.6</version>
426 427
    </dependency>
427
    <dependency>
428
        <!-- maybe only needed for tests, but does not work to only have there -->
429
        <groupId>com.mchange</groupId>
430
        <artifactId>c3p0</artifactId>
431
        <version>0.9.5.2</version>
432
<!--         <scope>test</scope> -->
433
    </dependency>
434 428
    
435 429
    <!-- jackson, not sure if really needed -->
436 430
    <dependency>
......
572 566
        <version>1.15</version>
573 567
    </dependency>
574 568

  
575
    <!-- only for supporting test button in datasource dialogue, dialogue should be moved to taxeditor.webapp -->
576
	<dependency>
577
	    <groupId>com.h2database</groupId>
578
	    <artifactId>h2</artifactId>
579
	    <version>1.4.190</version>
580
	</dependency>
581
      
582 569
    <!-- For Unit Tests Start -->
583 570
	<!-- keep junit and its dependency hamcrest here as long as each plugin
584 571
	     has its own unit tests and they junit is not yet added there in a way
......
665 652
        <artifactId>iiif-apis</artifactId>
666 653
        <version>0.3.7</version>
667 654
    </dependency>
655
    
656
    <!-- database related, should be moved to local/test when possible -->
657
    <!-- only for supporting test button in datasource dialogue, dialogue should be moved to taxeditor.webapp -->
658
    <dependency>
659
      <groupId>mysql</groupId>
660
      <artifactId>mysql-connector-java</artifactId>
661
      <version>8.0.21</version>
662
    </dependency>
663
	<dependency>
664
	    <groupId>com.h2database</groupId>
665
	    <artifactId>h2</artifactId>
666
	    <version>1.4.190</version>
667
	</dependency>
668
    <dependency>
669
        <groupId>org.postgresql</groupId>
670
        <artifactId>postgresql</artifactId>
671
        <version>42.2.15</version>
672
    </dependency>
673
    
674
    <dependency>
675
        <!-- probably only needed for tests, but does not work to only have there -->
676
        <groupId>com.mchange</groupId>
677
        <artifactId>c3p0</artifactId>
678
        <version>0.9.5.2</version>
679
		<!--  <scope>test</scope> -->
680
    </dependency>
681
    <dependency>
682
        <groupId>com.mchange</groupId>
683
        <artifactId>mchange-commons-java</artifactId>
684
        <!-- mchange-commons-java needs to match the version as defined in the c3p0/pom.xml -->
685
        <version>0.2.11</version>
686
      </dependency>
668 687
  </dependencies>
669 688
</project>
670 689

  

Also available in: Unified diff