Project

General

Profile

Revision 2638be38

ID2638be38d1f2f957820ca1906df2aa1795123eb2
Parent 398bcf3e
Child 69f17e7e

Added by Andreas Müller over 4 years ago

migrate to hibernate 5 for cdmlib-services and cdmlib-ext #4716

  • (except for hibernate search tests)
  • including new spring-config structure

View differences:

cdmlib-ext/pom.xml
25 25
  		<groupId>eu.etaxonomy</groupId>
26 26
  		<artifactId>cdmlib-services</artifactId>
27 27
  	</dependency>
28
  	<dependency>
29
  		<groupId>eu.etaxonomy</groupId>
30
  		<artifactId>cdmlib-persistence</artifactId>
31
  		<type>test-jar</type>
32
  		<scope>test</scope>
33
  		<version>${project.version}</version>
34
    </dependency>
35 28
    <dependency>
36
      <groupId>org.unitils</groupId>
37
      <artifactId>unitils-core</artifactId>
38
      <scope>test</scope>
39
    </dependency>
40
<!--     probably most unitis dependencies can be deleted from here -->
41
    <dependency>
42
      <groupId>org.unitils</groupId>
43
      <artifactId>unitils-database</artifactId>
44
      <exclusions>
45
      	<exclusion>
46
      		<groupId>commons-dbcp</groupId>
47
      		<artifactId>commons-dbcp</artifactId>
48
      	</exclusion>
49
      </exclusions>
50
      <scope>test</scope>
51
    </dependency>
52
    <dependency>
53
      <groupId>org.unitils</groupId>
54
      <artifactId>unitils-dbmaintainer</artifactId>
55
      <scope>test</scope>
56
    </dependency>
57
    <dependency>
58
      <groupId>org.unitils</groupId>
59
      <artifactId>unitils-dbunit</artifactId>
60
      <scope>test</scope>
61
    </dependency>
62
     <dependency>
63
      <groupId>org.unitils</groupId>
64
      <artifactId>unitils-easymock</artifactId>
65
      <scope>test</scope>
29
        <groupId>eu.etaxonomy</groupId>
30
        <artifactId>cdmlib-test</artifactId>
31
        <scope>test</scope>
32
        <version>${project.version}</version>
66 33
    </dependency>
67
    <dependency>
68
      <groupId>org.unitils</groupId>
69
      <artifactId>unitils-mock</artifactId>
70
      <scope>test</scope>
71
    </dependency>
72
    <dependency>
73
      <groupId>org.unitils</groupId>
74
      <artifactId>unitils-inject</artifactId>
75
      <scope>test</scope>
76
    </dependency>
77
     <dependency>
78
      <groupId>org.unitils</groupId>
79
      <artifactId>unitils-spring</artifactId>
80
      <scope>test</scope>
81
    </dependency>
82
    <dependency>
83
      <groupId>org.dbunit</groupId>
84
      <artifactId>dbunit</artifactId>
85
    </dependency> 
86
    <dependency>
87
      <groupId>xmlunit</groupId>
88
      <artifactId>xmlunit</artifactId>
89
  	</dependency>
34
<!--   	<dependency> -->
35
<!--   		<groupId>eu.etaxonomy</groupId> -->
36
<!--   		<artifactId>cdmlib-persistence</artifactId> -->
37
<!--   		<type>test-jar</type> -->
38
<!--   		<scope>test</scope> -->
39
<!--   		<version>${project.version}</version> -->
40
<!--     </dependency> -->
41
<!--     <dependency> -->
42
<!--       <groupId>org.unitils</groupId> -->
43
<!--       <artifactId>unitils-core</artifactId> -->
44
<!--       <scope>test</scope> -->
45
<!--     </dependency> -->
46
<!--     probably most unitils dependencies can be deleted from here -->
47
<!--     <dependency> -->
48
<!--       <groupId>org.unitils</groupId> -->
49
<!--       <artifactId>unitils-database</artifactId> -->
50
<!--       <exclusions> -->
51
<!--       	<exclusion> -->
52
<!--       		<groupId>commons-dbcp</groupId> -->
53
<!--       		<artifactId>commons-dbcp</artifactId> -->
54
<!--       	</exclusion> -->
55
<!--       </exclusions> -->
56
<!--       <scope>test</scope> -->
57
<!--     </dependency> -->
58
<!--     <dependency> -->
59
<!--       <groupId>org.unitils</groupId> -->
60
<!--       <artifactId>unitils-dbmaintainer</artifactId> -->
61
<!--       <scope>test</scope> -->
62
<!--     </dependency> -->
63
<!--     <dependency> -->
64
<!--       <groupId>org.unitils</groupId> -->
65
<!--       <artifactId>unitils-dbunit</artifactId> -->
66
<!--       <scope>test</scope> -->
67
<!--     </dependency> -->
68
<!--      <dependency> -->
69
<!--       <groupId>org.unitils</groupId> -->
70
<!--       <artifactId>unitils-easymock</artifactId> -->
71
<!--       <scope>test</scope> -->
72
<!--     </dependency> -->
73
<!--     <dependency> -->
74
<!--       <groupId>org.unitils</groupId> -->
75
<!--       <artifactId>unitils-mock</artifactId> -->
76
<!--       <scope>test</scope> -->
77
<!--     </dependency> -->
78
<!--     <dependency> -->
79
<!--       <groupId>org.unitils</groupId> -->
80
<!--       <artifactId>unitils-inject</artifactId> -->
81
<!--       <scope>test</scope> -->
82
<!--     </dependency> -->
83
<!--      <dependency> -->
84
<!--       <groupId>org.unitils</groupId> -->
85
<!--       <artifactId>unitils-spring</artifactId> -->
86
<!--       <scope>test</scope> -->
87
<!--     </dependency> -->
88
<!--     <dependency> -->
89
<!--       <groupId>org.dbunit</groupId> -->
90
<!--       <artifactId>dbunit</artifactId> -->
91
<!--     </dependency>  -->
92
<!--     <dependency> -->
93
<!--       <groupId>xmlunit</groupId> -->
94
<!--       <artifactId>xmlunit</artifactId> -->
95
<!--   	</dependency> -->
90 96

  
91 97
    <dependency>
92 98
	    <groupId>org.apache.httpcomponents</groupId>
......
94 100
	</dependency>
95 101
	<dependency>
96 102
        <groupId>net.sf.json-lib</groupId>
97
                <artifactId>json-lib</artifactId>
98
				<classifier>jdk15</classifier>
103
        <artifactId>json-lib</artifactId>
104
		<classifier>jdk15</classifier>
99 105
    </dependency>
100 106
    <dependency>
101 107
        <groupId>com.fasterxml.jackson.core</groupId>

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)