You are viewing a plain text version of this content. The canonical link for it is here.
Posted to easyant-commits@incubator.apache.org by jl...@apache.org on 2012/10/16 18:37:36 UTC

svn commit: r1398917 [2/2] - in /incubator/easyant/buildtypes/trunk: ./ build-std-ant-plugin/ build-std-ant-plugin/src/main/resources/ build-std-groovy/ build-std-groovy/src/main/resources/ build-std-groovy/src/test/antunit/ build-std-java/ build-std-j...

Modified: incubator/easyant/buildtypes/trunk/meta-build/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/meta-build/module.ivy?rev=1398917&r1=1398916&r2=1398917&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/meta-build/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/meta-build/module.ivy Tue Oct 16 18:37:35 2012
@@ -14,19 +14,22 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
-    <info organisation="org.apache.easyant.buildtypes" module="meta-build" revision="0.3">
-           <description>This build type allows you to recursively build multi-module projects,
-           with internal dependencies between modules.</description>
-           <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
-        </info>
-        <configurations>
-                <conf name="default" description="runtime dependencies artifact can be used with this conf"/>
-                <conf name="test" 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."/>
-                <conf name="provided" 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."/>
-        </configurations>
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+    <info organisation="org.apache.easyant.buildtypes" module="meta-build" revision="0.9">
+        <extends organisation="org.apache.easyant.buildtypes" module="parent-buildtype" revision="0.1"/>
+        <description>This build type allows you to recursively build multi-module projects, with internal dependencies
+            between modules.</description>
+        <ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1" />
+    </info>
+    <configurations>
+        <conf name="default" description="runtime dependencies artifact can be used with this conf" />
+        <conf name="test"
+            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." />
+        <conf name="provided"
+            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." />
+    </configurations>
     <publications>
-        <artifact type="ant"/>
-        <artifact type="properties"/>
+        <artifact type="ant" />
+        <artifact type="properties" />
     </publications>
-</ivy-module>
+</ivy-module>
\ No newline at end of file

Modified: incubator/easyant/buildtypes/trunk/meta-build/src/main/resources/meta-build.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/meta-build/src/main/resources/meta-build.ant?rev=1398917&r1=1398916&r2=1398917&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/meta-build/src/main/resources/meta-build.ant (original)
+++ incubator/easyant/buildtypes/trunk/meta-build/src/main/resources/meta-build.ant Tue Oct 16 18:37:35 2012
@@ -14,18 +14,12 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<project name="org.apache.easyant.buildtypes#meta-build"
-    xmlns:ea="antlib:org.apache.easyant"
-    xmlns:ivy="antlib:org.apache.ivy.ant">
-
+<project name="org.apache.easyant.buildtypes#meta-build" xmlns:ea="antlib:org.apache.easyant" xmlns:ivy="antlib:org.apache.ivy.ant">
     <ea:core-version requiredrevision="[0.9,+]" />
-
     <property file="${org.apache.easyant.buildtypes#meta-build.properties.file}" />
-
     <ea:import mrid="org.apache.easyant.plugins#clean-std;0.2" />
     <ea:import mrid="org.apache.easyant.plugins#build-tools;0.3" />
 
     <!-- friendly target names -->
     <target name="clean" depends="clean-std:clean" description="Clean the project" />
-
-</project>
+</project>
\ No newline at end of file

Modified: incubator/easyant/buildtypes/trunk/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/module.ivy?rev=1398917&r1=1398916&r2=1398917&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/module.ivy (original)
+++ incubator/easyant/buildtypes/trunk/module.ivy Tue Oct 16 18:37:35 2012
@@ -14,9 +14,9 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
-    <info organisation="org.apache.easyant.buildtypes" module="buildtypes-orchestrator" revision="0.1" >
-           <description>This module acts as orchestrator to build all easyant buildtypes.</description>
-        <ea:build module="meta-build" revision="0.2"/>
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+    <info organisation="org.apache.easyant.buildtypes" module="buildtypes-orchestrator" revision="0.1">
+        <description>This module acts as orchestrator to build all easyant buildtypes.</description>
+        <ea:build module="meta-build" revision="0.9" />
     </info>
 </ivy-module>

Modified: incubator/easyant/buildtypes/trunk/parent.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/buildtypes/trunk/parent.ivy?rev=1398917&r1=1398916&r2=1398917&view=diff
==============================================================================
--- incubator/easyant/buildtypes/trunk/parent.ivy (original)
+++ incubator/easyant/buildtypes/trunk/parent.ivy Tue Oct 16 18:37:35 2012
@@ -14,12 +14,13 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<ivy-module version="2.0" xmlns:ea="http://www.easyant.org"> 
-    <info organisation="org.apache.easyant.buildtypes" module="buildtypes-orchestrator" revision="0.1" >
-           <description>This module acts as parent to share common stuff for subprojects.</description>
-        <ea:plugin module="scm-svn" revision="0.1" as="scm" load-strategy="LOCAL">
-            <ea:property name="scm.connection.baseurl" value="https://svn.easyant.org/buildtypes/trunk"/>
-            <ea:property name="scm.tag.name" value="${ivy.module}-${version}"/>
+<ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
+    <info organisation="org.apache.easyant.buildtypes" module="parent-buildtype" revision="0.1">
+        <description>This module acts as parent to share common stuff for subprojects.</description>
+        <ea:plugin module="scm-svn" revision="0.9" as="scm">
+            <ea:property name="scm.connection.baseurl" value="https://svn.easyant.org/buildtypes/trunk" />
+            <ea:property name="scm.tag.name" value="${ivy.module}-${version}" />
         </ea:plugin>
+        <ea:plugin module="antunit" revision="0.9" />
     </info>
-</ivy-module>
+</ivy-module>
\ No newline at end of file