jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject svn commit: r1387373 - in /incubator/jspwiki/trunk: .classpath ChangeLog build.xml
Date Tue, 18 Sep 2012 21:47:12 GMT
Author: juanpablo
Date: Tue Sep 18 21:47:12 2012
New Revision: 1387373

URL: http://svn.apache.org/viewvc?rev=1387373&view=rev
Log:
 * tomcat jars downgraded to 5.5.23 so they can be downloaded from Central. 
   Completes JSPWIKI-746 and therefore closes JSPWIKI-744.
         
 * jetty upgraded to 7.6.7.v20120910 and selenium-server downloaded from 
   their site, to avoid downloading anything from svn.apache.org during build 
   time.

Modified:
    incubator/jspwiki/trunk/.classpath
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/build.xml

Modified: incubator/jspwiki/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.classpath?rev=1387373&r1=1387372&r2=1387373&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.classpath (original)
+++ incubator/jspwiki/trunk/.classpath Tue Sep 18 21:47:12 2012
@@ -34,11 +34,11 @@
 	<classpathentry kind="lib" path="lib/jstl-1.1.2.jar"/>
 	<classpathentry kind="lib" path="tests/lib/commons-el-1.0.jar"/>
 	<classpathentry kind="lib" path="tests/lib/hsqldb-1.8.0.10.jar"/>
-	<classpathentry kind="lib" path="tests/lib/jasper-compiler-5.5.25.jar"/>
-	<classpathentry kind="lib" path="tests/lib/jasper-runtime-5.5.25.jar"/>
+	<classpathentry kind="lib" path="tests/lib/jasper-compiler-5.5.23.jar"/>
+	<classpathentry kind="lib" path="tests/lib/jasper-runtime-5.5.23.jar"/>
 	<classpathentry kind="lib" path="tests/lib/stripes-1.5.7.jar"/>
 	<classpathentry kind="lib" path="tests/lib/selenium-server-standalone-2.25.0.jar"/>
-	<classpathentry kind="lib" path="tests/lib/jetty-all-7.6.5.v20120716.jar"/>
+	<classpathentry kind="lib" path="tests/lib/jetty-all-7.6.7.v20120910.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1387373&r1=1387372&r2=1387373&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Tue Sep 18 21:47:12 2012
@@ -1,3 +1,11 @@
+2012-09-18  Juan Pablo Santos (juanpablo AT apache DOT org)
+       
+       * tomcat jars downgraded to 5.5.23 so they can be downloaded from Central. Completes
JSPWIKI-746
+         and therefore closes JSPWIKI-744
+         
+       * jetty upgraded to 7.6.7.v20120910 and selenium-server downloaded from their site,
to avoid 
+         downloading anything from svn.apache.org during build time
+
 2012-09-10   Harry Metske <metskem@apache.org>
        
        * 2.9.0-incubating-12
@@ -37,10 +45,10 @@
        * maven-ant-tasks aren't used to download opt-libs anymore
        
        * HSQL connections are handled inside the appropiate unit tests in order to ensure
HSQL 
-         server shutdown. Hypersonic is updated to 1.8.10 
+         server shutdown. Hypersonic is updated to 1.8.0.10 
       
        * added clean-deps target to remove all lib's directories. Useful to remove old jars
-         if the dependencies get updated. This target need to be run at least once to
+         if the dependencies get updated. This target needs to be run at least once to
          ensure that old jars don't remain in classpath
               
 2012-07-22  Florian Holeczek (florianh AT apache DOT org)

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1387373&r1=1387372&r2=1387373&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Tue Sep 18 21:47:12 2012
@@ -261,15 +261,20 @@
      	<get-element to-file="${libs.tests}/commons-el-1.0.jar" url="${central.url}/commons-el/commons-el/1.0/commons-el-1.0.jar"
/>
         <get-element to-file="${libs.tests}/custom_rhino-0.4.3.jar" url="${central.url}/org/dojotoolkit/custom_rhino/0.4.3/custom_rhino-0.4.3.jar"
/>
      	<get-element to-file="${libs.tests}/hsqldb-1.8.0.10.jar" url="${central.url}/org/hsqldb/hsqldb/1.8.0.10/hsqldb-1.8.0.10.jar"
/>
-        <get-element to-file="${libs.tests}/jasper-compiler-5.5.25.jar" url="${svn.repository}/libs/${libs.tests}/jasper-compiler-5.5.25.jar"
/>
-        <get-element to-file="${libs.tests}/jasper-runtime-5.5.25.jar" url="${svn.repository}/libs/${libs.tests}/jasper-runtime-5.5.25.jar"
/>
-        <get-element to-file="${libs.tests}/jetty-all-7.6.5.v20120716.jar" url="${svn.repository}/libs/${libs.tests}/jetty-all-7.6.5.v20120716.jar"
/>
+        <get-element to-file="${libs.tests}/jasper-compiler-5.5.23.jar" 
+                     url="${central.url}/tomcat/jasper-compiler/5.5.23/jasper-compiler-5.5.23.jar"
/>
+        <get-element to-file="${libs.tests}/jasper-runtime-5.5.23.jar" 
+                     url="${central.url}/tomcat/jasper-runtime/5.5.23/jasper-runtime-5.5.23.jar"
/>
+        <get-element to-file="${libs.tests}/jetty-all-7.6.7.v20120910.jar" 
+                     url="${central.url}/org/eclipse/jetty/aggregate/jetty-all/7.6.7.v20120910/jetty-all-7.6.7.v20120910.jar"
/>
         <get-element to-file="${libs.tests}/junit-3.8.2.jar" url="${central.url}/junit/junit/3.8.2/junit-3.8.2.jar"
/>
-        <get-element to-file="${libs.tests}/selenium-server-standalone-2.25.0.jar" url="${svn.repository}/libs/${libs.tests}/selenium-server-standalone-2.25.0.jar"
/>
+        <get-element to-file="${libs.tests}/selenium-server-standalone-2.25.0.jar" 
+                     url="http://selenium.googlecode.com/files/selenium-server-standalone-2.25.0.jar"
/>
         <get-element to-file="${libs.tests}/stripes-1.5.7.jar" url="${central.url}/net/sourceforge/stripes/stripes/1.5.7/stripes-1.5.7.jar"
/>
         <get-element to-file="${libs.tests}/xercesImpl-2.6.2.jar" url="${central.url}/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"
/>
         <get-element to-file="${libs.tests}/xml-apis-1.0.b2.jar" url="${central.url}/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"
/>
-        <get-element to-file="${libs.tests}/yuicompressor-2.4.2.jar" url="${central.url}/com/yahoo/platform/yui/yuicompressor/2.4.2/yuicompressor-2.4.2.jar"
/>
+        <get-element to-file="${libs.tests}/yuicompressor-2.4.2.jar" 
+                     url="${central.url}/com/yahoo/platform/yui/yuicompressor/2.4.2/yuicompressor-2.4.2.jar"
/>
      	
      	<!-- other dependencies ((L)GPL dependencies and jars needed by these) -->
      	<get-element to-file="${libs.opt}/cobertura-1.9.4.1.jar" url="${central.url}/net/sourceforge/cobertura/cobertura/1.9.4.1/cobertura-1.9.4.1.jar"
/>
@@ -1240,8 +1245,8 @@ If all of the tests ran successfully, th
         <exclude name="web.xml" />
         <exclude name="lib/*" />
       </webinf>
-      <lib dir="${war}/WEB-INF/lib" excludes="servlet-api.jar,j2ee.jar"/>
-      <lib dir="${code.build}" includes="jsp.jar" />
+      <lib dir="${war}/WEB-INF/lib" excludes="servlet-api-2.4.jar,j2ee.jar"/>
+      <lib dir="${code.build}" includes="jsp-api-2.0.jar" />
       <fileset dir="${war}">
         <exclude name="WEB-INF/**" />
         <exclude name="**/*.jsp" />



Mime
View raw message