diff webapp/pom.xml @ 1660:75a74f7045b4

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
line wrap: on
line diff
--- a/webapp/pom.xml	Mon Jun 12 16:08:27 2017 +0200
+++ b/webapp/pom.xml	Tue Nov 21 15:18:31 2017 +0100
@@ -11,7 +11,7 @@
 	<artifactId>digilib-webapp</artifactId>
 	<name>digilib-webapp</name>
 	<description>The Digital Image Library - web application server and HTML and JS clients.</description>
-	<url>http://digilib.sourceforge.net</url>
+	<url>https://github.com/robcast/digilib</url>
 	<packaging>war</packaging>
 	
 	<properties>
@@ -192,6 +192,17 @@
                     </execution> -->
 				</executions>
 			</plugin>
+			<plugin>
+			    <!-- Jetty plugin for "mvn jetty:run" -->
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>9.2.22.v20170606</version>
+                <configuration>
+                    <webApp>
+                        <contextPath>/digilib</contextPath>
+                    </webApp>
+                </configuration>
+            </plugin>
 		</plugins>
 	</build>
 	<profiles>
@@ -386,13 +397,13 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-servlet</artifactId>
-            <version>9.2.13.v20150730</version>
+            <version>9.2.22.v20170606</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-http</artifactId>
-			<version>9.2.13.v20150730</version>
+			<version>9.2.22.v20170606</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>