click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sa...@apache.org
Subject svn commit: r775474 - in /incubator/click/trunk/click: build/build.properties build/build.xml documentation/docs/developer-guide/building.html examples/build.xml
Date Sat, 16 May 2009 14:38:17 GMT
Author: sabob
Date: Sat May 16 14:38:17 2009
New Revision: 775474

URL: http://svn.apache.org/viewvc?rev=775474&view=rev
Log:
updated third-party dependencies to maven2 repository

Modified:
    incubator/click/trunk/click/build/build.properties
    incubator/click/trunk/click/build/build.xml
    incubator/click/trunk/click/documentation/docs/developer-guide/building.html
    incubator/click/trunk/click/examples/build.xml

Modified: incubator/click/trunk/click/build/build.properties
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/build/build.properties?rev=775474&r1=775473&r2=775474&view=diff
==============================================================================
--- incubator/click/trunk/click/build/build.properties (original)
+++ incubator/click/trunk/click/build/build.properties Sat May 16 14:38:17 2009
@@ -38,3 +38,32 @@
 # Because of the licensing issues, Checkstyle is an optional build
 # dependency and can be disabled
 download.checkstyle=true
+
+# Third-party library versions
+cayenne.version=2.0.4
+checkstyle.version=4.4
+commons-codec.version=1.3
+commons-collections.version=3.1
+commons-fileupload.version=1.2.1
+commons-io.version=1.4
+commons-lang.version=2.4
+freemarker.version=2.3.12
+hibernate.version=3.2.6.ga
+junit.version=3.8.1
+log4j.version=1.2.14
+ognl.version=2.6.9
+servlet-api.version=2.3
+spring.version=2.5.6
+velocity.version=1.6.2
+
+# The Click Examples third-party library versions
+ashwood.version=1.1
+commons-logging.version=1.0.4
+geronimo-common-annotations.version=1.1.1
+hsqldb.version=1.8.0.1
+jstl.version=1.1.2
+oro.version=2.0.8
+poi.version=3.0-FINAL
+quartz.version=1.6.3
+spring-security.version=1.0.7
+standard.version=1.1.2
\ No newline at end of file

Modified: incubator/click/trunk/click/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/build/build.xml?rev=775474&r1=775473&r2=775474&view=diff
==============================================================================
--- incubator/click/trunk/click/build/build.xml (original)
+++ incubator/click/trunk/click/build/build.xml Sat May 16 14:38:17 2009
@@ -30,21 +30,21 @@
    <property name="click-nodeps" value="click-nodeps-${version}-incubating"/>
    <property name="click-mock" value="click-mock-${version}-incubating"/>
 
-   <property name="jar.cayenne" value="cayenne-nodeps-2.0.4.jar"/>
-   <property name="jar.checkstyle" value="checkstyle-all-4.4.jar"/>
-   <property name="jar.codec" value="commons-codec-1.3.jar"/>
-   <property name="jar.collections" value="commons-collections-3.1.jar"/>
-   <property name="jar.freemarker" value="freemarker-2.3.12.jar"/>
-   <property name="jar.hibernate" value="hibernate-3.2.6.ga.jar"/>
-   <property name="jar.io" value="commons-io-1.4.jar"/>
-   <property name="jar.junit" value="junit-3.8.1.jar"/>
-   <property name="jar.lang" value="commons-lang-2.4.jar"/>
-   <property name="jar.log4j" value="log4j-1.2.14.jar"/>
-   <property name="jar.ognl" value="ognl-2.6.9.jar"/>
-   <property name="jar.servlet" value="servlet-api-2.3.jar"/>
-   <property name="jar.spring" value="spring-2.5.6.jar"/>
-   <property name="jar.upload" value="commons-fileupload-1.2.1.jar"/>
-   <property name="jar.velocity" value="velocity-1.6.2.jar"/>
+   <property name="jar.cayenne" value="cayenne-nodeps-${cayenne.version}.jar"/>
+   <property name="jar.checkstyle" value="checkstyle-all-${checkstyle.version}.jar"/>
+   <property name="jar.codec" value="commons-codec-${commons-codec.version}.jar"/>
+   <property name="jar.collections" value="commons-collections-${commons-collections.version}.jar"/>
+   <property name="jar.freemarker" value="freemarker-${freemarker.version}.jar"/>
+   <property name="jar.hibernate" value="hibernate-${hibernate.version}.jar"/>
+   <property name="jar.io" value="commons-io-${commons-io.version}.jar"/>
+   <property name="jar.junit" value="junit-${junit.version}.jar"/>
+   <property name="jar.lang" value="commons-lang-${commons-lang.version}.jar"/>
+   <property name="jar.log4j" value="log4j-${log4j.version}.jar"/>
+   <property name="jar.ognl" value="ognl-${ognl.version}.jar"/>
+   <property name="jar.servlet" value="servlet-api-${servlet-api.version}.jar"/>
+   <property name="jar.spring" value="spring-${spring.version}.jar"/>
+   <property name="jar.upload" value="commons-fileupload-${commons-fileupload.version}.jar"/>
+   <property name="jar.velocity" value="velocity-${velocity.version}.jar"/>
    <property name="javac.source" value="1.4"/>
    <property name="repository" value="http://repo1.maven.org"/>
    <property name="maven-bundle" value="../maven-upload"/>
@@ -74,7 +74,7 @@
         <attribute name="name"/>
         <attribute name="path"/>
         <sequential>
-            <get src="${repository}/maven/@{path}/jars/@{name}" 
+            <get src="${repository}/maven2/@{path}/@{name}"
                  dest="lib/@{name}"
                  verbose="true"
                  usetimestamp="true"/>            
@@ -547,28 +547,23 @@
 
  
    <target name="get-deps" description="download JAR dependencies">
-      <downloadMacro name="${jar.codec}" path="commons-codec"/>
-      <downloadMacro name="${jar.collections}" path="commons-collections"/>
-      <downloadMacro name="${jar.io}" path="commons-io"/>
-      <downloadMacro name="${jar.lang}" path="commons-lang"/>
-      <downloadMacro name="${jar.log4j}" path="log4j"/>
-      <downloadMacro name="${jar.ognl}" path="ognl"/>
-      <downloadMacro name="${jar.upload}" path="commons-fileupload"/>
-      <downloadMacro name="${jar.junit}" path="junit"/>
-      <downloadMacro name="${jar.servlet}" path="javax.servlet"/>
-      <downloadMacro name="${jar.spring}" path="org.springframework"/>
-	  <get src="${repository}/maven2/org/apache/velocity/velocity/1.6.2/${jar.velocity}"
- 	       dest="lib/${jar.velocity}"
- 	       verbose="true"
- 	       usetimestamp="true"/> 
-      <get src="${repository}/maven2/org/apache/cayenne/cayenne-nodeps/2.0.4/${jar.cayenne}"

- 	       dest="lib/${jar.cayenne}"
- 	       verbose="true"
- 	       usetimestamp="true"/>
-      <get src="${repository}/maven2/org/freemarker/freemarker/2.3.12/${jar.freemarker}"

- 	       dest="lib/${jar.freemarker}"
- 	       verbose="true"
- 	       usetimestamp="true"/>
+       <ant antfile="build.xml"
+           dir="examples"
+           target="get-deps"
+           inheritall="false"/>
+      <downloadMacro name="${jar.codec}" path="commons-codec/commons-codec/${commons-codec.version}"/>
+      <downloadMacro name="${jar.collections}" path="commons-collections/commons-collections/${commons-collections.version}"/>
+      <downloadMacro name="${jar.io}" path="commons-io/commons-io/${commons-io.version}"/>
+      <downloadMacro name="${jar.lang}" path="commons-lang/commons-lang/${commons-lang.version}"/>
+      <downloadMacro name="${jar.log4j}" path="log4j/log4j/${log4j.version}"/>
+      <downloadMacro name="${jar.ognl}" path="ognl/ognl/${ognl.version}"/>
+      <downloadMacro name="${jar.upload}" path="commons-fileupload/commons-fileupload/${commons-fileupload.version}"/>
+      <downloadMacro name="${jar.junit}" path="junit/junit/${junit.version}"/>
+      <downloadMacro name="${jar.servlet}" path="javax/servlet/servlet-api/${servlet-api.version}"/>
+      <downloadMacro name="${jar.spring}" path="org/springframework/spring/${spring.version}"/>
+      <downloadMacro name="${jar.velocity}" path="org/apache/velocity/velocity/${velocity.version}"/>
+      <downloadMacro name="${jar.cayenne}" path="org/apache/cayenne/cayenne-nodeps/${cayenne.version}"/>
+      <downloadMacro name="${jar.freemarker}" path="org/freemarker/freemarker/${freemarker.version}"/>
       <ant antfile="build.xml" 
            dir="examples"
            target="get-deps"
@@ -598,7 +593,7 @@
 
 
    <target name="download-hibernate" if="hibernate.true">
-      <downloadMacro name="${jar.hibernate}" path="org.hibernate"/>
+      <downloadMacro name="${jar.hibernate}" path="org/hibernate/hibernate/${hibernate.version}"/>
    </target>
 
 

Modified: incubator/click/trunk/click/documentation/docs/developer-guide/building.html
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/documentation/docs/developer-guide/building.html?rev=775474&r1=775473&r2=775474&view=diff
==============================================================================
--- incubator/click/trunk/click/documentation/docs/developer-guide/building.html (original)
+++ incubator/click/trunk/click/documentation/docs/developer-guide/building.html Sat May 16
14:38:17 2009
@@ -136,7 +136,7 @@
 <h3>2.1&nbsp; Getting Dependencies</h3>
 <ol>
   <li>Run the Ant target <tt>get-deps</tt> to download JAR dependencies
-  from <a href="http://www.ibiblio.org/maven/">Ibiblio</a> Maven repository:
+  from the <a href="http://repo1.maven.org/maven2">Maven</a> repository:
   <pre class="codeConfig">
 ant get-deps </pre>
 

Modified: incubator/click/trunk/click/examples/build.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/click/examples/build.xml?rev=775474&r1=775473&r2=775474&view=diff
==============================================================================
--- incubator/click/trunk/click/examples/build.xml (original)
+++ incubator/click/trunk/click/examples/build.xml Sat May 16 14:38:17 2009
@@ -26,22 +26,22 @@
    <property file="../build/build.properties"/>
       
    <property name="name" value="click-examples"/>
-   <property name="jar.acegi" value="acegi-security-1.0.7.jar"/>
-   <property name="jar.annotation" value="geronimo-annotation_1.0_spec-1.1.1.jar"/>
-   <property name="jar.ashwood" value="ashwood-1.1.jar"/>
-   <property name="jar.cayenne" value="cayenne-nodeps-2.0.4.jar"/>
+   <property name="jar.acegi" value="acegi-security-${spring-security.version}.jar"/>
+   <property name="jar.annotation" value="geronimo-annotation_1.0_spec-${geronimo-common-annotations.version}.jar"/>
+   <property name="jar.ashwood" value="ashwood-${ashwood.version}.jar"/>
+   <property name="jar.cayenne" value="cayenne-nodeps-${cayenne.version}.jar"/>
    <property name="jar.click" value="click-${version}-incubating.jar"/>
    <property name="jar.click-extras" value="click-extras-${version}-incubating.jar"/>
-   <property name="jar.hsqldb" value="hsqldb-1.8.0.1.jar"/>
-   <property name="jar.jstl" value="jstl-1.1.2.jar"/>
-   <property name="jar.log4j" value="log4j-1.2.14.jar"/>
-   <property name="jar.logging" value="commons-logging-1.0.4.jar"/>
-   <property name="jar.poi" value="poi-3.0-FINAL.jar"/>
-   <property name="jar.quartz" value="quartz-all-1.6.3.jar"/>
-   <property name="jar.oro" value="oro-2.0.8.jar"/>
-   <property name="jar.servlet" value="servlet-api-2.3.jar"/>
-   <property name="jar.spring" value="spring-2.5.6.jar"/>
-   <property name="jar.standard" value="standard-1.1.2.jar"/>
+   <property name="jar.hsqldb" value="hsqldb-${hsqldb.version}.jar"/>
+   <property name="jar.jstl" value="jstl-${jstl.version}.jar"/>
+   <property name="jar.log4j" value="log4j-${log4j.version}.jar"/>
+   <property name="jar.logging" value="commons-logging-${commons-logging.version}.jar"/>
+   <property name="jar.poi" value="poi-${poi.version}.jar"/>
+   <property name="jar.quartz" value="quartz-all-${quartz.version}.jar"/>
+   <property name="jar.oro" value="oro-${oro.version}.jar"/>
+   <property name="jar.servlet" value="servlet-api-${servlet-api.version}.jar"/>
+   <property name="jar.spring" value="spring-${spring.version}.jar"/>
+   <property name="jar.standard" value="standard-${standard.version}.jar"/>
    <property name="javac.source" value="1.5"/>
      
    <property name="dir.deploy" value="../dist"/>
@@ -56,7 +56,7 @@
         <attribute name="name"/>
         <attribute name="path"/>
         <sequential>
-            <get src="${repository}/maven/@{path}/jars/@{name}" 
+            <get src="${repository}/maven2/@{path}/@{name}" 
                  dest="${dir.weblib}/@{name}"
                  verbose="true"
                  usetimestamp="true"/>            
@@ -151,31 +151,19 @@
    <target name="get-deps" description="download JAR dependencies">
       <mkdir dir="${dir.weblib}"/>
       <property name="repository" value="http://repo1.maven.org"/>
-      <webDownloadMacro name="${jar.ashwood}" path="org.objectstyle.ashwood"/>
-      <webDownloadMacro name="${jar.hsqldb}" path="hsqldb"/>
-      <webDownloadMacro name="${jar.jstl}" path="jstl"/>
-      <webDownloadMacro name="${jar.logging}" path="commons-logging"/>
-      <webDownloadMacro name="${jar.log4j}" path="log4j"/>
-      <webDownloadMacro name="${jar.oro}" path="oro"/>
-      <webDownloadMacro name="${jar.poi}" path="poi"/>
-      <webDownloadMacro name="${jar.spring}" path="org.springframework"/>
-      <webDownloadMacro name="${jar.standard}" path="taglibs"/>
-      <get src="${repository}/maven2/org/apache/cayenne/cayenne-nodeps/2.0.4/${jar.cayenne}"
-    	   dest="${dir.weblib}/${jar.cayenne}"
-	       verbose="true"
-	       usetimestamp="true"/> 
-   	  <get src="http://mirrors.ibiblio.org/pub/mirrors/maven2/org/acegisecurity/acegi-security/1.0.7/${jar.acegi}"
-   	       dest="${dir.weblib}/${jar.acegi}"
-   		   verbose="true"
-   	       usetimestamp="true"/>
-   	  <get src="http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/geronimo/specs/geronimo-annotation_1.0_spec/1.1.1/${jar.annotation}"
-   	       dest="${dir.weblib}/${jar.annotation}"
-   		   verbose="true"
-   	       usetimestamp="true"/>
-   	  <get src="http://mirrors.ibiblio.org/pub/mirrors/maven2/opensymphony/quartz-all/1.6.3/${jar.quartz}"
-   	       dest="${dir.weblib}/${jar.quartz}"
-   		   verbose="true"
-   	       usetimestamp="true"/>
+      <webDownloadMacro name="${jar.acegi}" path="org/acegisecurity/acegi-security/${spring-security.version}"/>
+      <webDownloadMacro name="${jar.annotation}" path="org/apache/geronimo/specs/geronimo-annotation_1.0_spec/${geronimo-common-annotations.version}"/>
+      <webDownloadMacro name="${jar.ashwood}" path="org/objectstyle/ashwood/ashwood/${ashwood.version}"/>
+      <webDownloadMacro name="${jar.cayenne}" path="org/apache/cayenne/cayenne-nodeps/${cayenne.version}"/>
+      <webDownloadMacro name="${jar.hsqldb}" path="hsqldb/hsqldb/${hsqldb.version}"/>
+      <webDownloadMacro name="${jar.jstl}" path="jstl/jstl/${jstl.version}"/>
+      <webDownloadMacro name="${jar.logging}" path="commons-logging/commons-logging/${commons-logging.version}"/>
+      <webDownloadMacro name="${jar.log4j}" path="log4j/log4j/${log4j.version}"/>
+      <webDownloadMacro name="${jar.oro}" path="oro/oro/${oro.version}"/>
+      <webDownloadMacro name="${jar.poi}" path="poi/poi/${poi.version}"/>
+      <webDownloadMacro name="${jar.quartz}" path="opensymphony/quartz-all/${quartz.version}"/>
+      <webDownloadMacro name="${jar.spring}" path="org/springframework/spring/${spring.version}"/>
+      <webDownloadMacro name="${jar.standard}" path="taglibs/standard/${standard.version}"/>
    </target>
    
 



Mime
View raw message