syncing version numbers for dependencies

This commit is contained in:
Scott Andrews
2008-11-04 14:29:15 +00:00
parent 0ae67dc7ea
commit b6170bb15a
9 changed files with 24 additions and 24 deletions

View File

@@ -6,7 +6,7 @@ Import-Package:
ognl;version="[2.6.9, 3.0.0)";resolution:=optional,
org.jboss.el;version="[2.0.0, 3.0.0)";resolution:=optional
Import-Template:
org.springframework.*;version="[2.5.4.A, 3.0.0)",
org.springframework.*;version="[2.5.6, 3.0.0)",
org.apache.commons.logging;version="[1.1.1, 2.0.0)",
javax.el;version="[1.0.0, 2.0.0)";resolution:=optional,
ognl;version="[2.6.9, 3.0.0)";resolution:=optional,

View File

@@ -9,8 +9,8 @@
<classpathentry combineaccessrules="false" kind="src" path="/spring-webflow"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="IVY_CACHE/com.sun.facelets/com.springsource.com.sun.facelets/1.1.14/com.springsource.com.sun.facelets-1.1.14.jar" sourcepath="IVY_CACHE/com.sun.facelets/com.springsource.com.sun.facelets/1.1.14/com.springsource.com.sun.facelets-sources-1.1.14.jar"/>
<classpathentry kind="var" path="IVY_CACHE/com.sun.faces/com.springsource.com.sun.faces/1.2.0.08/com.springsource.com.sun.faces-1.2.0.08.jar" sourcepath="IVY_CACHE/com.sun.faces/com.springsource.com.sun.faces/1.2.0.08/com.springsource.com.sun.faces-sources-1.2.0.08.jar"/>
<classpathentry kind="var" path="IVY_CACHE/javax.faces/com.springsource.javax.faces/1.2.0.08/com.springsource.javax.faces-1.2.0.08.jar"/>
<classpathentry kind="var" path="IVY_CACHE/com.sun.faces/com.springsource.com.sun.faces/1.2.0.09/com.springsource.com.sun.faces-1.2.0.09.jar" sourcepath="/IVY_CACHE/com.sun.faces/com.springsource.com.sun.faces/1.2.0.09/com.springsource.com.sun.faces-sources-1.2.0.09.jar"/>
<classpathentry kind="var" path="IVY_CACHE/javax.faces/com.springsource.javax.faces/1.2.0.09/com.springsource.javax.faces-1.2.0.09.jar" sourcepath="/IVY_CACHE/javax.faces/com.springsource.javax.faces/1.2.0.09/com.springsource.javax.faces-sources-1.2.0.09.jar"/>
<classpathentry kind="var" path="IVY_CACHE/javax.el/com.springsource.javax.el/2.1.0/com.springsource.javax.el-2.1.0.jar" sourcepath="IVY_CACHE/javax.el/com.springsource.javax.el/2.1.0/com.springsource.javax.el-sources-2.1.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-2.4.0.jar" sourcepath="/IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.4.0/com.springsource.javax.servlet-sources-2.4.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>

View File

@@ -37,8 +37,8 @@
<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="latest.integration" conf="compile->runtime"/>
<!-- JSF 1.2 dependencies -->
<dependency org="javax.faces" name="com.springsource.javax.faces" rev="1.2.0.08" conf="provided, jsf12->runtime" />
<dependency org="com.sun.faces" name="com.springsource.com.sun.faces" rev="1.2.0.08" conf="provided, jsf12->runtime" />
<dependency org="javax.faces" name="com.springsource.javax.faces" rev="1.2.0.09" conf="provided, jsf12->runtime" />
<dependency org="com.sun.faces" name="com.springsource.com.sun.faces" rev="1.2.0.09" conf="provided, jsf12->runtime" />
<!-- JSF 1.1 dependencies -->
<dependency org="org.apache.myfaces" name="com.springsource.org.apache.myfaces.javax.faces" rev="1.1.5" conf="jsf11->runtime" />

View File

@@ -6,7 +6,7 @@ Import-Package:
org.springframework.webflow.engine.builder.support;version="[2.0.4, 2.0.5)"
Import-Template:
org.springframework.js.*;version="[2.0.4, 2.0.5)",
org.springframework.*;version="[2.5.4.A, 3.0.0)",
org.springframework.*;version="[2.5.6, 3.0.0)",
org.springframework.binding.*;version="[2.0.4, 2.0.5)",
org.springframework.webflow.*;version="[2.0.4, 2.0.5)",
org.apache.commons.logging;version="[1.1.1, 2.0.0)",

View File

@@ -3,7 +3,7 @@ Bundle-Name: Spring JS
Bundle-Vendor: SpringSource
Bundle-ManifestVersion: 2
Import-Template:
org.springframework.*;version="[2.5.4.A, 3.0.0)",
org.springframework.*;version="[2.5.6, 3.0.0)",
org.apache.commons.logging;version="[1.1.1, 2.0.0)",
javax.servlet;version="[2.4.0, 3.0.0)",
javax.servlet.http;version="[2.4.0, 3.0.0)",

View File

@@ -197,6 +197,6 @@
</build>
<properties>
<spring.version>2.5.6</spring.version>
<jsf.version>1.2.0.08</jsf.version>
<jsf.version>1.2.0.09</jsf.version>
</properties>
</project>

View File

@@ -35,22 +35,22 @@
<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.3.1.ga" conf="compile->compile"/>
<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="compile->compile"/>
<dependency org="org.jboss.el" name="com.springsource.org.jboss.el" rev="2.0.0.GA" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.4.A" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="2.5.4.A" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="2.5.4.A" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.core" rev="2.5.4.A" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.4.A" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.4.A" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.4.A" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web" rev="2.5.4.A" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.portlet" rev="2.5.4.A" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.servlet" rev="2.5.4.A" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.6" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="2.5.6" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="2.5.6" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.core" rev="2.5.6" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.6" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.6" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web" rev="2.5.6" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.portlet" rev="2.5.6" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.web.servlet" rev="2.5.6" conf="compile->compile"/>
<dependency org="org.springframework.webflow" name="org.springframework.faces" rev="latest.integration" conf="compile->jsf12"/>
<dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="latest.integration" conf="compile->compile"/>
<!-- test-time only dependencies -->
<dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="test->compile"/>
<dependency org="org.springframework" name="org.springframework.test" rev="2.5.4.A" conf="test->compile"/>
<dependency org="org.springframework" name="org.springframework.test" rev="2.5.6" conf="test->compile"/>
</dependencies>

View File

@@ -192,6 +192,6 @@
</build>
<properties>
<spring.version>2.5.6</spring.version>
<jsf.version>1.2.0.08</jsf.version>
<jsf.version>1.2.0.09</jsf.version>
</properties>
</project>

View File

@@ -4,12 +4,12 @@ Bundle-Vendor: SpringSource
Bundle-ManifestVersion: 2
Import-Template:
org.springframework.js.*;version="[2.0.4, 2.0.5)",
org.springframework.*;version="[2.5.4.A, 3.0.0)",
org.springframework.*;version="[2.5.6, 3.0.0)",
org.springframework.binding.*;version="[2.0.4, 2.0.5)",
org.springframework.orm.*;version="[2.5.4.A, 3.0.0)";resolution:=optional,
org.springframework.orm.*;version="[2.5.6, 3.0.0)";resolution:=optional,
org.springframework.security.*;version="[2.0.0, 3.0.0)";resolution:=optional,
org.springframework.transaction.*;version="[2.5.4.A, 3.0.0)";resolution:=optional,
org.springframework.web.portlet.*;version="[2.5.4.A, 3.0.0)";resolution:=optional,
org.springframework.transaction.*;version="[2.5.6, 3.0.0)";resolution:=optional,
org.springframework.web.portlet.*;version="[2.5.6, 3.0.0)";resolution:=optional,
org.apache.commons.logging;version="[1.1.1, 2.0.0)",
javax.servlet;version="[2.4.0, 3.0.0)",
javax.servlet.http;version="[2.4.0, 3.0.0)",