You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ivy-commits@incubator.apache.org by xa...@apache.org on 2007/04/10 10:12:35 UTC
svn commit: r527083 - in /incubator/ivy/core/trunk: CHANGES.txt MANIFEST.MF
build-release.xml build.xml version.properties
Author: xavier
Date: Tue Apr 10 03:12:33 2007
New Revision: 527083
URL: http://svn.apache.org/viewvc?view=rev&rev=527083
Log:
IMPROVE: OSGIfy ivy artifacts (IVY-464) (thanks to Costin Leau)
Added:
incubator/ivy/core/trunk/MANIFEST.MF
Modified:
incubator/ivy/core/trunk/CHANGES.txt
incubator/ivy/core/trunk/build-release.xml
incubator/ivy/core/trunk/build.xml
incubator/ivy/core/trunk/version.properties
Modified: incubator/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/CHANGES.txt?view=diff&rev=527083&r1=527082&r2=527083
==============================================================================
--- incubator/ivy/core/trunk/CHANGES.txt (original)
+++ incubator/ivy/core/trunk/CHANGES.txt Tue Apr 10 03:12:33 2007
@@ -50,6 +50,7 @@
- NEW: Module wide exclude (IVY-431)
- NEW: The default public resolver used is now ibiblio with m2 compatible mode (IVY-463)
+- IMPROVE: OSGIfy ivy artifacts (IVY-464) (thanks to Costin Leau)
- IMPROVE: Let user specify Ivy file when using a post-resolve task (IVY-455)
- IMPROVE: IvyArtifactProperty and IvyArtifactReport tasks should be a post resolve task (IVY-452)
- IMPROVE: Rename ivy configuration in settings to remove ambiguity on configuration meaning (IVY-438)
Added: incubator/ivy/core/trunk/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/MANIFEST.MF?view=auto&rev=527083
==============================================================================
--- incubator/ivy/core/trunk/MANIFEST.MF (added)
+++ incubator/ivy/core/trunk/MANIFEST.MF Tue Apr 10 03:12:33 2007
@@ -0,0 +1,80 @@
+Manifest-Version: 1.0
+Bundle-Name: Ivy
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.apache.ivy
+Bundle-Vendor: Apache Software Foundation
+Bundle-DocURL: http://incubator.apache.org/ivy
+Import-Package: javax.xml.parsers,
+ javax.xml.transform,
+ javax.xml.transform.sax,
+ javax.xml.transform.stream,
+ org.xml.sax,
+ org.xml.sax.ext,
+ org.xml.sax.helpers,
+ com.jcraft.jsch;resolution:=optional,
+ javax.swing;resolution:=optional,
+ javax.swing.event;resolution:=optional,
+ org.apache.commons.cli;resolution:=optional,
+ org.apache.commons.httpclient;resolution:=optional,
+ org.apache.commons.httpclient.methods;resolution:=optional,
+ org.apache.commons.httpclient.params;resolution:=optional,
+ org.apache.commons.httpclient.protocol;resolution:=optional,
+ org.apache.commons.vfs;resolution:=optional,
+ org.apache.commons.vfs.impl;resolution:=optional,
+ org.apache.commons.vfs.provider;resolution:=optional,
+ org.apache.commons.vfs.provider.webdav;resolution:=optional,
+ org.apache.oro.text;resolution:=optional,
+ org.apache.oro.text.regex;resolution:=optional,
+ org.apache.webdav;resolution:=optional,
+ org.apache.tools.ant;resolution:=optional,
+ org.apache.tools.ant.filters;resolution:=optional,
+ org.apache.tools.ant.taskdefs;resolution:=optional,
+ org.apache.tools.ant.types;resolution:=optional,
+ org.apache.tools.ant.util;resolution:=optional
+Export-Package: org.apache.ivy;version="2.0.0",
+ org.apache.ivy.ant;version="2.0.0",
+ org.apache.ivy.core;version="2.0.0",
+ org.apache.ivy.core.cache;version="2.0.0",
+ org.apache.ivy.core.check;version="2.0.0",
+ org.apache.ivy.core.deliver;version="2.0.0",
+ org.apache.ivy.core.event;version="2.0.0",
+ org.apache.ivy.core.event.download;version="2.0.0",
+ org.apache.ivy.core.event.resolve;version="2.0.0",
+ org.apache.ivy.core.install;version="2.0.0",
+ org.apache.ivy.core.module.descriptor;version="2.0.0",
+ org.apache.ivy.core.module.id;version="2.0.0",
+ org.apache.ivy.core.module.status;version="2.0.0",
+ org.apache.ivy.core.publish;version="2.0.0",
+ org.apache.ivy.core.report;version="2.0.0",
+ org.apache.ivy.core.resolve;version="2.0.0",
+ org.apache.ivy.core.retrieve;version="2.0.0",
+ org.apache.ivy.core.search;version="2.0.0",
+ org.apache.ivy.core.settings;version="2.0.0",
+ org.apache.ivy.core.sort;version="2.0.0",
+ org.apache.ivy.plugins;version="2.0.0",
+ org.apache.ivy.plugins.circular;version="2.0.0",
+ org.apache.ivy.plugins.conflict;version="2.0.0",
+ org.apache.ivy.plugins.latest;version="2.0.0",
+ org.apache.ivy.plugins.matcher;version="2.0.0",
+ org.apache.ivy.plugins.namespace;version="2.0.0",
+ org.apache.ivy.plugins.parser;version="2.0.0",
+ org.apache.ivy.plugins.parser.m2;version="2.0.0",
+ org.apache.ivy.plugins.parser.xml;version="2.0.0",
+ org.apache.ivy.plugins.report;version="2.0.0",
+ org.apache.ivy.plugins.repository;version="2.0.0",
+ org.apache.ivy.plugins.repository.file;version="2.0.0",
+ org.apache.ivy.plugins.repository.sftp;version="2.0.0",
+ org.apache.ivy.plugins.repository.ssh;version="2.0.0",
+ org.apache.ivy.plugins.repository.url;version="2.0.0",
+ org.apache.ivy.plugins.repository.vfs;version="2.0.0",
+ org.apache.ivy.plugins.repository.vsftp;version="2.0.0",
+ org.apache.ivy.plugins.resolver;version="2.0.0",
+ org.apache.ivy.plugins.resolver.util;version="2.0.0",
+ org.apache.ivy.plugins.util;version="2.0.0",
+ org.apache.ivy.plugins.trigger;version="2.0.0",
+ org.apache.ivy.plugins.version;version="2.0.0",
+ org.apache.ivy.tools.analyser;version="2.0.0",
+ org.apache.ivy.util;version="2.0.0",
+ org.apache.ivy.util.extendable;version="2.0.0",
+ org.apache.ivy.util.filter;version="2.0.0",
+ org.apache.ivy.util.url;version="2.0.0"
Modified: incubator/ivy/core/trunk/build-release.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/build-release.xml?view=diff&rev=527083&r1=527082&r2=527083
==============================================================================
--- incubator/ivy/core/trunk/build-release.xml (original)
+++ incubator/ivy/core/trunk/build-release.xml Tue Apr 10 03:12:33 2007
@@ -85,6 +85,7 @@
<zipfileset dir="${basedir}/test/triggers" prefix="${snapshot.full.name}/test/triggers"/>
<zipfileset dir="${basedir}/test/xsl" prefix="${snapshot.full.name}/test/xsl"/>
<zipfileset dir="${src.dir}/org/apache/ivy/plugins/parser/xml" includes="ivy.xsd" fullpath="${snapshot.full.name}/ivy.xsd"/>
+ <zipfileset dir="${basedir}" includes="MANIFEST.MF" fullpath="${snapshot.full.name}/MANIFEST.MF"/>
<zipfileset dir="${basedir}" includes="DISCLAIMER" fullpath="${snapshot.full.name}/DISCLAIMER"/>
<zipfileset dir="${basedir}" includes="NOTICE" fullpath="${snapshot.full.name}/NOTICE"/>
<zipfileset dir="${basedir}" includes="LICENSE" fullpath="${snapshot.full.name}/LICENSE"/>
Modified: incubator/ivy/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/build.xml?view=diff&rev=527083&r1=527082&r2=527083
==============================================================================
--- incubator/ivy/core/trunk/build.xml (original)
+++ incubator/ivy/core/trunk/build.xml Tue Apr 10 03:12:33 2007
@@ -164,6 +164,7 @@
</tstamp>
<property name="version.prefix" value="${target.ivy.version}-local-"/>
<property name="build.version" value="${version.prefix}${pubdate}"/>
+ <property name="bundle.version" value="${target.ivy.bundle.version}"/>
</target>
<!-- =================================================================
@@ -210,13 +211,24 @@
<!-- identify compiled ivy version -->
<echo message="version=${build.version}${line.separator}" file="${classes.build.dir}/module.properties" append="true"/>
<echo message="date=${pubdate}${line.separator}" file="${classes.build.dir}/module.properties" append="true"/>
-
+
<!-- package the two ivy jars -->
<jar destfile="${artifacts.build.dir}/${final.name}"
- basedir="${classes.build.dir}">
+ basedir="${classes.build.dir}"
+ manifest="${basedir}/MANIFEST.MF">
<metainf dir="${basedir}" includes="LICENSE,DISCLAIMER,NOTICE" />
<manifest>
<attribute name="Build-Version" value="${build.version}"/>
+ <attribute name="Bundle-Version" value="${bundle.version}"/>
+ <section name="org/apache/ivy">
+ <attribute name="Extension-name" value="org.apache.ivy" />
+ <attribute name="Specification-Title" value="Apache Ivy" />
+ <attribute name="Specification-Version" value="${build.version}" />
+ <attribute name="Specification-Vendor" value="Apache Software Foundation" />
+ <attribute name="Implementation-Title" value="org.apache.tools.ant" />
+ <attribute name="Implementation-Version" value="${build.version}" />
+ <attribute name="Implementation-Vendor" value="Apache Software Foundation" />
+ </section>
</manifest>
</jar>
<jar destfile="${artifacts.build.dir}/${final.core.name}"
Modified: incubator/ivy/core/trunk/version.properties
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/version.properties?view=diff&rev=527083&r1=527082&r2=527083
==============================================================================
--- incubator/ivy/core/trunk/version.properties (original)
+++ incubator/ivy/core/trunk/version.properties Tue Apr 10 03:12:33 2007
@@ -17,3 +17,4 @@
# * under the License.
# ***************************************************************
target.ivy.version=2.0.0-alpha-1-incubating
+target.ivy.bundle.version=2.0.0.alpha1