Przeglądaj źródła

Changed spring version to 1.2.9 and modified dependencies to get build to work with this version. Corrected some javadoc links.

Luke Taylor 18 lat temu
rodzic
commit
34527c3305
3 zmienionych plików z 43 dodań i 33 usunięć
  1. 4 0
      adapters/cas/pom.xml
  2. 11 2
      core/pom.xml
  3. 28 31
      pom.xml

+ 4 - 0
adapters/cas/pom.xml

@@ -18,5 +18,9 @@
       <artifactId>cas</artifactId>
       <artifactId>cas</artifactId>
       <version>2.0.12</version>
       <version>2.0.12</version>
     </dependency>
     </dependency>
+    <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-web</artifactId>
+    </dependency>
   </dependencies>
   </dependencies>
 </project>
 </project>

+ 11 - 2
core/pom.xml

@@ -7,7 +7,7 @@
 	</parent>
 	</parent>
 	<packaging>jar</packaging>
 	<packaging>jar</packaging>
 	<artifactId>acegi-security</artifactId>
 	<artifactId>acegi-security</artifactId>
-	<name>Acegi Security System for Spring</name>
+	<name>Acegi Security Core</name>
 
 
 	<scm>
 	<scm>
 		<connection>scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity/core</connection>
 		<connection>scm:svn:https://acegisecurity.svn.sourceforge.net/svnroot/acegisecurity/trunk/acegisecurity/core</connection>
@@ -17,6 +17,10 @@
 
 
 	<dependencies>
 	<dependencies>
 		<dependency>
 		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+		</dependency>
+        <dependency>
 			<groupId>org.springframework</groupId>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-remoting</artifactId>
 			<artifactId>spring-remoting</artifactId>
 		</dependency>
 		</dependency>
@@ -30,6 +34,11 @@
 			<scope>runtime</scope>
 			<scope>runtime</scope>
 		</dependency>
 		</dependency>
 		<dependency>
 		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<optional>true</optional>
+		</dependency>
+        <dependency>
 			<groupId>org.springframework</groupId>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-mock</artifactId>
 			<artifactId>spring-mock</artifactId>
 			<optional>true</optional>
 			<optional>true</optional>
@@ -40,7 +49,7 @@
             <artifactId>spring-ldap</artifactId>
             <artifactId>spring-ldap</artifactId>
             <version>1.1.2</version>
             <version>1.1.2</version>
             <optional>true</optional>
             <optional>true</optional>
-        </dependency>        
+        </dependency>
         <dependency>
         <dependency>
 			<groupId>net.sf.ehcache</groupId>
 			<groupId>net.sf.ehcache</groupId>
 			<artifactId>ehcache</artifactId>
 			<artifactId>ehcache</artifactId>

+ 28 - 31
pom.xml

@@ -444,45 +444,32 @@
 						<link>
 						<link>
 							http://java.sun.com/j2se/1.5.0/docs/api
 							http://java.sun.com/j2se/1.5.0/docs/api
 						</link>
 						</link>
+                        <link>
+                            http://www.springframework.org/docs/api/
+                        </link>
 						<link>
 						<link>
-							http://jakarta.apache.org/commons/dbcp/apidocs/
+							http://commons.apache.org/dbcp/apidocs/
 						</link>
 						</link>
 						<link>
 						<link>
-							http://jakarta.apache.org/commons/fileupload/apidocs/
+							http://commons.apache.org/httpclient/apidocs/
 						</link>
 						</link>
 						<link>
 						<link>
-							http://jakarta.apache.org/commons/httpclient/apidocs/
+							http://commons.apache.org/pool/apidocs/
 						</link>
 						</link>
+                        <link>
+                            http://commons.apache.org/lang/api/
+                        </link>
+                        <link>
+                            http://commons.apache.org/codec/apidocs/
+                        </link>
+                        <link>
+                            http://commons.apache.org/collections/apidocs/
+                        </link>
 						<link>
 						<link>
-							http://jakarta.apache.org/commons/logging/api/
+							http://velocity.apache.org/engine/releases/velocity-1.5/apidocs/
 						</link>
 						</link>
 						<link>
 						<link>
-							http://jakarta.apache.org/commons/pool/apidocs/
-						</link>
-						<link>http://www.junit.org/junit/javadoc/</link>
-						<link>
-							http://logging.apache.org/log4j/docs/api/
-						</link>
-						<link>
-							http://jakarta.apache.org/velocity/api/
-						</link>
-						<link>
-							http://www.springframework.org/docs/api/
-						</link>
-						<link>
-							http://jakarta.apache.org/commons/lang/api/
-						</link>
-						<link>
-							http://developer.ja-sig.org/projects/cas/multiproject/cas-server/apidocs/
-						</link>
-						<link>
-							http://jakarta.apache.org/commons/codec/apidocs/
-						</link>
-						<link>
-							http://jakarta.apache.org/commons/collections/api/
-						</link>
-						<link>
-							http://jakarta.apache.org/commons/logging/apidocs/
+							http://developer.ja-sig.org/projects/cas/cas-server-core/cas-server/cas-server-core/apidocs/
 						</link>
 						</link>
 						<link>
 						<link>
 							http://tomcat.apache.org/tomcat-5.0-doc/servletapi/
 							http://tomcat.apache.org/tomcat-5.0-doc/servletapi/
@@ -499,6 +486,11 @@
 
 
 	<dependencyManagement>
 	<dependencyManagement>
 		<dependencies>
 		<dependencies>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-core</artifactId>
+				<version>${spring.version}</version>
+			</dependency>
 			<dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-mock</artifactId>
 				<artifactId>spring-mock</artifactId>
@@ -509,6 +501,11 @@
 				<artifactId>spring-remoting</artifactId>
 				<artifactId>spring-remoting</artifactId>
 				<version>${spring.version}</version>
 				<version>${spring.version}</version>
 			</dependency>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-web</artifactId>
+				<version>${spring.version}</version>
+			</dependency>
 			<dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-jdbc</artifactId>
 				<artifactId>spring-jdbc</artifactId>
@@ -530,7 +527,7 @@
 
 
 	</dependencyManagement>
 	</dependencyManagement>
 	<properties>
 	<properties>
-		<spring.version>2.0.4</spring.version>
+		<spring.version>1.2.9</spring.version>
 	</properties>
 	</properties>
 
 
 </project>
 </project>