[Red5devs] [red5 commit] r3104 - java/server/branches/paulg_mp4

[codesite-noreply at google.com]

Author: mondain
Date: Thu Sep 25 13:58:29 2008
New Revision: 3104

Modified:
    java/server/branches/paulg_mp4/ivy.xml
    java/server/branches/paulg_mp4/ivysettings.xml

Log:
fixed deps

Modified: java/server/branches/paulg_mp4/ivy.xml
==============================================================================
--- java/server/branches/paulg_mp4/ivy.xml	(original)
+++ java/server/branches/paulg_mp4/ivy.xml	Thu Sep 25 13:58:29 2008
@@ -15,8 +15,6 @@
          <dependency org="tomcat" name="jasper" rev="6.0.16" />
          <dependency org="tomcat" name="jasper-jdt" rev="6.0.16" />
          <dependency org="tomcat" name="jasper-el" rev="6.0.16" />
-        <dependency org="tomcat" name="tomcat-juli" rev="6.0.16" />
-        <dependency org="tomcat" name="tomcat-juli-adapters" rev="6.0.16"  
/>
          <dependency org="tomcat" name="el-api" rev="" />
          <dependency org="javax" name="jsp-api" rev="2.1" />
          <dependency org="javax" name="servlet-api" rev="2.5" />
@@ -41,12 +39,13 @@
          <dependency org="jetty" name="jetty-util" rev="6.1.9" />
          <dependency org="jetty" name="jetty-xbean" rev="6.1.9" />
          <!-- Logging -->
-        <dependency name="slf4j-api" rev="1.5.2" />
-        <dependency name="jcl-over-slf4j" rev="1.5.2" />
-        <dependency name="log4j-over-slf4j" rev="1.5.2" />
-        <dependency name="jul-to-slf4j" rev="1.5.2" />
-        <dependency name="logback-core" rev="0.9.9" />
-        <dependency name="logback-classic" rev="0.9.9" />
+        <dependency name="slf4j-api" rev="1.5.3" />
+        <dependency name="jcl-over-slf4j" rev="1.5.3" />
+        <dependency name="log4j-over-slf4j" rev="1.5.3" />
+        <dependency name="jul-to-slf4j" rev="1.5.3" />
+        <dependency name="tomcat-juli-slf4j" rev="1.5.0" />
+        <dependency name="logback-core" rev="0.9.10-SNAPSHOT" />
+        <dependency name="logback-classic" rev="0.9.10-SNAPSHOT" />
          <!-- General -->
          <dependency org="cglib" name="cglib-nodep" rev="2.1_3" />
          <dependency org="commons" name="commons-beanutils" rev="1.8.0" />
@@ -78,7 +77,7 @@
          <dependency name="bsh" rev="2.0b4" />
          <dependency name="groovy" rev="1.0" />
          <dependency name="jruby" rev="1.0.3" conf="java6->*"/>
-        <dependency name="jython" rev="2.2" />
+        <dependency name="jython" rev="2.5" />
          <dependency org="spring" name="spring-context-support" rev="2.5.5"  
/>
          <!-- Java5 support -->
          <dependency org="rhino" name="js" rev="1.6R7" conf="java5->*"/>
@@ -102,4 +101,4 @@
          <dependency name="groovy-engine" rev="" conf="eclipse->*"/>
          <dependency name="jruby-engine" rev="" conf="eclipse->*"/>
      </dependencies>
-</ivy-module>
\ No newline at end of file
+</ivy-module>

Modified: java/server/branches/paulg_mp4/ivysettings.xml
==============================================================================
--- java/server/branches/paulg_mp4/ivysettings.xml	(original)
+++ java/server/branches/paulg_mp4/ivysettings.xml	Thu Sep 25 13:58:29 2008
@@ -20,10 +20,12 @@
                  <artifact  
pattern="http://red5.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"  
/>
                  <artifact  
pattern="http://red5.googlecode.com/svn/repository/[organisation]/[artifact](-[revision]).[ext]"  
/>
              </url>
+            <!--
              <url name="cvsdude">
                  <artifact  
pattern="http://svn1.cvsdude.com/osflash/red5/repository/[artifact](-[revision]).[ext]"  
/>
                  <artifact  
pattern="http://svn1.cvsdude.com/osflash/red5/repository/[organisation]/[artifact](-[revision]).[ext]"  
/>
              </url>
+            -->
          </chain>
      </resolvers>
-</ivysettings>
\ No newline at end of file
+</ivysettings>