Upgraded Acegi to 1.0.6.

Removed unused Spring version 2.0.6.
Added Ivy dependency reporting target to common-build.
This commit is contained in:
Ulrik Sandberg
2008-02-06 22:35:51 +00:00
parent 9222e2f4e0
commit 584df074ee
10 changed files with 20 additions and 26 deletions

View File

@@ -315,6 +315,12 @@
<echo>reading ivy config</echo>
<ivy:configure file="${ivy.conf.dir}/ivyconf.xml" />
</target>
<target name="ivy.graph" description="generate jar dependency graph"
depends="retrieve">
<mkdir dir="${target.dir}/ivy-reports"/>
<ivy:report todir="${target.dir}/ivy-reports" graph="true"/>
</target>
<presetdef name="resolve.conf">
<ivy:resolve file="${basedir}/ivy.xml" conf="${conf}" />

View File

@@ -1,9 +1,9 @@
<ivy-module version="1.0">
<info organisation="org.acegisecurity"
module="acegi-security-src"
revision="1.0.3"
revision="1.0.6"
status="release"
publication="20061116203300"
publication="20071224154600"
default="true"
/>
<configurations>

View File

@@ -1,16 +0,0 @@
<ivy-module version="1.0">
<info organisation="org.springframework"
module="spring-src"
revision="2.0.6"
status="release"
publication="20070618040600"
default="true"
/>
<configurations>
<conf name="default" visibility="public" extends="source"/>
<conf name="source" visibility="public"/>
</configurations>
<publications>
<artifact name="spring-src" type="zip" ext="zip" conf="source"/>
</publications>
</ivy-module>

View File

@@ -46,12 +46,12 @@
<!-- build time only dependencies -->
<dependency org="org.acegisecurity" name="acegi-security"
rev="1.0.3" conf="buildtime->default" />
rev="1.0.6" conf="buildtime->default" />
<dependency org="org.acegisecurity" name="acegi-security-src"
rev="1.0.3" conf="source->default">
rev="1.0.6" conf="source->default">
<artifact name="acegi-security-src" type="zip" />
</dependency>
<!-- kind of nasty, acegi needs some 1.2.7 stuff, so we override with newer! -->
<!-- kind of nasty, acegi needs some older stuff, so we override with newer! -->
<dependency org="org.springframework" name="spring-jdbc"
rev="2.0.8" conf="buildtime->default" />
<dependency org="org.springframework" name="spring-remoting"

View File

@@ -48,9 +48,9 @@
</dependency>
<dependency org="ognl" name="ognl" rev="2.6.9" />
<dependency org="org.acegisecurity" name="acegi-security"
rev="1.0.3" />
rev="1.0.6" />
<dependency org="org.acegisecurity" name="acegi-security-src"
rev="1.0.3" conf="source->source">
rev="1.0.6" conf="source->source">
<artifact name="acegi-security-src" type="zip" />
</dependency>

View File

@@ -9,6 +9,10 @@
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location" value="WEB-INF/ldap.properties" />
</bean>
<!-- Used mainly to enable injecting base into LdapServerManager -->
<bean
class="org.springframework.ldap.core.support.BaseLdapPathBeanPostProcessor" />
<!-- Authenticate using a fixed user -->
<!--

View File

@@ -42,9 +42,9 @@
<!-- build time only dependencies -->
<dependency org="org.acegisecurity" name="acegi-security"
rev="1.0.3" conf="buildtime->default" />
rev="1.0.6" conf="buildtime->default" />
<dependency org="org.acegisecurity" name="acegi-security-src"
rev="1.0.3" conf="source->default">
rev="1.0.6" conf="source->default">
<artifact name="acegi-security-src" type="zip" />
</dependency>
<!-- kind of nasty, acegi needs some 1.2.7 stuff, so we override with newer! -->
@@ -69,7 +69,7 @@
rev="2.0.8" conf="test->default" />
<dependency org="gsbase" name="gsbase" rev="2.0.1"
conf="test->default" />
<dependency org="junit" name="junit" rev="3.8.1"
<dependency org="junit" name="junit" rev="3.8.2"
conf="test->default" />
<dependency org="junit-addons" name="junit-addons" rev="1.4"
conf="test->default" />