Revision 2e47e11d
Added by Andreas Müller almost 2 years ago
| cdmlib-persistence/pom.xml | ||
|---|---|---|
| 90 | 90 |
</dependency> |
| 91 | 91 |
<dependency> |
| 92 | 92 |
<!-- used for class LocalH2 (base class is from commons-dbcp) --> |
| 93 |
<!-- TODO we should try to remove this dependency --> |
|
| 93 | 94 |
<groupId>commons-dbcp</groupId> |
| 94 | 95 |
<artifactId>commons-dbcp</artifactId> |
| 95 | 96 |
</dependency> |
| pom.xml | ||
|---|---|---|
| 23 | 23 |
<module>cdmlib-remote</module> |
| 24 | 24 |
<module>cdmlib-print</module> |
| 25 | 25 |
<module>cdmlib-remote-webapp</module> |
| 26 |
|
|
| 27 | 26 |
</modules> |
| 28 | 27 |
<properties> |
| 29 | 28 |
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
| ... | ... | |
| 738 | 737 |
<groupId>org.unitils</groupId> |
| 739 | 738 |
<artifactId>unitils-database</artifactId> |
| 740 | 739 |
<version>${unitils.version}</version>
|
| 741 |
<!-- <scope>test</scope> -->
|
|
| 740 |
<scope>test</scope>
|
|
| 742 | 741 |
<exclusions> |
| 743 | 742 |
<exclusion> |
| 744 | 743 |
<groupId>org.springframework</groupId> |
| ... | ... | |
| 825 | 824 |
higher number needed for compatibility with current hibernate and Java 1.6 |
| 826 | 825 |
PreparedStatement --> |
| 827 | 826 |
<dependency> |
| 827 |
<!-- currently still needed by cdmlib-persistence, once removed, scope should be set to test --> |
|
| 828 | 828 |
<groupId>commons-dbcp</groupId> |
| 829 | 829 |
<artifactId>commons-dbcp</artifactId> |
| 830 | 830 |
<version>1.4</version> |
| 831 | 831 |
<!-- <scope>test</scope> --> |
| 832 |
</dependency> |
|
| 833 |
<dependency> |
|
| 834 |
<!-- currently still needed by cdmlib-persistence commons-dbcp dependency, once removed, scope should be set to test --> |
|
| 835 |
<groupId>commons-pool</groupId> |
|
| 836 |
<artifactId>commons-pool</artifactId> |
|
| 837 |
<version>1.6</version> |
|
| 838 |
<!-- <scope>test</scope> --> |
|
| 832 | 839 |
</dependency> |
| 833 | 840 |
<dependency> |
| 834 | 841 |
<groupId>eu.etaxonomy</groupId> |
| 835 | 842 |
<artifactId>cdmlib-test</artifactId> |
| 836 |
<!-- <scope>test</scope> -->
|
|
| 843 |
<scope>test</scope>
|
|
| 837 | 844 |
<version>${project.version}</version>
|
| 838 | 845 |
</dependency> |
| 839 | 846 |
<dependency> |
Also available in: Unified diff
ref #9359 add version number for commons-pool to avoid multiple versions in cdmserver comming from remote-webapp and vaadin (though unclear why vaadin retrieves a higher version)