Author: xavier
Date: Fri Feb 29 05:36:38 2008
New Revision: 632319
URL: http://svn.apache.org/viewvc?rev=632319&view=rev
Log:
TASK: Remove ivy-core.jar (IVY-756)
Modified:
ant/ivy/core/trunk/build-release.xml
ant/ivy/core/trunk/build.xml
ant/ivy/core/trunk/ivy.xml
Modified: ant/ivy/core/trunk/build-release.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/build-release.xml?rev=632319&r1=632318&r2=632319&view=diff
==============================================================================
--- ant/ivy/core/trunk/build-release.xml (original)
+++ ant/ivy/core/trunk/build-release.xml Fri Feb 29 05:36:38 2008
@@ -104,7 +104,6 @@
<zipfileset dir="${basedir}"
includes="build-for-bin-distrib.xml"
fullpath="${snapshot.full.name}/build.xml"/>
<zipfileset dir="${artifacts.build.dir}/jars"
includes="${final.name}"
fullpath="${snapshot.full.name}/ivy-${build.version}.jar"/>
- <zipfileset dir="${artifacts.build.dir}/jars"
includes="${final.core.name}"
fullpath="${snapshot.full.name}/ivy-core-${build.version}.jar"/>
</zip>
<tar destfile="${distrib.dir}/${snapshot.full.name}-bin.tar.gz"
compression="gzip" longfile="gnu">
@@ -127,7 +126,6 @@
<zipfileset dir="${artifacts.build.dir}"
includes="ivy.xml" fullpath="${snapshot.full.name}/ivy.xml"/>
<zipfileset dir="${artifacts.build.dir}/jars"
includes="${final.name}"
fullpath="${snapshot.full.name}/ivy-${build.version}.jar"/>
- <zipfileset dir="${artifacts.build.dir}/jars"
includes="${final.core.name}"
fullpath="${snapshot.full.name}/ivy-core-${build.version}.jar"/>
<zipfileset dir="${build.dir}/lib"
prefix="${snapshot.full.name}/lib" excludes="ant-*.jar" />
</zip>
Modified: ant/ivy/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/build.xml?rev=632319&r1=632318&r2=632319&view=diff
==============================================================================
--- ant/ivy/core/trunk/build.xml (original)
+++ ant/ivy/core/trunk/build.xml Fri Feb 29 05:36:38 2008
@@ -23,7 +23,6 @@
<property file="build.properties" />
<property name="final.name" value="ivy.jar" />
- <property name="final.core.name" value="ivy-core.jar" />
<target name="init-ivy-user-home" unless="ivy.use.local.home">
<condition property="ivy.home" value="${env.IVY_HOME}">
@@ -324,29 +323,9 @@
<fileset dir="${ant.classes.build.dir}" />
<fileset dir="${optional.classes.build.dir}" />
</jar>
- <jar destfile="${artifacts.build.dir}/jars/${final.core.name}">
- <metainf dir="${basedir}" includes="LICENSE,NOTICE" />
- <manifest>
- <attribute name="Specification-Title" value="Apache Ivy Core
(without Ant tasks)" />
- <attribute name="Specification-Version"
value="${build.version}" />
- <attribute name="Specification-Vendor" value="Apache Software
Foundation" />
- <attribute name="Implementation-Title" value="org.apache.ivy"
/>
- <attribute name="Implementation-Version"
value="${build.version}" />
- <attribute name="Implementation-Vendor" value="Apache Software
Foundation" />
- <attribute name="Implementation-Vendor-Id" value="org.apache"
/>
- <attribute name="Build-Version" value="${build.version}" />
- </manifest>
- <fileset dir="${core.classes.build.dir}" />
- <fileset dir="${optional.classes.build.dir}" />
- </jar>
<!-- copy main jar to ease its use as an OSGi bundle -->
<copy file="${artifacts.build.dir}/jars/${final.name}"
tofile="${artifacts.build.dir}/org.apache.ivy_${bundle.version}.jar" />
- <echo file="${artifacts.build.dir}/readme.txt">The Ivy jars
explained${line.separator}
-${line.separator}
-${final.name} The full Ivy jar, including all Ivy classes.${line.separator}
-${final.core.name} The Ivy core, eg everything but classes dependent on
Ant.${line.separator}
- </echo>
<!-- clean generated module properties file -->
<delete file="${core.classes.build.dir}/module.properties" />
@@ -521,16 +500,6 @@
<target name="sources" depends="default-version" description="Create
source archive files">
<mkdir dir="${artifacts.build.dir}/sources/"/>
<jar destfile="${artifacts.build.dir}/sources/${final.name}">
- <metainf dir="${basedir}" includes="LICENSE,NOTICE" />
- <manifest>
- <attribute name="Specification-Title" value="Apache Ivy
Sources" />
- <attribute name="Specification-Version"
value="${build.version}" />
- <attribute name="Specification-Vendor" value="Apache Software
Foundation" />
- </manifest>
- <fileset dir="${src.dir}" />
- </jar>
- <!-- TODO : we should restrict sources files to the core only -->
- <jar destfile="${artifacts.build.dir}/sources/${final.core.name}">
<metainf dir="${basedir}" includes="LICENSE,NOTICE" />
<manifest>
<attribute name="Specification-Title" value="Apache Ivy
Sources" />
Modified: ant/ivy/core/trunk/ivy.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/ivy.xml?rev=632319&r1=632318&r2=632319&view=diff
==============================================================================
--- ant/ivy/core/trunk/ivy.xml (original)
+++ ant/ivy/core/trunk/ivy.xml Fri Feb 29 05:36:38 2008
@@ -22,24 +22,23 @@
status="integration"
/>
<configurations>
- <conf name="core" description="only ivy core, without ant tasks
and any dependencies"/>
+ <conf name="core" description="only ivy jar, without any
dependencies"/>
<conf name="httpclient" extends="core" description="core +
optional httpclient for better http handling"/>
<conf name="oro" extends="core" description="to use optional
glob matcher"/>
<conf name="vfs" extends="core" description="core + optional
VirtualFileSystem(VFS) support" />
<conf name="sftp" extends="core" description="core + optional
SFTP support" />
<conf name="standalone" extends="core" description="to launch
in standalone mode (from command line)"/>
- <conf name="default" description="full ivy with all
dependencies"/>
+ <conf name="ant" extends="core" description="core + ant jar
provided as a dependency"/>
+ <conf name="default" extends="core" description="full ivy with
all dependencies"/>
<conf name="test" description="dependencies used for junit
testing ivy" visibility="private" />
<conf name="source" description="ivy sources" />
</configurations>
<publications>
- <artifact name="ivy" type="jar" conf="default"/>
- <artifact name="ivy-core" type="jar" conf="core"/>
+ <artifact name="ivy" type="jar" conf="core"/>
<artifact name="ivy" type="source" ext="jar" conf="source"/>
- <artifact name="ivy-core" type="source" ext="jar"
conf="source"/>
</publications>
<dependencies>
- <dependency org="ant" name="ant" rev="1.6" conf="default"/>
+ <dependency org="ant" name="ant" rev="1.6"
conf="default,ant->default"/>
<dependency org="commons-httpclient" name="commons-httpclient"
rev="3.0" conf="default,httpclient->runtime,master" />
<dependency org="commons-cli" name="commons-cli" rev="1.0"
conf="default,standalone->runtime,master" />
<dependency org="oro" name="oro" rev="2.0.8"
conf="default,oro->default"/>
