Author: manaRH
Date: 2010-09-01 08:09:18 -0400 (Wed, 01 Sep 2010)
New Revision: 13689
Modified:
branches/community/Seam_2_2/seam-gen/ivy/ivy-build.xml
branches/community/Seam_2_2/seam-gen/ivy/ivy.settings.xml
branches/community/Seam_2_2/seam-gen/ivy/ivy.xml
Log:
JBSEAM-4470 fixed versions in ivy related files
Modified: branches/community/Seam_2_2/seam-gen/ivy/ivy-build.xml
===================================================================
--- branches/community/Seam_2_2/seam-gen/ivy/ivy-build.xml 2010-09-01 11:31:02 UTC (rev
13688)
+++ branches/community/Seam_2_2/seam-gen/ivy/ivy-build.xml 2010-09-01 12:09:18 UTC (rev
13689)
@@ -6,12 +6,14 @@
<property name="ivy.sync" value="false"/>
<property name="ivy.use.symlinks" value="false"/>
<property name="central.repo"
value="http://repo1.maven.org/maven2"/>
- <property name="jboss.repo"
value="http://repository.jboss.org/maven2"/>
+ <property name="jboss.repo"
value="http://repository.jboss.org/nexus/content/groups/public"...
+ <property name="jboss.deprecated.repo"
value="https://repository.jboss.org/nexus/content/repositories/depre...
+
<!-- centralize some key artifact versions -->
<property name="seam.version" value="2.1.2"/>
<property name="jsf.version" value="1.2_12"/>
- <property name="richfaces.version" value="3.3.1.GA"/>
+ <property name="richfaces.version" value="3.3.3.Final"/>
<property name="icefaces.version" value="1.8.1"/>
<property name="jboss-embedded.version" value="beta3.SP10"/>
Modified: branches/community/Seam_2_2/seam-gen/ivy/ivy.settings.xml
===================================================================
--- branches/community/Seam_2_2/seam-gen/ivy/ivy.settings.xml 2010-09-01 11:31:02 UTC (rev
13688)
+++ branches/community/Seam_2_2/seam-gen/ivy/ivy.settings.xml 2010-09-01 12:09:18 UTC (rev
13689)
@@ -4,10 +4,12 @@
<include url="${ivy.default.settings.dir}/ivysettings.xml" />
<resolvers>
<ibiblio name="jboss" m2compatible="true"
usepoms="true" root="${jboss.repo}"
pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
+ <ibiblio name="jboss-deprec" m2compatible="true"
usepoms="true" root="${jboss.deprecated.repo}"
pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
<chain name="seam" dual="true">
<!-- local is always checked; public needs to be before jboss to allow Ivy to
properly locate sources -->
<resolver ref="public"/>
<resolver ref="jboss"/>
+ <resolver ref="jboss-deprec"/>
</chain>
</resolvers>
</ivysettings>
Modified: branches/community/Seam_2_2/seam-gen/ivy/ivy.xml
===================================================================
--- branches/community/Seam_2_2/seam-gen/ivy/ivy.xml 2010-09-01 11:31:02 UTC (rev 13688)
+++ branches/community/Seam_2_2/seam-gen/ivy/ivy.xml 2010-09-01 12:09:18 UTC (rev 13689)
@@ -32,8 +32,8 @@
<dependency org="xpp3" name="xpp3_min" rev="1.1.3.4.O"
conf="default"/>
<dependency org="org.eclipse.jdt" name="core"
rev="3.2.3.v_686_R32x" conf="default"/>
<dependency org="org.codehaus.groovy" name="groovy-all"
rev="1.5.4" conf="default"/>
- <dependency org="org.hibernate" name="hibernate-validator"
rev="3.0.0.GA" conf="default"/>
- <dependency org="org.jboss.el" name="jboss-el"
rev="1.0_02.CR3" conf="default"/>
+ <dependency org="org.hibernate" name="hibernate-validator"
rev="3.1.0.GA" conf="default"/>
+ <dependency org="org.jboss.el" name="jboss-el"
rev="1.0_02.CR5" conf="default"/>
<!-- Seam jar is a special case because it's an EJB type and Ivy (at least right
now)
believes the extension should be ejb, so we have to tell it the correct one. -->
<dependency org="org.jboss.seam" name="jboss-seam"
rev="${seam.version}" conf="default,sources">
@@ -68,7 +68,7 @@
<dependency org="commons-digester" name="commons-digester"
rev="1.8" conf="default"/>
<dependency org="commons-fileupload" name="commons-fileupload"
rev="1.2.1" conf="default"/>
<!- [/endif icefaces] -->
- <dependency org="org.testng" name="testng" rev="5.6"
conf="test"/>
+ <dependency org="org.testng" name="testng" rev="5.9"
conf="test"/>
<dependency org="org.jboss.seam.embedded" name="hibernate-all"
rev="${jboss-embedded.version}" conf="test"/>
<dependency org="org.jboss.seam.embedded" name="thirdparty-all"
rev="${jboss-embedded.version}" conf="test"/>
<dependency org="org.jboss.seam.embedded"
name="jboss-embedded-all" rev="${jboss-embedded.version}"
conf="test"/>