Fixed scopes for generated Maven pom.xml files (#9299)

4 files changed, 43 insertions, 25 deletions

diff --git a/client/build.xml b/client/build.xml
index 99dbb268d5..09c22ab36e 100644
--- a/client/build.xml
+++ b/client/build.xml
@@ -13,7 +13,11 @@
 	<property name="result.dir" value="result" />
 
 	<path id="classpath.compile.custom">
-		<fileset file="${gwt.user.jar}"/>
+		<!-- Could possibly compile GWT files also here to verify that
+		a) the same dependencies are used and
+		b) all dependencies have been declared
+		-->
+		<fileset file="${gwt.user.jar}" />
 	</path>
 
 	<target name="jar">
diff --git a/client/ivy.xml b/client/ivy.xml
index 953ca51a61..1e2bc41bd4 100644
--- a/client/ivy.xml
+++ b/client/ivy.xml
@@ -13,15 +13,19 @@
     <publications>
         <artifact></artifact>
     </publications>
-    <dependencies>
+    <dependencies defaultconf="build" defaultconfmapping="build,ide->master">
+        <!-- API DEPENDENCIES -->
+
+        <!-- LIBRARY DEPENDENCIES (compile time) -->
+        <!-- Project modules -->
         <dependency org="com.vaadin" name="vaadin-shared"
-            rev="${vaadin.version}" conf="build"></dependency>
+            rev="${vaadin.version}" conf="build->build"></dependency>
         <dependency org="com.vaadin" name="vaadin-server"
-            rev="${vaadin.version}" conf="build"></dependency>
+            rev="${vaadin.version}" conf="build->build"></dependency>
 
-        <!-- gwt-dev dependencies -->
-        <dependency org="net.sourceforge.cssparser" name="cssparser"
-            rev="0.9.5" />
+        <!-- gwt-user dependencies -->
+        <dependency org="org.w3c.css" name="sac" rev="1.3"
+            conf="build" />
 
     </dependencies>
 
diff --git a/common.xml b/common.xml
index 7eef3f1b00..2e9341c423 100644
--- a/common.xml
+++ b/common.xml
@@ -21,9 +21,9 @@
 		<fail unless="result.dir" message="No result.dir parameter given" />
 		<property name="ivy.xml" location="${result.dir}/../ivy.xml" />
 		<property name="pom.xml" location="${result.dir}/pom.xml" />
-		<ivy:makepom templatefile="${vaadin.basedir}/pom-template.xml" ivyfile="${ivy.xml}" pomfile="${pom.xml}" conf="compile, runtime">
-			<mapping conf="compile" scope="compile" />
-			<mapping conf="runtime" scope="runtime" />
+		<ivy:makepom templatefile="${vaadin.basedir}/pom-template.xml" ivyfile="${ivy.xml}" pomfile="${pom.xml}" conf="build, build-provided">
+			<mapping conf="build" scope="compile" />
+			<mapping conf="build-provided" scope="provided" />
 		</ivy:makepom>
 	</target>
 
@@ -134,8 +134,8 @@
 	</target>
 
 	<target name="dependencies" description="Resolves dependencies needed by this module">
-		<ivy:resolve resolveid="common" conf="build" />
-		<ivy:cachepath pathid="classpath.compile.dependencies" conf="build" />
+		<ivy:resolve resolveid="common" conf="build, build-provided" />
+		<ivy:cachepath pathid="classpath.compile.dependencies" conf="build, build-provided" />
 	</target>
 
 	<target name="clean">
diff --git a/server/ivy.xml b/server/ivy.xml
index 0d0a122575..7f964f01f2 100644
--- a/server/ivy.xml
+++ b/server/ivy.xml
@@ -8,6 +8,7 @@
 
     <configurations>
         <conf name="build" />
+        <conf name="build-provided" />
         <conf name="ide" />
         <conf name="tests" />
     </configurations>
@@ -15,23 +16,37 @@
         <artifact></artifact>
     </publications>
     <dependencies>
+        <!-- API DEPENDENCIES -->
+
         <!-- Liferay Portal Service -->
         <dependency org="com.liferay.portal" name="portal-service"
-            rev="6.0.2" />
+            rev="6.0.2" conf="build-provided,ide -> master" />
         <!--Servlet API version 2.5 -->
         <dependency org="javax.servlet" name="servlet-api"
-            rev="2.5" />
+            rev="2.5" conf="build-provided,ide -> master" />
 
         <!--Portlet API version 2.0 (JSR-286) -->
         <dependency org="javax.portlet" name="portlet-api"
-            rev="2.0" />
+            rev="2.0" conf="build-provided,ide -> master" />
+
         <!-- Google App Engine -->
         <dependency org="com.google.appengine" name="appengine-api-1.0-sdk"
-            rev="1.2.1" />
+            rev="1.2.1" conf="build-provided,ide -> master" />
         <dependency org="javax.validation" name="validation-api"
-            rev="1.0.0.GA" conf="build,ide->master,sources" />
+            rev="1.0.0.GA" conf="build-provided,ide -> master" />
+
+        <!-- LIBRARY DEPENDENCIES (compile time) -->
+        <!-- Project modules -->
+        <dependency org="com.vaadin" name="vaadin-shared"
+            rev="${vaadin.version}" conf="build"></dependency>
+        <dependency org="com.vaadin" name="vaadin-buildhelpers"
+            rev="${vaadin.version}" conf="build"></dependency>
+
         <!-- Jsoup for BootstrapHandler -->
-        <dependency org="org.jsoup" name="jsoup" rev="1.6.3" />
+        <dependency org="org.jsoup" name="jsoup" rev="1.6.3"
+            conf="build,ide -> master" />
+
+        <!-- TESTING DEPENDENCIES -->
 
         <!-- TestBench tests -->
         <dependency org="commons-codec" name="commons-codec"
@@ -45,15 +60,10 @@
         <dependency org="junit" name="junit" rev="4.5"
             conf="tests,ide -> master" />
         <dependency org="org.easymock" name="easymock" rev="3.0"
-            conf="tests,ide-> master, runtime(*)" />
+            conf="tests,ide-> master" />
         <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6"
-            conf="tests,ide -> master, runtime(*)" />
+            conf="tests,ide -> master" />
 
-        <!-- Project modules -->
-        <dependency org="com.vaadin" name="vaadin-shared"
-            rev="${vaadin.version}" conf="build"></dependency>
-        <dependency org="com.vaadin" name="vaadin-buildhelpers"
-            rev="${vaadin.version}" conf="build"></dependency>
     </dependencies>
 
 </ivy-module>