From 998b00fd388081ca771486eac468b83942c1f59e Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mitre.org>
Date: Tue, 24 Sep 2013 14:14:42 -0400
Subject: [PATCH] moved repo references to parent, added dependencies for
 webapp

---
 openid-connect-common/pom.xml        | 15 ------
 openid-connect-server-webapp/pom.xml | 69 ++++++++++++++++++++++++++++
 pom.xml                              | 16 +++++++
 3 files changed, 85 insertions(+), 15 deletions(-)

diff --git a/openid-connect-common/pom.xml b/openid-connect-common/pom.xml
index 8c1148c39..517012815 100644
--- a/openid-connect-common/pom.xml
+++ b/openid-connect-common/pom.xml
@@ -121,19 +121,4 @@
       </plugin>
     </plugins>
   </build>
-    <repositories>
-        <repository>
-            <id>org.eclipse.persistence</id>
-            <name>EclipseLink repository</name>
-            <url>http://download.eclipse.org/rt/eclipselink/maven.repo</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-		<repository>
-		    <id>spring-milestone</id>
-		    <name>Spring Maven MILESTONE Repository</name>
-		    <url>http://maven.springframework.org/milestone</url>
-		</repository>
-    </repositories>
 </project>
diff --git a/openid-connect-server-webapp/pom.xml b/openid-connect-server-webapp/pom.xml
index f9e3fdbb8..f6892e28b 100644
--- a/openid-connect-server-webapp/pom.xml
+++ b/openid-connect-server-webapp/pom.xml
@@ -61,5 +61,74 @@
   		<artifactId>openid-connect-server</artifactId>
   		<version>1.1.0-SNAPSHOT</version>
   	</dependency>
+     <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>jcl-over-slf4j</artifactId>
+         <version>${org.slf4j-version}</version>
+         <scope>runtime</scope>
+     </dependency>
+     <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-log4j12</artifactId>
+         <version>${org.slf4j-version}</version>
+         <scope>runtime</scope>
+     </dependency>
+     <dependency>
+         <groupId>log4j</groupId>
+         <artifactId>log4j</artifactId>
+         <version>1.2.15</version>
+         <exclusions>
+             <exclusion>
+                 <groupId>javax.mail</groupId>
+                 <artifactId>mail</artifactId>
+             </exclusion>
+             <exclusion>
+                 <groupId>javax.jms</groupId>
+                 <artifactId>jms</artifactId>
+             </exclusion>
+             <exclusion>
+                 <groupId>com.sun.jdmk</groupId>
+                 <artifactId>jmxtools</artifactId>
+             </exclusion>
+             <exclusion>
+                 <groupId>com.sun.jmx</groupId>
+                 <artifactId>jmxri</artifactId>
+             </exclusion>
+         </exclusions>
+         <scope>runtime</scope>
+     </dependency>
+  	<dependency>
+            <groupId>commons-dbcp</groupId>
+            <artifactId>commons-dbcp</artifactId>
+            <version>1.4</version>
+    </dependency>
+		<dependency>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<version>2.2.9</version>
+		</dependency>
+  	    <dependency>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>org.eclipse.persistence.jpa</artifactId>
+            <version>2.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-taglibs</artifactId>
+            <version>${spring.security.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${org.springframework-version}</version>
+            <exclusions>
+                <!-- Exclude Commons Logging in favor of SLF4j -->
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+  	
   </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 12151d78c..07a8a6ea8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -257,4 +257,20 @@
 
 	</dependencies>
 
+    <repositories>
+        <repository>
+            <id>org.eclipse.persistence</id>
+            <name>EclipseLink repository</name>
+            <url>http://download.eclipse.org/rt/eclipselink/maven.repo</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+		<repository>
+		    <id>spring-milestone</id>
+		    <name>Spring Maven MILESTONE Repository</name>
+		    <url>http://maven.springframework.org/milestone</url>
+		</repository>
+    </repositories>
+
 </project>
\ No newline at end of file