Author: iarkh
Date: Fri Mar 22 08:07:24 2013
New Revision: 1459661
URL: http://svn.apache.org/r1459661
Log:
[OPENMEETINGS-580]: Build system now uses recent smslib release (3.5.2). Fix
for 2.1 branch.
Modified:
openmeetings/branches/2.1/ivy.xml
openmeetings/branches/2.1/ivysettings.xml
openmeetings/branches/2.1/ivysettings.xsd
Modified: openmeetings/branches/2.1/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.1/ivy.xml?rev=1459661&r1=1459660&r2=1459661&view=diff
==============================================================================
--- openmeetings/branches/2.1/ivy.xml (original)
+++ openmeetings/branches/2.1/ivy.xml Fri Mar 22 08:07:24 2013
@@ -253,7 +253,7 @@
<dependency org="com.googlecode.jsmpp" name="jsmpp" rev="2.1.0"
conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="smslib" name="smslib" rev="3.5.3.1"
conf="openmeetings->*" transitive="false">
+ <dependency org="org.smslib" name="smslib" rev="3.5.3"
conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="org.asteriskjava" name="asterisk-java"
rev="1.0.0.CI-20130102.214528-1134" conf="openmeetings->*" transitive="false">
Modified: openmeetings/branches/2.1/ivysettings.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.1/ivysettings.xml?rev=1459661&r1=1459660&r2=1459661&view=diff
==============================================================================
--- openmeetings/branches/2.1/ivysettings.xml (original)
+++ openmeetings/branches/2.1/ivysettings.xml Fri Mar 22 08:07:24 2013
@@ -33,6 +33,9 @@
<artifact
pattern="http://openmeetings.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
/>
<artifact
pattern="http://red5.googlecode.com/svn/repository/[organisation]/[artifact]/[revision]/[artifact](-[revision]).[ext]"
/>
</url>
+ <url name="smslib" m2compatible="true">
+ <artifact
pattern="http://smslib.org/maven2/v3/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]"
/>
+ </url>
</chain>
</resolvers>
<triggers>
Modified: openmeetings/branches/2.1/ivysettings.xsd
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.1/ivysettings.xsd?rev=1459661&r1=1459660&r2=1459661&view=diff
==============================================================================
--- openmeetings/branches/2.1/ivysettings.xsd (original)
+++ openmeetings/branches/2.1/ivysettings.xsd Fri Mar 22 08:07:24 2013
@@ -62,6 +62,7 @@
<xs:element maxOccurs="unbounded" ref="artifact"/>
</xs:sequence>
<xs:attribute name="name" use="required" type="xs:NCName"/>
+ <xs:attribute name="m2compatible" use="optional" type="xs:NCName"/>
</xs:complexType>
</xs:element>
<xs:element name="artifact">