Maarten Coene

Merge 1.9.x branch into master

    • -4
    • +4
    /src/main/org/apache/tools/ant/Main.java
The information of the -nice and -nouserlib flags was not formatted properly.

    • -4
    • +4
    /src/main/org/apache/tools/ant/Main.java
NEW: The buildlist task can now have `root` and `leaf` subelements to specify the organisation (and other attributes) of the root and leaf modules

    • -50
    • +167
    /src/java/org/apache/ivy/ant/IvyBuildList.java
Fixed ModuleDescriptorMemoryCacheTest

FIX: ModuleDescriptorMemoryCache didn't detect outdated entries when Ivy file was updated in the cache by another process

Added short comment in the release notes for the thread-safety fixes made some time ago

The <modified> selector has a new built-in algorithm 'lastmodified' which computes a value based upon the lastmodified time of the file.

FIX: Removed fetchedSet field from ResolveEngine because this was causing issues when the same ResolveEngine instance was used by multiple threads. The fetchedSet is now passed around as parameter between the 'fetch' methods of this class.

FIX: ModuleDescriptorMemoryCache isn't thread safe resulting in corruption of the LinkedHashMap internal structure when multiple threads simultaneously read/write to this cache.

Merge from master

typo fix

typo fix

Removed unused import.

Removed unused import.

Delay the class initialization of the test classes untill they are passed to JUnit.

Added getter for the ResolveOptions.

FIX: The method hasIvyListener in org.apache.ivy.core.event.EventManager always returned false

Revert 'Optimize imports' done by IntelliJ

Fix stackoverflow

Merge remote-tracking branch 'origin/master'

FIX: Local conflict manager didn't handle deeper conflicts in transitive dependencies (IVY-1404)

    • -0
    • +30
    /test/repositories/1/IVY-1404/M1/ivys/ivy-1.0.xml
    • -0
    • +30
    /test/repositories/1/IVY-1404/M2/ivys/ivy-1.0.xml
    • -0
    • +29
    /test/repositories/1/IVY-1404/M3/ivys/ivy-1.0.xml
    • -0
    • +29
    /test/repositories/1/IVY-1404/M4/ivys/ivy-1.0.xml
Throw an IllegalStateException when retrieving the resolutionCacheRoot on the DefaultResolutionCacheManager if the basedir (or IvySettings) is not set (IVY-1482)

Reverted import optimization by IntelliJ

Made the maven 'test' configuration public so we can use the test-jar as dependency (IVY-1444)

Fix NullPointerException in dependencytree with no dependencies (IVY-1539)

    • -0
    • +26
    /test/java/org/apache/ivy/ant/ivy-empty.xml
Revert optimize imports by IntelliJ

escape special characters

FIX: checkIfChanged is not settable attribute for checkdepsupdate ant task (IVY-1549)

We are 2016 now ...