← Back to branch summary

~ubuntu-branches/ubuntu/lucid/ivy/lucid

~ubuntu-branches/ubuntu/lucid/ivy/lucid

Viewing all changes in revision 6.

Committer: Bazaar Package Importer
Author(s): Thierry Carrez
Date: 2009-11-10 11:29:52 UTC
mfrom: (3.2.2 sid)
Revision ID: james.westby@ubuntu.com-20091110112952-mtq3cumw08emzgv3

Tags: 2.1.0~rc2-3ubuntu1

* Merge from debian testing, remaining changes:
- debian/build.xml: Build java2-code to match runtime dependency

files added:
debian/README.Debian

debian/ivy-doc.doc-base.api

debian/ivy.poms

debian/maven.rules

debian/pom.xml

src/java/org/apache/ivy/core/event/retrieve/EndRetrieveArtifactEvent.java

src/java/org/apache/ivy/core/event/retrieve/RetrieveArtifactEvent.java

src/java/org/apache/ivy/core/event/retrieve/StartRetrieveArtifactEvent.java

src/java/org/apache/ivy/core/module/descriptor/ConfigurationGroup.java

src/java/org/apache/ivy/core/module/descriptor/ConfigurationIntersection.java

files removed:
debian/ivy-doc.doc-base

debian/ivy-doc.docs

files modified:
CHANGES.txt

NOTICE

RELEASE_NOTES

debian/build.xml

debian/changelog

debian/control

debian/rules

debian/watch

ivy.xml

src/java/org/apache/ivy/Main.java

src/java/org/apache/ivy/ant/IvyAntSettings.java

src/java/org/apache/ivy/ant/IvyBuildNumber.java

src/java/org/apache/ivy/ant/IvyConfigure.java

src/java/org/apache/ivy/ant/IvyFindRevision.java

src/java/org/apache/ivy/ant/IvyInfo.java

src/java/org/apache/ivy/ant/IvyListModules.java

src/java/org/apache/ivy/ant/IvyPostResolveTask.java

src/java/org/apache/ivy/ant/IvyReport.java

src/java/org/apache/ivy/ant/IvyTask.java

src/java/org/apache/ivy/core/IvyPatternHelper.java

src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java

src/java/org/apache/ivy/core/cache/ParserSettingsMonitor.java

src/java/org/apache/ivy/core/module/descriptor/Configuration.java

src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java

src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java

src/java/org/apache/ivy/core/module/descriptor/MDArtifact.java

src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java

src/java/org/apache/ivy/core/report/ArtifactDownloadReport.java

src/java/org/apache/ivy/core/report/ConfigurationResolveReport.java

src/java/org/apache/ivy/core/report/ResolveReport.java

src/java/org/apache/ivy/core/resolve/IvyNode.java

src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java

src/java/org/apache/ivy/core/resolve/IvyNodeUsage.java

src/java/org/apache/ivy/core/resolve/ResolveEngine.java

src/java/org/apache/ivy/core/resolve/VisitNode.java

src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java

src/java/org/apache/ivy/core/settings/typedef.properties

src/java/org/apache/ivy/plugins/namespace/Namespace.java

src/java/org/apache/ivy/plugins/parser/ParserSettings.java

src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java

src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java

src/java/org/apache/ivy/plugins/report/XmlReportParser.java

src/java/org/apache/ivy/plugins/repository/Repository.java

src/java/org/apache/ivy/plugins/repository/sftp/SFTPRepository.java

src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java

src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java

src/java/org/apache/ivy/plugins/resolver/DependencyResolver.java

src/java/org/apache/ivy/plugins/resolver/FileSystemResolver.java

src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java

src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java

src/java/org/apache/ivy/plugins/resolver/packager/PackagerCacheEntry.java

src/java/org/apache/ivy/plugins/resolver/util/ResolverHelper.java

src/java/org/apache/ivy/plugins/version/VersionMatcher.java

src/java/org/apache/ivy/util/filter/FilterHelper.java

src/java/org/apache/ivy/util/url/HttpClientHandler.java

Show diffs side-by-side

added added

removed removed

debian/README.Debian

debian/build.xml

debian/changelog

debian/ivy-doc.doc-base

debian/ivy-doc.doc-base.api

debian/ivy-doc.docs

debian/ivy.poms

debian/maven.rules

src/java/org/apache/ivy/Main.java

src/java/org/apache/ivy/ant/IvyAntSettings.java

src/java/org/apache/ivy/ant/IvyBuildNumber.java

src/java/org/apache/ivy/ant/IvyConfigure.java

src/java/org/apache/ivy/ant/IvyFindRevision.java

src/java/org/apache/ivy/ant/IvyInfo.java

src/java/org/apache/ivy/ant/IvyListModules.java

src/java/org/apache/ivy/ant/IvyPostResolveTask.java

src/java/org/apache/ivy/ant/IvyReport.java

src/java/org/apache/ivy/ant/IvyTask.java

src/java/org/apache/ivy/core/IvyPatternHelper.java

src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java

src/java/org/apache/ivy/core/cache/ParserSettingsMonitor.java

src/java/org/apache/ivy/core/event/retrieve/EndRetrieveArtifactEvent.java

src/java/org/apache/ivy/core/event/retrieve/RetrieveArtifactEvent.java

src/java/org/apache/ivy/core/event/retrieve/StartRetrieveArtifactEvent.java

src/java/org/apache/ivy/core/module/descriptor/Configuration.java

src/java/org/apache/ivy/core/module/descriptor/ConfigurationGroup.java

src/java/org/apache/ivy/core/module/descriptor/ConfigurationIntersection.java

src/java/org/apache/ivy/core/module/descriptor/DefaultDependencyDescriptor.java

src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java

src/java/org/apache/ivy/core/module/descriptor/MDArtifact.java

src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java

src/java/org/apache/ivy/core/report/ArtifactDownloadReport.java

src/java/org/apache/ivy/core/report/ConfigurationResolveReport.java

src/java/org/apache/ivy/core/report/ResolveReport.java

src/java/org/apache/ivy/core/resolve/IvyNode.java

src/java/org/apache/ivy/core/resolve/IvyNodeCallers.java

src/java/org/apache/ivy/core/resolve/IvyNodeUsage.java

src/java/org/apache/ivy/core/resolve/ResolveEngine.java

src/java/org/apache/ivy/core/resolve/VisitNode.java

src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java

src/java/org/apache/ivy/core/settings/typedef.properties

src/java/org/apache/ivy/plugins/namespace/Namespace.java

src/java/org/apache/ivy/plugins/parser/ParserSettings.java

src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java

src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java

src/java/org/apache/ivy/plugins/report/XmlReportParser.java

src/java/org/apache/ivy/plugins/repository/Repository.java

src/java/org/apache/ivy/plugins/repository/sftp/SFTPRepository.java

src/java/org/apache/ivy/plugins/repository/ssh/SshCache.java

src/java/org/apache/ivy/plugins/resolver/AbstractResolver.java

src/java/org/apache/ivy/plugins/resolver/DependencyResolver.java

src/java/org/apache/ivy/plugins/resolver/FileSystemResolver.java

src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java

src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java

src/java/org/apache/ivy/plugins/resolver/packager/PackagerCacheEntry.java

src/java/org/apache/ivy/plugins/resolver/util/ResolverHelper.java

src/java/org/apache/ivy/plugins/version/VersionMatcher.java

src/java/org/apache/ivy/util/filter/FilterHelper.java

src/java/org/apache/ivy/util/url/HttpClientHandler.java

Older »