Project

General

Profile

« Previous | Next » 

Revision 9d39f227

Added by Andreas Müller almost 8 years ago

Cleanup poms in cdmlib-app

View differences:

cdmapps-parent/pom.xml
3 3
    <modelVersion>4.0.0</modelVersion>
4 4
    <groupId>eu.etaxonomy.cdm</groupId>
5 5
    <artifactId>app-parent</artifactId>
6
	<version>3.5.1-SNAPSHOT</version>
6
	<version>4.2.0-SNAPSHOT</version>
7 7
    <name>CDM Applications Parent</name>
8 8
    <description>The Java implementation of the Common Data Model (CDM), the data model for EDIT's internet platform for cybertaxonomy.</description>
9 9
    <url>http://wp5.e-taxonomy.eu/cdmlib/</url>
......
21 21
        <module>cdmlib-remote-webapp</module>
22 22
    </modules>
23 23
    <properties>
24
		<java.codelevel>1.6</java.codelevel>
24
		<java.codelevel>1.7</java.codelevel>
25 25
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
26 26
    </properties>
27 27
    <licenses>
......
197 197
                    <downloadJavadocs>true</downloadJavadocs>
198 198
                </configuration>
199 199
            </plugin>
200
            <plugin>
201
                <groupId>com.agilejava.docbkx</groupId>
202
                <artifactId>docbkx-maven-plugin</artifactId>
203
                <version>2.0.9</version>
204
                <executions>
205
                    <execution>
206
                        <goals>
207
                            <goal>generate-html</goal>
208
                            <goal>generate-pdf</goal>
209
                        </goals>
210
                        <phase>pre-site</phase>
211
                    </execution>
212
                </executions>
213
                <dependencies>
214
                    <dependency>
215
                        <groupId>org.docbook</groupId>
216
                        <artifactId>docbook-xml</artifactId>
217
                        <version>4.4</version>
218
                        <scope>runtime</scope>
219
                    </dependency>
220
                </dependencies>
221
                <configuration>
222
                    <includes>ReferenceDocumentation.xml</includes>
223
                    <chunkedOutput>true</chunkedOutput>
224
                    <htmlStylesheet>resources/css/html.css</htmlStylesheet>
225
                    <xincludeSupported>true</xincludeSupported>
226
                    <!--<htmlCustomization>src/docbkx/resources/xsl/html_chunk.xsl</htmlCustomization>-->
227
                    <!-- if anyone can get the xsl-fo customization to work properly, then by all
228
                        means use it
229
                        <foCustomization>src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
230
                    -->
231
                    <entities>
232
                        <entity>
233
                            <name>version</name>
234
                            <value>${project.version}</value>
235
                        </entity>
236
                    </entities>
237
                    <!--We want the final documentation and the required resources to end up in
238
              the right place-->
239
                    <postProcess>
240
                        <copy todir="target/site/reference">
241
                            <fileset dir="target/docbkx">
242
                                <include name="**/*.html" />
243
                                <include name="**/*.pdf" />
244
                            </fileset>
245
                        </copy>
246
                        <copy todir="target/site/reference/html">
247
                            <fileset dir="src/docbkx">
248
                                <include name="**/*.css" />
249
                                <include name="**/*.png" />
250
                                <include name="**/*.gif" />
251
                                <include name="**/*.jpg" />
252
                            </fileset>
253
                        </copy>
254
                    </postProcess>
255
                </configuration>
256
            </plugin>
257 200
            <plugin>
258 201
                <groupId>org.codehaus.mojo</groupId>
259 202
                <artifactId>wagon-maven-plugin</artifactId>
......
279 222
		</plugins>
280 223
	</build>
281 224
    <!-- **** DEPENDENCIES **** -->
282
 <!--  <dependencies>
283
        <dependency>
284
            <groupId>junit</groupId>
285
            <artifactId>junit</artifactId>
286
        </dependency>
287
        <dependency>
288
            <groupId>log4j</groupId>
289
            <artifactId>log4j</artifactId>
290
        </dependency>
291
    </dependencies>  -->
225

  
292 226
    <dependencyManagement>
293 227
        <dependencies>
294 228
            <dependency>
pom.xml
36 36
	<dependencies>
37 37
		<dependency>
38 38
			<groupId>eu.etaxonomy</groupId>
39
			<artifactId>cdmlib-persistence</artifactId>
39
			<artifactId>cdmlib-test</artifactId>
40 40
			<type>test-jar</type>
41 41
			<scope>test</scope>
42 42
			<version>${project.version}</version>
43 43
		</dependency>
44 44
		<dependency>
45 45
			<groupId>eu.etaxonomy</groupId>
46
			<artifactId>cdmlib-ext</artifactId>
47
		</dependency>
48
		<dependency>
49
			<groupId>org.unitils</groupId>
50
			<artifactId>unitils-core</artifactId>
51
			<scope>test</scope>
52
		</dependency>
53
		<dependency>
54
			<groupId>org.unitils</groupId>
55
			<artifactId>unitils-database</artifactId>
56
			<exclusions>
57
				<exclusion>
58
					<groupId>commons-dbcp</groupId>
59
					<artifactId>commons-dbcp</artifactId>
60
				</exclusion>
61
			</exclusions>
62
			<scope>test</scope>
63
		</dependency>
64
		<dependency>
65
			<groupId>org.unitils</groupId>
66
			<artifactId>unitils-dbmaintainer</artifactId>
67
			<scope>test</scope>
68
		</dependency>
69
		<dependency>
70
			<groupId>org.unitils</groupId>
71
			<artifactId>unitils-dbunit</artifactId>
72
			<scope>test</scope>
73
		</dependency>
74
		<dependency>
75
			<groupId>org.unitils</groupId>
76
			<artifactId>unitils-easymock</artifactId>
77
			<scope>test</scope>
78
		</dependency>
79
		<dependency>
80
			<groupId>org.unitils</groupId>
81
			<artifactId>unitils-mock</artifactId>
82
			<scope>test</scope>
83
		</dependency>
84
		<dependency>
85
			<groupId>org.unitils</groupId>
86
			<artifactId>unitils-inject</artifactId>
87
			<scope>test</scope>
88
		</dependency>
89
		<dependency>
90
			<groupId>org.unitils</groupId>
91
			<artifactId>unitils-orm</artifactId>
92
			<exclusions>
93
				<exclusion>
94
					<groupId>javax.persistence</groupId>
95
					<artifactId>persistence-api</artifactId>
96
				</exclusion>
97
			</exclusions>
98
			<scope>test</scope>
99
		</dependency>
100
		<dependency>
101
			<groupId>org.unitils</groupId>
102
			<artifactId>unitils-spring</artifactId>
103
			<scope>test</scope>
104
		</dependency>
105
		<dependency>
106
			<groupId>org.dbunit</groupId>
107
			<artifactId>dbunit</artifactId>
108
		</dependency>
109
		<dependency>
110
			<groupId>com.carrotsearch</groupId>
111
			<artifactId>junit-benchmarks</artifactId>
112
			<scope>test</scope>
113
		</dependency>
114
		<dependency>
115
			<groupId>xmlunit</groupId>
116
			<artifactId>xmlunit</artifactId>
117
		</dependency>
118
		<dependency>
119
			<groupId>org.apache.poi</groupId>
120
			<artifactId>poi</artifactId>
121
		</dependency>
122
		<dependency>
123
			<groupId>org.springframework</groupId>
124
			<artifactId>org.springframework.oxm</artifactId>
46
			<artifactId>cdmlib-io</artifactId>
125 47
		</dependency>
126 48
		<dependency>
127 49
			<groupId>identificationKeyAPI</groupId>

Also available in: Unified diff