[jbossweb-commits] JBossWeb SVN: r1106 - trunk.

Author: remy.maucherat(a)jboss.com Date: 2009-06-11 08:30:07 -0400 (Thu, 11 Jun 2009) New Revision: 1106 Modified: trunk/build.properties.default trunk/build.xml trunk/dist.xml Log: - Update to pool 1.5. - Remove deployer packaging. Modified: trunk/build.properties.default =================================================================== --- trunk/build.properties.default 2009-06-11 12:29:25 UTC (rev 1105) +++ trunk/build.properties.default 2009-06-11 12:30:07 UTC (rev 1106) @@ -48,16 +48,9 @@ commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-1.2.2-src.tar.gz # ----- Commons Pool, version 1.1 or later ----- -commons-pool.home=${base.path}/commons-pool-1.4-src -commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.4-src.tar.gz +commons-pool.home=${base.path}/commons-pool-1.5-src +commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.5-src.tar.gz -# ----- Commons Collections, version 2.0 or later ----- -commons-collections.home=${base.path}/commons-collections-3.2.1-src -commons-collections.lib=${commons-collections.home} -commons-collections.jar=${commons-collections.lib}/commons-collections-3.2.1.jar -commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/commons-collections-3.2.1.tar.gz -commons-collections-src.loc=${base-commons.loc}/collections/source/commons-collections-3.2.1-src.tar.gz - # ----- NSIS, version 2.0 or later ----- nsis.home=${base.path}/nsis-2.44 nsis.exe=${nsis.home}/makensis.exe Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2009-06-11 12:29:25 UTC (rev 1105) +++ trunk/build.xml 2009-06-11 12:30:07 UTC (rev 1106) @@ -36,7 +36,7 @@ <property name="test.runner" value="junit.textui.TestRunner"/> <!-- Can't be lower - jsp uses templates --> - <property name="compile.source" value="1.5"/> + <property name="compile.source" value="1.6"/> <!-- JAR artifacts --> <property name="bootstrap.jar" value="${tomcat.build}/bin/bootstrap.jar"/> @@ -690,10 +690,6 @@ <!-- Build Tomcat DBCP bundle --> <antcall target="downloadgz"> - <param name="sourcefile" value="${commons-collections-src.loc}"/> - <param name="destfile" value="${tomcat-dbcp.jar}" /> - </antcall> - <antcall target="downloadgz"> <param name="sourcefile" value="${commons-pool-src.loc}"/> <param name="destfile" value="${tomcat-dbcp.jar}" /> </antcall> @@ -786,8 +782,8 @@ debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}" - source="${compile.source}" - target="${compile.target}" + source="1.5" + target="1.5" excludes="**/CVS/**,**/.svn/**"> <include name="**" /> </javac> Modified: trunk/dist.xml =================================================================== --- trunk/dist.xml 2009-06-11 12:29:25 UTC (rev 1105) +++ trunk/dist.xml 2009-06-11 12:30:07 UTC (rev 1106) @@ -256,7 +256,7 @@ <!-- ==================== RELEASE: Create Release ======================= --> - <target name="release" depends="clean,dist-static,dist-deployer,installer,package-zip,package-tgz,package-deployer-zip,package-deployer-tgz,dist-source,dist-javadoc,package-docs-tgz,package-src-zip,package-src-tgz" + <target name="release" depends="clean,dist-static,installer,package-zip,package-tgz,dist-source,dist-javadoc,package-docs-tgz,package-src-zip,package-src-tgz" description="Create a JBoss Web packaged distribution"> <filter token="VERSION" value="${version}"/>