Roman Nefyodov  committed fa6de64

rewrite ivy dependencies, don't export fj

  • Participants
  • Parent commits efb35d9

Comments (0)

Files changed (1)

-        <conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" extends="runtime,master"/>
-        <conf name="master" visibility="public" description="contains only the artifact published by this module itself, with no transitive dependencies"/>
-        <conf name="compile" visibility="public" description="this is the default scope, used if none is specified. Compile dependencies are available in all classpaths."/>
-        <conf name="provided" visibility="public" description="this is much like compile, but indicates you expect the JDK or a container to provide it. It is only available on the compilation classpath, and is not transitive."/>
-        <conf name="runtime" visibility="public" description="this scope indicates that the dependency is not required for compilation, but is for execution. It is in the runtime and test classpaths, but not the compile classpath." extends="compile"/>
-        <conf name="test" visibility="private" description="this scope indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases." extends="runtime"/>
-        <conf name="system" visibility="public" description="this scope is similar to provided except that you have to provide the JAR which contains it explicitly. The artifact is always available and is not looked up in a repository."/>
-        <conf name="sources" visibility="public" description="this configuration contains the source artifact of this module, if any."/>
-        <conf name="javadoc" visibility="public" description="this configuration contains the javadoc artifact of this module, if any."/>
-        <conf name="optional" visibility="public" description="contains all optional dependencies"/>
+        <conf name="master"/>
+        <conf name="compile" visibility="private"/>
+        <conf name="runtime"/>
+        <conf name="default" extends="runtime,master"/>
+        <conf name="test" visibility="private" extends="runtime"/>
+        <conf name="sources"/>
         <artifact name="bolts" type="source" ext="jar" conf="sources" m:classifier="sources"/>
+    <dependencies defaultconfmapping="compile->master;runtime->default;sources->sources">
+        <dependency org="junit" name="junit" rev="4.5" conf="compile;test->default;sources"/>
+        <dependency org="log4j" name="log4j" rev="1.2.17"/>
+        <dependency org="commons-collections" name="commons-collections" rev="3.2.1"/>
+        <dependency org="asm" name="asm-all" rev="3.2"/>
+        <dependency org="org.objenesis" name="objenesis" rev="1.2"/>
-    <dependencies>
-        <dependency org="junit" name="junit" rev="4.5" conf="test->runtime(*),master(*);sources->sources(*)"/>
-        <dependency org="log4j" name="log4j" rev="1.2.17" conf="compile->master(*)"/>
-        <dependency org="org.functionaljava" name="fj" rev="2.19" conf="compile->master;sources->sources(*)"/>
-        <dependency org="commons-collections" name="commons-collections" rev="3.2.1" conf="compile->master;sources->sources(*)"/>
-        <dependency org="asm" name="asm-all" rev="3.2" conf="compile->master;sources->sources(*)"/>
-        <dependency org="org.objenesis" name="objenesis" rev="1.2" conf="compile->master(*)"/>
+        <!-- only for compilation, not for runtime -->
+        <dependency org="org.functionaljava" name="fj" rev="2.19" conf="compile;sources"/>