/[Apache-SVN]
ViewVC logotype

Revision 1592626


Jump to revision: Previous Next
Author: maartenc
Date: Mon May 5 20:02:17 2014 UTC (9 years, 11 months ago)
Changed paths: 38
Log Message:
Merging several changes from trunk to the 2.4.x branch.

Changed paths

Path Details
Directoryant/ivy/core/branches/2.4.x/ modified , props changed
Directoryant/ivy/core/branches/2.4.x/CHANGES.txt modified , text changed
Directoryant/ivy/core/branches/2.4.x/doc/concept.html modified , text changed
Directoryant/ivy/core/branches/2.4.x/src/java/org/apache/ivy/ant/ConvertManifestTask.java modified , text changed
Directoryant/ivy/core/branches/2.4.x/src/java/org/apache/ivy/core/module/id/MatcherLookup.java
(Copied from ant/ivy/core/trunk/src/java/org/apache/ivy/core/module/id/MatcherLookup.java, r1592238)
added
Directoryant/ivy/core/branches/2.4.x/src/java/org/apache/ivy/core/module/id/ModuleRules.java modified , text changed
Directoryant/ivy/core/branches/2.4.x/src/java/org/apache/ivy/core/pack/OsgiBundlePacking.java
(Copied from ant/ivy/core/trunk/src/java/org/apache/ivy/core/pack/OsgiBundlePacking.java, r1587305)
added
Directoryant/ivy/core/branches/2.4.x/src/java/org/apache/ivy/core/pack/Pack200Packing.java modified , text changed
Directoryant/ivy/core/branches/2.4.x/src/java/org/apache/ivy/core/pack/PackingRegistry.java modified , text changed
Directoryant/ivy/core/branches/2.4.x/src/java/org/apache/ivy/core/pack/ZipPacking.java modified , text changed
Directoryant/ivy/core/branches/2.4.x/src/java/org/apache/ivy/osgi/core/BundleInfoAdapter.java modified , text changed
Directoryant/ivy/core/branches/2.4.x/src/java/org/apache/ivy/osgi/core/ManifestParser.java modified , text changed
Directoryant/ivy/core/branches/2.4.x/src/java/org/apache/ivy/osgi/core/OSGiManifestParser.java modified , text changed
Directoryant/ivy/core/branches/2.4.x/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java modified , text changed
Directoryant/ivy/core/branches/2.4.x/src/java/org/apache/ivy/plugins/conflict/LatestConflictManager.java modified , text changed
Directoryant/ivy/core/branches/2.4.x/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java modified , text changed
Directoryant/ivy/core/branches/2.4.x/src/java/org/apache/ivy/util/FileUtil.java modified , text changed
Directoryant/ivy/core/branches/2.4.x/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java modified , text changed
Directoryant/ivy/core/branches/2.4.x/test/java/org/apache/ivy/osgi/p2/P2DescriptorTest.java modified , text changed
Directoryant/ivy/core/branches/2.4.x/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java modified , text changed
Directoryant/ivy/core/branches/2.4.x/test/java/org/apache/ivy/plugins/conflict/ivysettings-evicted.xml
(Copied from ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-evicted.xml, r1592238)
added
Directoryant/ivy/core/branches/2.4.x/test/repositories/IVY-1399/
(Copied from ant/ivy/core/trunk/test/repositories/IVY-1399, r1592238)
added
Directoryant/ivy/core/branches/2.4.x/test/repositories/IVY-1399/MyCompany/
(Copied from ant/ivy/core/trunk/test/repositories/IVY-1399/MyCompany, r1592238)
replaced
Directoryant/ivy/core/branches/2.4.x/test/repositories/IVY-1399/MyCompany/A/
(Copied from ant/ivy/core/trunk/test/repositories/IVY-1399/MyCompany/A, r1592238)
replaced
Directoryant/ivy/core/branches/2.4.x/test/repositories/IVY-1399/MyCompany/A/ivy-1.xml
(Copied from ant/ivy/core/trunk/test/repositories/IVY-1399/MyCompany/A/ivy-1.xml, r1592238)
replaced
Directoryant/ivy/core/branches/2.4.x/test/repositories/IVY-1399/MyCompany/B/
(Copied from ant/ivy/core/trunk/test/repositories/IVY-1399/MyCompany/B, r1592238)
replaced
Directoryant/ivy/core/branches/2.4.x/test/repositories/IVY-1399/MyCompany/B/ivy-1.xml
(Copied from ant/ivy/core/trunk/test/repositories/IVY-1399/MyCompany/B/ivy-1.xml, r1592238)
replaced
Directoryant/ivy/core/branches/2.4.x/test/repositories/IVY-1399/MyCompany/C/
(Copied from ant/ivy/core/trunk/test/repositories/IVY-1399/MyCompany/C, r1592238)
replaced
Directoryant/ivy/core/branches/2.4.x/test/repositories/IVY-1399/MyCompany/C/ivy-1.xml
(Copied from ant/ivy/core/trunk/test/repositories/IVY-1399/MyCompany/C/ivy-1.xml, r1592238)
replaced
Directoryant/ivy/core/branches/2.4.x/test/repositories/IVY-1399/MyCompany/target/
(Copied from ant/ivy/core/trunk/test/repositories/IVY-1399/MyCompany/target, r1592238)
replaced
Directoryant/ivy/core/branches/2.4.x/test/repositories/IVY-1399/MyCompany/target/ivy-1.xml
(Copied from ant/ivy/core/trunk/test/repositories/IVY-1399/MyCompany/target/ivy-1.xml, r1592238)
replaced
Directoryant/ivy/core/branches/2.4.x/test/repositories/IVY-1399/OtherCompany/
(Copied from ant/ivy/core/trunk/test/repositories/IVY-1399/OtherCompany, r1592238)
replaced
Directoryant/ivy/core/branches/2.4.x/test/repositories/IVY-1399/OtherCompany/prefers-later/
(Copied from ant/ivy/core/trunk/test/repositories/IVY-1399/OtherCompany/prefers-later, r1592238)
replaced
Directoryant/ivy/core/branches/2.4.x/test/repositories/IVY-1399/OtherCompany/prefers-later/ivy-1.xml
(Copied from ant/ivy/core/trunk/test/repositories/IVY-1399/OtherCompany/prefers-later/ivy-1.xml, r1592238)
replaced
Directoryant/ivy/core/branches/2.4.x/test/repositories/IVY-1399/conflicting-dependency/
(Copied from ant/ivy/core/trunk/test/repositories/IVY-1399/conflicting-dependency, r1592238)
replaced
Directoryant/ivy/core/branches/2.4.x/test/repositories/IVY-1399/conflicting-dependency/dep/
(Copied from ant/ivy/core/trunk/test/repositories/IVY-1399/conflicting-dependency/dep, r1592238)
replaced
Directoryant/ivy/core/branches/2.4.x/test/repositories/IVY-1399/conflicting-dependency/dep/ivy-1.xml
(Copied from ant/ivy/core/trunk/test/repositories/IVY-1399/conflicting-dependency/dep/ivy-1.xml, r1592238)
replaced
Directoryant/ivy/core/branches/2.4.x/test/repositories/IVY-1399/conflicting-dependency/dep/ivy-2.xml
(Copied from ant/ivy/core/trunk/test/repositories/IVY-1399/conflicting-dependency/dep/ivy-2.xml, r1592238)
replaced

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26