Moved validation dependency and hack to client (#9551)

diff --git a/client-compiler/build.xml b/client-compiler/build.xml
index cff8057274554208c500694de6194517b62f346b..733ee73e3245cc0335266e0ffb4ec2dd2865aceb 100644 (file)
--- a/client-compiler/build.xml
+++ b/client-compiler/build.xml
@@ -38,21 +38,6 @@ gwt.svnrev=${git.revision}</echo>
                        <reference refid="compiler.includes" torefid="extra.jar.includes" />
                </antcall>
 
-               <!-- Hack to add validation dependency with source classifier -->
-               <property name="pom.xml" location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" />
-               <copy file="${pom.xml}" tofile="${temp.pom}">
-                       <filterchain>
-                               <replacestring from="  &lt;/dependencies&gt;" to="    &lt;dependency&gt;
-                             &lt;groupId&gt;javax.validation&lt;/groupId&gt;
-                             &lt;artifactId&gt;validation-api&lt;/artifactId&gt;
-                             &lt;version&gt;1.0.0.GA&lt;/version&gt;
-                             &lt;scope&gt;compile&lt;/scope&gt;
-                             &lt;classifier&gt;sources&lt;/classifier&gt;
-                           &lt;/dependency&gt;
-  &lt;/dependencies&gt;" />
-                       </filterchain>
-               </copy>
-               <move file="${temp.pom}" tofile="${pom.xml}" />
        </target>
 
        <target name="publish-local" depends="jar">

diff --git a/client-compiler/ivy.xml b/client-compiler/ivy.xml
index d57c3f700c4ba0d3353dd91437ca37b7dc8fad91..777236ee53c2eb9a51928fa332b94f43d148bd6d 100644 (file)
--- a/client-compiler/ivy.xml
+++ b/client-compiler/ivy.xml
@@ -29,9 +29,6 @@
             rev="3.1" conf="build,ide -> default" />
         <dependency org="ant" name="ant" rev="1.6.5"
             conf="build,ide -> default" />
-        <dependency org="javax.validation" name="validation-api"
-            rev="1.0.0.GA" conf="build->default,sources" />
-
     </dependencies>
 
 </ivy-module>

diff --git a/client/build.xml b/client/build.xml
index f0ee0892f9fcc9f46e952e353df6852f44a6fcfa..462a98ed5d7e419e904e43fdbc10d9c0f69337b4 100644 (file)
--- a/client/build.xml
+++ b/client/build.xml
@@ -25,6 +25,21 @@
                <antcall target="common.jar">
                        <reference refid="client.gwt.includes" torefid="extra.jar.includes" />
                </antcall>
+               <!-- Hack to add validation dependency with source classifier -->
+               <property name="pom.xml" location="${result.dir}/lib/${module.name}-${vaadin.version}.pom" />
+               <copy file="${pom.xml}" tofile="${temp.pom}">
+                       <filterchain>
+                               <replacestring from="  &lt;/dependencies&gt;" to="    &lt;dependency&gt;
+               &lt;groupId&gt;javax.validation&lt;/groupId&gt;
+               &lt;artifactId&gt;validation-api&lt;/artifactId&gt;
+               &lt;version&gt;1.0.0.GA&lt;/version&gt;
+               &lt;scope&gt;compile&lt;/scope&gt;
+               &lt;classifier&gt;sources&lt;/classifier&gt;
+             &lt;/dependency&gt;
+cies&gt;" />
+                       </filterchain>
+               </copy>
+               <move file="${temp.pom}" tofile="${pom.xml}" />
        </target>
 
        <target name="publish-local" depends="jar">

diff --git a/client/ivy.xml b/client/ivy.xml
index 39ed494d86835e8acf38d7ef75cf7b1dc7d01132..4b56338c24f7d528a0bcad350c4b29f76721dfc3 100644 (file)
--- a/client/ivy.xml
+++ b/client/ivy.xml
@@ -10,14 +10,14 @@
     <configurations>
         <conf name="build" />
         <conf name="build-provided" />
-        <conf name="ide" visibility="private"/>
+        <conf name="ide" visibility="private" />
         <conf name="tests" />
     </configurations>
     <publications>
-        <artifact type="jar" ext="jar"/>
-<artifact type="source" ext="jar" m:classifier="sources" />
-<artifact type="javadoc" ext="jar" m:classifier="javadoc" />
-        <artifact type="pom" ext="pom"/>
+        <artifact type="jar" ext="jar" />
+        <artifact type="source" ext="jar" m:classifier="sources" />
+        <artifact type="javadoc" ext="jar" m:classifier="javadoc" />
+        <artifact type="pom" ext="pom" />
     </publications>
     <dependencies defaultconf="build" defaultconfmapping="build,ide->default">
         <!-- API DEPENDENCIES -->
@@ -34,6 +34,11 @@
 
         <dependency org="junit" name="junit" rev="4.5"
             conf="tests->default" />
+
+        <dependency org="javax.validation" name="validation-api"
+            rev="1.0.0.GA" conf="build->default,sources" />
+
+
     </dependencies>
 
 </ivy-module>