flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject git commit: [flex-falcon] [refs/heads/feature-autobuild/cleanup] - - Tried to add the dependencies to the Ant download scripts ...
Date Fri, 30 Dec 2016 16:37:26 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/feature-autobuild/cleanup c6e05858d -> 863d0013f


- Tried to add the dependencies to the Ant download scripts ...


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/863d0013
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/863d0013
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/863d0013

Branch: refs/heads/feature-autobuild/cleanup
Commit: 863d0013f7933301365ebc2b01138fd5be57d68f
Parents: c6e0585
Author: Christofer Dutz <christofer.dutz@codecentric.de>
Authored: Fri Dec 30 17:37:19 2016 +0100
Committer: Christofer Dutz <christofer.dutz@codecentric.de>
Committed: Fri Dec 30 17:37:19 2016 +0100

----------------------------------------------------------------------
 compiler/src/main/resources/downloads.xml | 27 ++++++++++++-
 compiler/src/test/downloads.xml           | 54 +++++++++++++++++++++++++-
 2 files changed, 79 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/863d0013/compiler/src/main/resources/downloads.xml
----------------------------------------------------------------------
diff --git a/compiler/src/main/resources/downloads.xml b/compiler/src/main/resources/downloads.xml
index 25a5501..d57abe0 100644
--- a/compiler/src/main/resources/downloads.xml
+++ b/compiler/src/main/resources/downloads.xml
@@ -139,7 +139,32 @@
       <param name="dest.filename" value="${guava.name}.jar"/>
       <param name="license.use.apache" value="true"/>
     </antcall>
-    
+
+    <!--  log4j -->
+    <property name="log4j.version" value="2.7"/>
+    <property name="log4j-api.name" value="log4j-api"/>
+    <property name="log4j-core.name" value="log4j-core"/>
+    <antcall target="download-dependency">
+      <param name="name" value="${log4j-api.name}"/>
+      <param name="src.server" value="${maven.search.url}"/>
+      <param name="src.folder" value="org/apache/logging/log4j/${log4j-api.name}/${log4j.version}"/>
+      <param name="src.filename" value="${log4j-api.name}-${log4j.version}.jar"/>
+      <param name="src.checksum" value="to-be-updated"/>
+      <param name="dest.folder" value=""/>
+      <param name="dest.filename" value="${log4j-api.name}.jar"/>
+      <param name="license.use.apache" value="true"/>
+    </antcall>
+    <antcall target="download-dependency">
+      <param name="name" value="${log4j-core.name}"/>
+      <param name="src.server" value="${maven.search.url}"/>
+      <param name="src.folder" value="org/apache/logging/log4j/${log4j-core.name}/${log4j.version}"/>
+      <param name="src.filename" value="${log4j-core.name}-${log4j.version}.jar"/>
+      <param name="src.checksum" value="to-be-updated"/>
+      <param name="dest.folder" value=""/>
+      <param name="dest.filename" value="${log4j-core.name}.jar"/>
+      <param name="license.use.apache" value="true"/>
+    </antcall>
+
     <!--  jburg -->
     <property name="jburg.name" value="jburg"/>
     <property name="jburg.version" value="1.10.2"/>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/863d0013/compiler/src/test/downloads.xml
----------------------------------------------------------------------
diff --git a/compiler/src/test/downloads.xml b/compiler/src/test/downloads.xml
index 467685a..4a2c370 100644
--- a/compiler/src/test/downloads.xml
+++ b/compiler/src/test/downloads.xml
@@ -51,7 +51,7 @@
         they are each downloaded only if they don't already exist. 
     -->
     
-	<target name="main" depends="prepare, junit-jar, commons-compress-jar, commons-lang3-jar"
+	<target name="main" depends="prepare, junit-jar, log4j-api-jar, log4j-core-jar,commons-compress-jar,
commons-lang3-jar"
 		    description="Downloads all the required thirdparty JARs"/>
 
     <target name="prepare" >
@@ -138,6 +138,58 @@
     </target>
 
     <!--
+        log4j
+    -->
+
+    <target name="log4j-core-jar-check" description="Checks if log4j-core JAR exists.">
+        <condition property="log4j-core.jar.exists">
+            <and>
+                <available file="${external.lib.dir}/log4j-core-2.7.jar"/>
+            </and>
+        </condition>
+    </target>
+
+    <target name="log4j-core-jar" depends="log4j-core-jar-check" unless="log4j-core.jar.exists"
+            description="Copies the log4j-core JAR to the lib directory.">
+        <echo message="Obtaining lib/external/log4j-core-2.7.jar"/>
+        <antcall target="log4j-core-download-jar"/>
+    </target>
+
+    <target name="log4j-core-download-jar" depends="log4j-core-jar-check" unless="log4j-core.jar.exists"
+            description="Downloads the log4j-core jar.">
+        <antcall target="download-jar">
+            <param name="srcUrl" value="http://search.maven.org/remotecontent?filepath=org/apache/logging/log4j/log4j-core/2.7"/>
+            <param name="srcJarFile" value="log4j-core-2.7.jar"/>
+            <param name="destDir" value="${external.lib.dir}"/>
+            <param name="destJarFile" value="log4j-core-2.7.jar"/>
+        </antcall>
+    </target>
+
+    <target name="log4j-api-jar-check" description="Checks if log4j-api JAR exists.">
+        <condition property="log4j-api.jar.exists">
+            <and>
+                <available file="${external.lib.dir}/log4j-api-2.7.jar"/>
+            </and>
+        </condition>
+    </target>
+
+    <target name="log4j-api-jar" depends="log4j-api-jar-check" unless="log4j-api.jar.exists"
+            description="Copies the log4j-api JAR to the lib directory.">
+        <echo message="Obtaining lib/external/log4j-api-2.7.jar"/>
+        <antcall target="log4j-api-download-jar"/>
+    </target>
+
+    <target name="log4j-api-download-jar" depends="log4j-api-jar-check" unless="log4j-api.jar.exists"
+            description="Downloads the log4j-api jar.">
+        <antcall target="download-jar">
+            <param name="srcUrl" value="http://search.maven.org/remotecontent?filepath=org/apache/logging/log4j/log4j-api/2.7"/>
+            <param name="srcJarFile" value="log4j-api-2.7.jar"/>
+            <param name="destDir" value="${external.lib.dir}"/>
+            <param name="destJarFile" value="log4j-api-2.7.jar"/>
+        </antcall>
+    </target>
+
+    <!--
         commons-compress
     -->
 


Mime
View raw message