Repository: flex-falcon Updated Branches: refs/heads/feature-autobuild/cleanup 863d0013f -> c3396e8f0
get ant build to work again Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c3396e8f Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c3396e8f Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c3396e8f Branch: refs/heads/feature-autobuild/cleanup Commit: c3396e8f01a22f28e4daa3820ea86a0658ccf28b Parents: 863d001 Author: Alex Harui <[email protected]> Authored: Mon Jan 2 09:52:18 2017 -0800 Committer: Alex Harui <[email protected]> Committed: Mon Jan 2 09:52:18 2017 -0800 ---------------------------------------------------------------------- compiler-jx/.classpath | 2 ++ compiler-jx/build.xml | 4 +++- compiler/.classpath | 2 ++ compiler/build.xml | 2 +- compiler/src/main/resources/downloads.xml | 4 ++-- 5 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c3396e8f/compiler-jx/.classpath ---------------------------------------------------------------------- diff --git a/compiler-jx/.classpath b/compiler-jx/.classpath index d249dbd..1847a30 100644 --- a/compiler-jx/.classpath +++ b/compiler-jx/.classpath @@ -13,6 +13,8 @@ <classpathentry kind="lib" path="lib/guava.jar"/> <classpathentry kind="lib" path="lib/flex-tool-api.jar"/> <classpathentry kind="lib" path="lib/junit-4.10.jar"/> + <classpathentry kind="lib" path="../compiler/lib/external/log4j-api.jar"/> + <classpathentry kind="lib" path="../compiler/lib/external/log4j-core.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/COMMONS_COMPRESS"/> <classpathentry kind="output" path="target/classes"/> </classpath> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c3396e8f/compiler-jx/build.xml ---------------------------------------------------------------------- diff --git a/compiler-jx/build.xml b/compiler-jx/build.xml index 86e1917..8c505081 100644 --- a/compiler-jx/build.xml +++ b/compiler-jx/build.xml @@ -67,6 +67,8 @@ <path id="classpath"> <filelist dir="${falcon.lib.dir}/external"> <file name="antlr.jar" /> + <file name="log4j-core.jar" /> + <file name="log4j-api.jar" /> </filelist> <filelist dir="${lib}"> <file name="commons-io.jar" /> @@ -101,7 +103,7 @@ <target name="main" depends="prebuild,compile"> - <property name="jar.classpath" value="commons-io.jar guava.jar ../../lib/external/antlr.jar ../../compiler/lib/external/antlr.jar google/closure-compiler/compiler.jar ../../compiler/lib/compiler.jar ../../lib/compiler.jar" /> + <property name="jar.classpath" value="commons-io.jar guava.jar ../../lib/external/antlr.jar ../../compiler/lib/external/antlr.jar google/closure-compiler/compiler.jar ../../compiler/lib/compiler.jar ../../lib/compiler.jar ../../lib/external/log4j-api.jar ../../compiler/lib/external/log4j-api.jar ../../lib/external/log4j-core.jar ../../compiler/lib/external/log4j-core.jar" /> <copy file="${basedir}/../LICENSE.base" tofile="${classes.dir}/META-INF/LICENSE"/> <copy file="${basedir}/../NOTICE.jx" tofile="${classes.dir}/META-INF/NOTICE"/> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c3396e8f/compiler/.classpath ---------------------------------------------------------------------- diff --git a/compiler/.classpath b/compiler/.classpath index 97b24f0..6f7e755 100644 --- a/compiler/.classpath +++ b/compiler/.classpath @@ -23,5 +23,7 @@ <classpathentry kind="lib" path="lib/external/commons-lang3-3.4.jar"/> <classpathentry kind="lib" path="lib/external/jburg.jar"/> <classpathentry kind="lib" path="lib/external/commons-compress-1.10.jar"/> + <classpathentry kind="lib" path="lib/external/log4j-api.jar"/> + <classpathentry kind="lib" path="lib/external/log4j-core.jar"/> <classpathentry kind="output" path="target/classes"/> </classpath> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c3396e8f/compiler/build.xml ---------------------------------------------------------------------- diff --git a/compiler/build.xml b/compiler/build.xml index 6ee5110..e2d63e1 100644 --- a/compiler/build.xml +++ b/compiler/build.xml @@ -553,7 +553,7 @@ <attribute name="Implementation-Title" value="${manifest.Implementation-Title}"/> <attribute name="Implementation-Version" value="${manifest.Implementation-Version}.${build.number}"/> <attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}"/> - <attribute name="Class-Path" value="external/antlr.jar external/commons-cli.jar external/commons-io.jar external/guava.jar external/lzma-sdk.jar external/flex-tool-api.jar .."/> + <attribute name="Class-Path" value="external/antlr.jar external/log4j-api.jar external/log4j-core.jar external/commons-cli.jar external/commons-io.jar external/guava.jar external/lzma-sdk.jar external/flex-tool-api.jar .."/> <!-- The .. in the line above allows the compiler to load the env.properties file --> </manifest> </jar> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c3396e8f/compiler/src/main/resources/downloads.xml ---------------------------------------------------------------------- diff --git a/compiler/src/main/resources/downloads.xml b/compiler/src/main/resources/downloads.xml index d57abe0..cbd513f 100644 --- a/compiler/src/main/resources/downloads.xml +++ b/compiler/src/main/resources/downloads.xml @@ -149,7 +149,7 @@ <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="src.checksum" value="8c6059adc8248076dfbfec5b875ead3d"/> <param name="dest.folder" value=""/> <param name="dest.filename" value="${log4j-api.name}.jar"/> <param name="license.use.apache" value="true"/> @@ -159,7 +159,7 @@ <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="src.checksum" value="2b63e0e5063fdaccf669a1e26384f3fd"/> <param name="dest.folder" value=""/> <param name="dest.filename" value="${log4j-core.name}.jar"/> <param name="license.use.apache" value="true"/>
