Project

General

Profile

Revision 1a15e525

ID1a15e5252240f5925ed0de04f361a6778abde4dd
Parent 43258c67
Child b3cc0ad1

Added by Andreas Kohlbecker about 8 years ago

reverting r16675 (reintegrating /branches/cdmlib/campanula with pom.xml modifications for maven 3 and fix for ticket #3148 termBase titleCache problems)

View differences:

pom.xml
217 217
    <build>
218 218
        <plugins>
219 219
            <plugin>
220
                <groupId>org.apache.maven.plugins</groupId>
221 220
                <artifactId>maven-compiler-plugin</artifactId>
222 221
                <configuration>
223 222
                    <source>${java.codelevel}</source>
224 223
                    <target>${java.codelevel}</target>
225
                    <encoding>UTF-8</encoding>
226 224
                </configuration>
227
                <version>2.3.2</version>
228 225
            </plugin>
229 226
            <plugin>
230
                <groupId>org.apache.maven.plugins</groupId>
231 227
                <artifactId>maven-surefire-plugin</artifactId>
232 228
                <configuration>
233 229
                    <argLine>-Xmx512M</argLine>
......
235 231
                        <include>**/*Test.java</include>
236 232
                    </includes>
237 233
                </configuration>
238
                <version>2.9</version>
239 234
            </plugin>
240 235
            <plugin>
241 236
                <groupId>org.codehaus.mojo</groupId>
......
259 254
            <plugin>
260 255
                <groupId>org.apache.maven.plugins</groupId>
261 256
                <artifactId>maven-site-plugin</artifactId>
262
                <version>3.0</version>
257
                <version>2.1.1</version>
263 258
                <configuration>
264 259
                    <locales>en</locales>
265
		    <outputEncoding>UTF-8</outputEncoding>
266 260
                </configuration>
267 261
            </plugin>
268 262
            <plugin>
......
302 296
            <plugin>
303 297
                <groupId>org.apache.maven.plugins</groupId>
304 298
                <artifactId>maven-eclipse-plugin</artifactId>
305
                <version>2.9</version>
299
                <version>2.8</version>
306 300
                <configuration>
307 301
                    <downloadSources>true</downloadSources>
308 302
                    <downloadJavadocs>true</downloadJavadocs>
......
621 615
                <version>1.1</version>
622 616
            </dependency>
623 617
            <dependency>
618
                <groupId>javax.xml.bind</groupId>
619
                <artifactId>jsr173_api</artifactId>
620
                <version>1.0</version>
621
            </dependency>
622
            <dependency>
624 623
                <groupId>com.sun.xml.bind</groupId>
625 624
                <artifactId>jaxb-impl</artifactId>
626 625
                <version>2.1.6</version>
......
1096 1095
                <artifactId>hibernate-c3p0</artifactId>
1097 1096
                <version>${hibernate.version}</version>
1098 1097
            </dependency>
1098
            <dependency>
1099
                <groupId>javax.servlet</groupId>
1100
                <artifactId>servlet-api</artifactId>
1101
                <version>2.5</version>
1102
            </dependency>
1099 1103
            <!-- ******* SPRING ******* -->
1100 1104
            <dependency>
1101 1105
                <groupId>org.springframework</groupId>
......
1168 1172
                <version>${spring.version}</version>
1169 1173
            </dependency>
1170 1174
            <dependency>
1175
                <groupId>org.springframework</groupId>
1176
                <artifactId>org.springframework.context.support</artifactId>
1177
                <version>${spring.version}</version>
1178
            </dependency>
1179
            <dependency>
1171 1180
                <groupId>org.springframework.security</groupId>
1172 1181
                <artifactId>spring-security-core</artifactId>
1173 1182
                <version>3.0.5.RELEASE</version>
......
1264 1273
                <artifactId>ojdbc14</artifactId>
1265 1274
                <version>10.2.0.2</version>
1266 1275
            </dependency>
1267
            <!--dependency>
1276
            <dependency>
1268 1277
                <groupId>oracle</groupId>
1269 1278
                <artifactId>ojdbc14</artifactId>
1270 1279
                <version>9i</version>
......
1273 1282
                <groupId>oracle</groupId>
1274 1283
                <artifactId>ojdbc14</artifactId>
1275 1284
                <version>9.2.0.5</version>
1276
            </dependency-->
1285
            </dependency>
1277 1286
            <dependency>
1278 1287
                <groupId>com.h2database</groupId>
1279 1288
                <artifactId>h2</artifactId>

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)