diff options
| author | Artur Signell <artur@vaadin.com> | 2013-06-10 20:15:35 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-06-10 20:21:56 +0300 |
| commit | 37bc9e41db0278f42263452e12a8b3fc87b664ba (patch) | |
| tree | ec48ab05ece102bd43e727da253030dac26475b3 /build/common.xml | |
| parent | d9becf9523fdd71abb1b93072a76df163b9dd2c0 (diff) | |
| download | vaadin-framework-37bc9e41db0278f42263452e12a8b3fc87b664ba.tar.gz vaadin-framework-37bc9e41db0278f42263452e12a8b3fc87b664ba.zip | |
Reformatted using Ant editor (#12040)
Change-Id: If8afd65d5905302c64f12ef7f76ee7e63073c474
Diffstat (limited to 'build/common.xml')
| -rw-r--r-- | build/common.xml | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/build/common.xml b/build/common.xml index ee60c1ff42..39f3ee7d9f 100644 --- a/build/common.xml +++ b/build/common.xml @@ -1,17 +1,13 @@ <?xml version="1.0"?> -<project xmlns:antcontrib="antlib:net.sf.antcontrib" - xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:ivy="antlib:org.apache.ivy.ant" - name="common" basedir="../" default="init-deps"> +<project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:artifact="antlib:org.apache.maven.artifact.ant" xmlns:ivy="antlib:org.apache.ivy.ant" name="common" basedir="../" default="init-deps"> <property name="ivy.install.version" value="2.2.0" /> <property name="ivy.jar.name" value="ivy-${ivy.install.version}.jar" /> <property name="ivy.jar.dir" value="${user.home}/.ant/lib" /> <property name="ivy.jar.file" value="${ivy.jar.dir}/${ivy.jar.name}" /> - <target name="init-deps" - description="Configure Ivy dependency management and load common task definitions" - depends="init-taskdefs" unless="deps.initialized"> + <target name="init-deps" description="Configure Ivy dependency management and load common task definitions" depends="init-taskdefs" unless="deps.initialized"> <property name="deps.initialized" value="1" /> </target> @@ -23,26 +19,20 @@ <target name="ivy-download" unless="ivy.installed"> <mkdir dir="${ivy.jar.dir}" /> - <get - src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" - dest="${ivy.jar.file}" usetimestamp="true" /> + <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" dest="${ivy.jar.file}" usetimestamp="true" /> </target> - <target name="ivy-configure" depends="check-ivy-installed" - unless="deps.initialized"> + <target name="ivy-configure" depends="check-ivy-installed" unless="deps.initialized"> <!-- Ivy task definitions --> - <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" - classpath="${ivy.jar.file}" /> + <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${ivy.jar.file}" /> <!-- Ivy settings --> - <property name="ivy.settings.file" - value="${project.root}/build/ivy/ivysettings.xml" /> + <property name="ivy.settings.file" value="${project.root}/build/ivy/ivysettings.xml" /> <ivy:configure /> </target> <target name="init-taskdefs" depends="ivy-configure" unless="deps.initialized"> <echo>Loading Ant tasks</echo> - <ivy:resolve file="${project.root}/build/ivy/ivy.xml" - conf="taskdefs" /> + <ivy:resolve file="${project.root}/build/ivy/ivy.xml" conf="taskdefs" /> <ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" /> <taskdef resource="emma_ant.properties" classpathref="taskdefs.classpath" /> @@ -50,16 +40,13 @@ override) --> <!-- Note that we have to use a namespace to avoid clash when running sub-ant. --> - <taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml" - classpathref="taskdefs.classpath" /> + <taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml" classpathref="taskdefs.classpath" /> <!-- ant contrib for Maven integration --> - <taskdef resource="org/apache/maven/artifact/ant/antlib.xml" - uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" /> + <taskdef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" /> <!-- jarjar --> - <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" - classpathref="taskdefs.classpath" /> + <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="taskdefs.classpath" /> </target> |