diff webapp/pom.xml @ 1453:e7d94cfbec0b release-2.3

Merge from default branch 9429bb9c3a4239e133b878a464d802bc8984ae60
author robcast
date Fri, 13 Nov 2015 13:09:08 +0100
parents 2a248500ede2 fa63f437d5c5
children 02252febba09
line wrap: on
line diff
--- a/webapp/pom.xml	Tue Nov 10 14:41:27 2015 +0100
+++ b/webapp/pom.xml	Fri Nov 13 13:09:08 2015 +0100
@@ -11,6 +11,10 @@
 	<description>The Digital Image Library - web application server and HTML and JS clients.</description>
 	<url>http://digilib.sourceforge.net</url>
 	<packaging>war</packaging>
+	
+	<properties>
+        <skipTests>true</skipTests>
+    </properties>
 
 	<build>
 		<pluginManagement>
@@ -31,7 +35,15 @@
 						</includes>
 					</configuration>
 				</plugin>
-			</plugins>
+		        <plugin>
+			        <groupId>org.apache.maven.plugins</groupId>
+			        <artifactId>maven-surefire-plugin</artifactId>
+			        <version>2.19</version>
+			        <configuration>
+			            <skip>${skipTests}</skip>
+			        </configuration>
+			    </plugin>
+        	</plugins>
 		</pluginManagement>
 	</build>
 	<profiles>
@@ -157,5 +169,39 @@
 				</dependency>
 			</dependencies>
 		</profile>
+        <profile>
+            <id>cors-filter</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <!--  external servlet filter to add CORS headers -->
+            <dependencies>
+                <dependency>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-servlets</artifactId>
+                    <version>9.2.13.v20150730</version>
+                </dependency>
+            </dependencies>
+        </profile>
 	</profiles>
+	<dependencies>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-servlet</artifactId>
+            <version>9.2.13.v20150730</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-http</artifactId>
+			<version>9.2.13.v20150730</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 </project>