Mercurial > hg > digilib

comparison webapp/pom.xml @ 1660:75a74f7045b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'master' into release-2.5 Conflicts: common/src/main/java/digilib/conf/DigilibConfiguration.java
author Robert Casties <r0bcas7@gmail.com>
date Tue, 21 Nov 2017 15:18:31 +0100
parents 392a149ed4d6 28df291d4e26
children cf9dcddf4ec6
comparison
equal deleted inserted replaced
1638:dc440131299b 1660:75a74f7045b4
9 <version>2.5.3</version> 9 <version>2.5.3</version>
10 </parent> 10 </parent>
11 <artifactId>digilib-webapp</artifactId> 11 <artifactId>digilib-webapp</artifactId>
12 <name>digilib-webapp</name> 12 <name>digilib-webapp</name>
13 <description>The Digital Image Library - web application server and HTML and JS clients.</description> 13 <description>The Digital Image Library - web application server and HTML and JS clients.</description>
14 <url>http://digilib.sourceforge.net</url> 14 <url>https://github.com/robcast/digilib</url>
15 <packaging>war</packaging> 15 <packaging>war</packaging>
16 16
17 <properties> 17 <properties>
18 <skipTests>true</skipTests> 18 <skipTests>true</skipTests>
19 <servletapi>3</servletapi> 19 <servletapi>3</servletapi>
190 <goal>minify</goal> 190 <goal>minify</goal>
191 </goals> 191 </goals>
192 </execution> --> 192 </execution> -->
193 </executions> 193 </executions>
194 </plugin> 194 </plugin>
195 <plugin>
196 <!-- Jetty plugin for "mvn jetty:run" -->
197 <groupId>org.eclipse.jetty</groupId>
198 <artifactId>jetty-maven-plugin</artifactId>
199 <version>9.2.22.v20170606</version>
200 <configuration>
201 <webApp>
202 <contextPath>/digilib</contextPath>
203 </webApp>
204 </configuration>
205 </plugin>
195 </plugins> 206 </plugins>
196 </build> 207 </build>
197 <profiles> 208 <profiles>
198 <profile> 209 <profile>
199 <id>servlet2</id> 210 <id>servlet2</id>
384 </profiles> 395 </profiles>
385 <dependencies> 396 <dependencies>
386 <dependency> 397 <dependency>
387 <groupId>org.eclipse.jetty</groupId> 398 <groupId>org.eclipse.jetty</groupId>
388 <artifactId>jetty-servlet</artifactId> 399 <artifactId>jetty-servlet</artifactId>
389 <version>9.2.13.v20150730</version> 400 <version>9.2.22.v20170606</version>
390 <scope>test</scope> 401 <scope>test</scope>
391 </dependency> 402 </dependency>
392 <dependency> 403 <dependency>
393 <groupId>org.eclipse.jetty</groupId> 404 <groupId>org.eclipse.jetty</groupId>
394 <artifactId>jetty-http</artifactId> 405 <artifactId>jetty-http</artifactId>
395 <version>9.2.13.v20150730</version> 406 <version>9.2.22.v20170606</version>
396 <scope>test</scope> 407 <scope>test</scope>
397 </dependency> 408 </dependency>
398 <dependency> 409 <dependency>
399 <groupId>junit</groupId> 410 <groupId>junit</groupId>
400 <artifactId>junit</artifactId> 411 <artifactId>junit</artifactId>